mobile min srcipt building

build/build-mobile.command

@@ -7,7 +7,22 @@ echo "----------------------------------------"
 BASEDIR="$(cd "$(dirname "$0")" && pwd)"
 cd $BASEDIR
 
-npm install
+echo npm install
+
 grunt --level=WHITESPACE_ONLY --mobile=true --noclosure=true
-cat "../word/sdk-all-min.js" "../word/sdk-all.js" > "../../mobile-apps/ios/Vendor/ONLYOFFICE/SDKData/documents/script.bin"
-cat "../cell/sdk-all-min.js" "../cell/sdk-all.js" > "../../mobile-apps/ios/Vendor/ONLYOFFICE/SDKData/spreadsheets/script.bin"
+echo grunt --level=ADVANCED --mobile=true  --noclosure=true
+
+echo -n $'\r' > temp.txt
+
+cat "../../web-apps/vendor/xregexp/xregexp-all-min.js" "temp.txt" "../../web-apps/vendor/underscore/underscore-min.js" "temp.txt" "../common/native/native.js" "temp.txt" "../common/native/jquery_native.js" "temp.txt" > "banners.js"
+
+cat "banners.js" "../word/sdk-all-min.js" "../word/sdk-all.js" > "../../mobile-apps/ios/Vendor/ONLYOFFICE/SDKData/documents/script.bin"
+
+rm -f -r "banners.js"
+
+cat "../../web-apps/vendor/xregexp/xregexp-all-min.js" "temp.txt" "../../web-apps/vendor/underscore/underscore-min.js" "temp.txt" "../cell/native/common.js" "temp.txt" "../common/native/jquery_native.js" "temp.txt" > "banners.js"
+
+cat "banners.js" "../cell/sdk-all-min.js" "../cell/sdk-all.js" > "../../mobile-apps/ios/Vendor/ONLYOFFICE/SDKData/spreadsheets/script.bin"
+
+rm -f -r "banners.js"
+rm -f -r "temp.txt"
\ No newline at end of file

build/configs/webexcel.json

@@ -195,43 +195,39 @@
 		],
 		"common": [
 		  "../common/Local/common.js",
-          "../cell/Local/api.js"
+          	  "../cell/Local/api.js"
 		]
 	  },
 	  "mobile_banners": {
-        "min": [
-	      "../../web-apps/vendor/xregexp/xregexp-all-min.js",
-		  "../../web-apps/vendor/underscore/underscore-min.js",
-		  "../cell/native/common.js",
-		  "../common/Native/Wrappers/memory.js",
-		  "../common/Native/jquery_native.js"
+        	"min": [
+		  "../common/Native/Wrappers/memory.js"
 		],
 		"common": [
 		  "../cell/native/DrawingContext.js"
 		]
 	  },
 	  "mobile": [	 
-        "../common/Native/Wrappers/TextMeasurerWrapper.js",
-        "../common/Native/Wrappers/DrawingStream.js",
+        	"../common/Native/Wrappers/TextMeasurerWrapper.js",
+        	"../common/Native/Wrappers/DrawingStream.js",
 		"../common/Native/Wrappers/ShapeDrawer.js",
-        "../cell/native/TextDrawer.js",
-        "../cell/native/Overlay.js",
+        	"../cell/native/TextDrawer.js",
+        	"../cell/native/Overlay.js",
 		"../cell/native/Graphics.js",
-        "../cell/native/DrawingDocument.js",
+        	"../cell/native/DrawingDocument.js",
  		"../cell/native/native.js"
 	  ],
       "exclude_mobile": [
-        "../common/Overlay.js",
-        "../common/Controls.js",
+        	"../common/Overlay.js",
+        	"../common/Controls.js",
 		"../cell/graphics/DrawingContext.js",
-        "../cell/model/DrawingObjects/ShapeDrawer.js",
-        "../cell/model/DrawingObjects/DrawingDocument.js", 
+        	"../cell/model/DrawingObjects/ShapeDrawer.js",
+        	"../cell/model/DrawingObjects/DrawingDocument.js", 
 		"../common/FontsFreeType/font_engine.js",
-        "../common/FontsFreeType/FontFile.js",
-        "../common/FontsFreeType/FontManager.js",
+        	"../common/FontsFreeType/FontFile.js",
+        	"../common/FontsFreeType/FontManager.js",
 		"../common/FontsFreeType/TextMeasurer.js",
 		"../cell/model/DrawingObjects/Graphics.js",
-        "../common/Drawings/TextDrawer.js",
+        	"../common/Drawings/TextDrawer.js",
 		"../cell/view/iscroll.js"
 	  ],
       "dst": "../cell",

cell/native/common.js

@@ -78,6 +78,15 @@ var AscCommonWord = window["AscCommonWord"];
 window["AscCommonSlide"] = {};
 var AscCommonSlide = window["AscCommonSlide"];
 
+function ConvertJSC_Array(_array)
+{
+	var _len = _array.length;
+	var ret = new Uint8Array(_len);
+	for (var i = 0; i < _len; i++)
+		ret[i] = _array.getAt(i);
+	return ret;
+}
+
 function Image() {
     this.src = "";
     this.onload = function()
@@ -307,18 +316,8 @@ function setInterval(func, interval) {
     if (!window.NativeSupportTimeouts)
         return;
 
-   // console.log("setInterval");
-    
-//    var intervalFunc = function() {
-//
-//        console.log("intervalFunc");
-//
-//        func.call(null);
-//        setInterval(func, interval);
-//    }
-
     var id = window["native"]["GenerateTimeoutId"](interval);
-    window.NativeTimeoutObject["" + id] = {func: func, repeat: true, interval: interval}; // intervalFunc;
+    window.NativeTimeoutObject["" + id] = {func: func, repeat: true, interval: interval};
     
     return id;
 }
@@ -376,11 +375,6 @@ window["NativeCorrectImageUrlOnCopy"] = function(url) {
     return window["native"]["CorrectImageUrlOnCopy"](url);
 };
 
-window["use_native_fonts_only"] = true;
-
 var global_memory_stream_menu = CreateNativeMemoryStream();
 
-window['AscFonts'] = window['AscFonts'] || {};
-window['AscFonts'].FT_Common = FT_Common;
-
 window['SockJS'] = createSockJS();

cell/view/CellEditorView.js

@@ -1191,7 +1191,7 @@
 		this._updateUndoRedoChanged();
 
 		if ( window['IS_NATIVE_EDITOR'] && !this.dontUpdateText ) {
-			window['native'].onCellEditorChangeText( this._getFragmentsText( this.options.fragments ) );
+			window['native']['onCellEditorChangeText']( this._getFragmentsText( this.options.fragments ) );
 		}
 	};