[ios] update

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@66209 954022d7-b5bf-4e40-9824-e11837661b57

Excel/model/History.js

@@ -293,7 +293,7 @@ CHistory.prototype.UndoRedoEnd = function (Point, oRedoObjectParam, bUndo) {
 		Point = this.Points[this.Index];
 		CollaborativeEditing.Apply_LinkData();
 		bCoaut = true;
-        if(!window["NATIVE_EDITOR_ENJINE"]) {
+        if(!window["NATIVE_EDITOR_ENJINE"] || window['IS_NATIVE_EDITOR']) {
             this.Get_RecalcData(Point);
             wsViews = Asc["editor"].wb.wsViews;
             for (i = 0; i < wsViews.length; ++i) {
@@ -340,7 +340,7 @@ CHistory.prototype.UndoRedoEnd = function (Point, oRedoObjectParam, bUndo) {
 				this.workbook.handlers.trigger("asc_onUpdateTabColor", curSheet.getIndex());
 		}
 
-        if(!window["NATIVE_EDITOR_ENJINE"]) {
+        if(!window["NATIVE_EDITOR_ENJINE"] || window['IS_NATIVE_EDITOR']) {
             this.Get_RecalcData(Point);
             wsViews = Asc["editor"].wb.wsViews;
             for (i = 0; i < wsViews.length; ++i) {

Excel/native/native.js

@@ -19,6 +19,7 @@ window.location.href = "";
 
 window.NATIVE_EDITOR_ENJINE = true;
 window.NATIVE_EDITOR_ENJINE_SYNC_RECALC = true;
+window.IS_NATIVE_EDITOR = true;
 
 var document = {};
 window.document = document;
@@ -3216,7 +3217,7 @@ function OfflineEditor () {
 
         _api.asc_SendThemeColorScheme();
 
-        //this.offline_generateStyle();
+        this.offline_generateStyle();
 
         window["NativeSupportTimeouts"] = true;
 
@@ -3242,6 +3243,8 @@ function OfflineEditor () {
 //        ws.objectRender.drawingArea.init();
 
         // _api.asc_getTextArtPreviews();
+
+        this.offline_afteInit();
     };
     this.registerEventsHandlers = function () {
 
@@ -3910,10 +3913,40 @@ function OfflineEditor () {
         var guiStyles = _api.wb.getCellStyles();
         //bResult = this.handlers.trigger("asc_onInitEditorStyles", guiStyles);
         // this.guiStyles = (false === bResult) ? guiStyles : null;
-    }
+    };
+
+    this.offline_afteInit = function () {
+
+        _api.asc_ApplyColorScheme = function(bRedraw) {
+
+            var wsViews = Asc["editor"].wb.wsViews;
+            for (var i = 0; i < wsViews.length; ++i) {
+                if (wsViews[i] && wsViews[i].objectRender && wsViews[i].objectRender.controller) {
+                    wsViews[i].objectRender.controller.startRecalculate();
+                }
+            }
+
+            //    this.chartPreviewManager.clearPreviews();
+            //    this.textArtPreviewManager.clear();
+
+            // На view-режиме не нужно отправлять стили
+            if (true !== this.asc_getViewerMode() && !this.isMobileVersion) {
+                // Отправка стилей
+                this._sendWorkbookStyles();
+            }
+
+            if (bRedraw) {
+                this.handlers.trigger("asc_onUpdateChartStyles");
+                this.wb.drawWS();
+            }
+        };
+    };
 }
 var _s = new OfflineEditor();
 
+
+
+
 function offline_of() {_s.openFile();}
 function offline_stz(v) {_s.zoom = v; _api.asc_setZoom(v);}
 function offline_ds(x, y, width, height, ratio) {_s.drawSheet(x, y, width, height, ratio);}

Excel/native/utils.js

@@ -1321,16 +1321,16 @@
             //var th = this.native.GetStyleHeight();
             var sd = this.native.GetDeviceScale();
 
-            this.styleThumbnailWidth	       = 80;//112;
-            this.styleThumbnailHeight	   = 40;//38;
-            this.styleThumbnailWidthPt	   = this.styleThumbnailWidth * 72 / 96;
-            this.styleThumbnailHeightPt	   = this.styleThumbnailHeight * 72 / 96;
+            this.styleThumbnailWidth	       = 80 * (72 / 96);//112;
+            this.styleThumbnailHeight	   = 40 * (72 / 96);//38;
+            this.styleThumbnailWidthPt	   = this.styleThumbnailWidth;// * (72 / 96);
+            this.styleThumbnailHeightPt	   = this.styleThumbnailHeight;// * ( 72 / 96);
 
 			this.styleThumbnailWidthWithRetina	= this.styleThumbnailWidth;
 			this.styleThumbnailHeightWithRetina	= this.styleThumbnailHeight;
 			if (sd > 1) {
-			//	this.styleThumbnailWidthWithRetina <<= 1;
-			//	this.styleThumbnailHeightWithRetina <<= 1;
+				this.styleThumbnailWidthWithRetina <<= 1;
+				this.styleThumbnailHeightWithRetina <<= 1;
 			}
 		}