Merge pull request #73 from ONLYOFFICE/hotfix/v4.1.2

Hotfix/v4.1.2

cell/view/DrawingObjectsController.js

@@ -303,13 +303,18 @@ DrawingObjectsController.prototype.createGroup = function()
 DrawingObjectsController.prototype.handleChartDoubleClick = function()
 {
     var drawingObjects = this.drawingObjects;
+    var oThis = this;
     this.checkSelectedObjectsAndFireCallback(function(){
+        oThis.clearTrackObjects();
+        oThis.clearPreTrackObjects();
+        oThis.changeCurrentState(new AscFormat.NullState(this));
         drawingObjects.showChartSettings();
     }, []);
 }
 DrawingObjectsController.prototype.handleOleObjectDoubleClick = function(drawing, oleObject, e, x, y, pageIndex)
 {
     var drawingObjects = this.drawingObjects;
+    var oThis = this;
     this.checkSelectedObjectsAndFireCallback(function(){
         var pluginData = new Asc.CPluginData();
         pluginData.setAttribute("data", oleObject.m_sData);
@@ -320,6 +325,9 @@ DrawingObjectsController.prototype.handleOleObjectDoubleClick = function(drawing
         pluginData.setAttribute("heightPix", oleObject.m_nPixHeight);
         pluginData.setAttribute("objectId", oleObject.Id);
         window["Asc"]["editor"].asc_pluginRun(oleObject.m_sApplicationId, 0, pluginData);
+        oThis.clearTrackObjects();
+        oThis.clearPreTrackObjects();
+        oThis.changeCurrentState(new AscFormat.NullState(this));
         this.onMouseUp(e, x, y);
     }, []);
 };

common/Drawings/WorkEvents.js

@@ -1731,7 +1731,13 @@
 						var _markup                            = this.HtmlPage.m_oHorRuler.m_oTableMarkup;
 						_markup.Cols[this.TableCurrentMovePos] += (this.TableCurrentMoveValue - this.TableCurrentMoveValueOld);
 						_markup.Cols[this.TableCurrentMovePos] = Math.max(_markup.Cols[this.TableCurrentMovePos], 1);
-						_markup.Table.Update_TableMarkupFromRuler(_markup, true, this.TableCurrentMovePos + 1);
+
+						if ( false === this.HtmlPage.m_oLogicDocument.Document_Is_SelectionLocked(AscCommon.changestype_Table_Properties) )
+                        {
+                            this.HtmlPage.m_oLogicDocument.Create_NewHistoryPoint(AscDFH.historydescription_Document_SetTableMarkup_Hor);
+                            _markup.Table.Update_TableMarkupFromRuler(_markup, true, this.TableCurrentMovePos + 1);
+                            this.HtmlPage.m_oLogicDocument.Document_UpdateInterfaceState();
+                        }
 					}
 					else
 					{
@@ -1750,7 +1756,13 @@
 
 						var _markup = this.HtmlPage.m_oHorRuler.m_oTableMarkup;
 						_markup.Rows[this.TableCurrentMovePos].H += (this.TableCurrentMoveValue - this.TableCurrentMoveValueOld);
-						_markup.Table.Update_TableMarkupFromRuler(_markup, false, this.TableCurrentMovePos + 1);
+
+						if ( false === this.HtmlPage.m_oLogicDocument.Document_Is_SelectionLocked(AscCommon.changestype_Table_Properties) )
+                        {
+                            this.HtmlPage.m_oLogicDocument.Create_NewHistoryPoint(AscDFH.historydescription_Document_SetTableMarkup_Hor);
+                            _markup.Table.Update_TableMarkupFromRuler(_markup, false, this.TableCurrentMovePos + 1);
+                            this.HtmlPage.m_oLogicDocument.Document_UpdateInterfaceState();
+                        }
 					}
 
 					this.HtmlPage.OnUpdateOverlay();

common/plugins.js

@@ -176,6 +176,12 @@
 			if (this.startData.getAttribute("resize") === true)
 				this.startLongAction();
 
+		    if (this.api.WordControl && this.api.WordControl.m_oTimerScrollSelect != -1)
+		    {
+		        clearInterval(this.api.WordControl.m_oTimerScrollSelect);
+                this.api.WordControl.m_oTimerScrollSelect = -1;
+		    }
+
 			if (this.current.variations[this.currentVariation].isVisual && this.startData.getAttribute("resize") !== true)
 			{
 				this.api.sendEvent("asc_onPluginShow", this.current, this.currentVariation);

slide/Editor/DrawingObjectsController.js

@@ -102,6 +102,8 @@ DrawingObjectsController.prototype.handleOleObjectDoubleClick = function(drawing
         pluginData.setAttribute("objectId", oleObject.Id);
         editor.asc_pluginRun(oleObject.m_sApplicationId, 0, pluginData);
     }
+    this.clearTrackObjects();
+    this.clearPreTrackObjects();
     this.changeCurrentState(new AscFormat.NullState(this));
     oPresentation.OnMouseUp(e, x, y, pageIndex);
 };

word/Editor/GraphicObjects/GraphicObjects.js

@@ -1256,6 +1256,8 @@ CGraphicObjects.prototype =
         {
             editor.asc_doubleClickOnChart(this.getChartObject());
         }
+        this.clearTrackObjects();
+        this.clearPreTrackObjects();
         this.changeCurrentState(new AscFormat.NullState(this));
         this.document.OnMouseUp(e, x, y, pageIndex);
     },
@@ -1277,6 +1279,8 @@ CGraphicObjects.prototype =
             pluginData.setAttribute("objectId", oleObject.Id);
             editor.asc_pluginRun(oleObject.m_sApplicationId, 0, pluginData);
         }
+        this.clearTrackObjects();
+        this.clearPreTrackObjects();
         this.changeCurrentState(new AscFormat.NullState(this));
         this.document.OnMouseUp(e, x, y, pageIndex);
     },