Commit f32cc085 authored by alexey.musinov's avatar alexey.musinov

Merge branch 'develop' of https://github.com/ONLYOFFICE/sdkjs into develop

parents 78549a39 b81e1a66
...@@ -552,6 +552,9 @@ var editor; ...@@ -552,6 +552,9 @@ var editor;
spreadsheet_api.prototype.asc_Resize = function() { spreadsheet_api.prototype.asc_Resize = function() {
if (this.wb) { if (this.wb) {
this.wb.resize(); this.wb.resize();
if (AscCommon.g_inputContext)
AscCommon.g_inputContext.onResize("ws-canvas-outer");
} }
}; };
......
...@@ -1608,6 +1608,8 @@ function DrawingObjects() { ...@@ -1608,6 +1608,8 @@ function DrawingObjects() {
printPagesData printPagesData
} }
*****************************************/ *****************************************/
if (!worksheet || !worksheet.model)
return;
// Undo/Redo // Undo/Redo
if ( (worksheet.model.index != api.wb.model.getActive()) && !printOptions ) if ( (worksheet.model.index != api.wb.model.getActive()) && !printOptions )
......
...@@ -181,6 +181,7 @@ CGraphicFrame.prototype.setGraphicObject= function(graphicObject) ...@@ -181,6 +181,7 @@ CGraphicFrame.prototype.setGraphicObject= function(graphicObject)
if(this.graphicObject) if(this.graphicObject)
{ {
this.graphicObject.Index = 0; this.graphicObject.Index = 0;
this.graphicObject.Parent = this;
} }
}; };
...@@ -1093,6 +1094,7 @@ CGraphicFrame.prototype.Undo = function(data) ...@@ -1093,6 +1094,7 @@ CGraphicFrame.prototype.Undo = function(data)
if(this.graphicObject) if(this.graphicObject)
{ {
this.graphicObject.Index = 0; this.graphicObject.Index = 0;
this.graphicObject.Parent = this;
} }
break; break;
} }
...@@ -1139,6 +1141,7 @@ CGraphicFrame.prototype.Redo = function(data) ...@@ -1139,6 +1141,7 @@ CGraphicFrame.prototype.Redo = function(data)
if(this.graphicObject) if(this.graphicObject)
{ {
this.graphicObject.Index = 0; this.graphicObject.Index = 0;
this.graphicObject.Parent = this;
} }
break; break;
} }
...@@ -1213,6 +1216,7 @@ CGraphicFrame.prototype.Load_Changes = function(r) ...@@ -1213,6 +1216,7 @@ CGraphicFrame.prototype.Load_Changes = function(r)
if(this.graphicObject) if(this.graphicObject)
{ {
this.graphicObject.Index = 0; this.graphicObject.Index = 0;
this.graphicObject.Parent = this;
} }
break; break;
} }
......
...@@ -200,10 +200,23 @@ ...@@ -200,10 +200,23 @@
{ {
var _elem = document.getElementById("area_id_main"); var _elem = document.getElementById("area_id_main");
var _elemSrc = document.getElementById(_editorContainerId); var _elemSrc = document.getElementById(_editorContainerId);
_elem.style.left = _elemSrc.style.left;
_elem.style.top = _elemSrc.style.top; var _width = _elemSrc.style.width;
_elem.style.width = _elemSrc.style.width; if ((null == _width || "" == _width) && window.getComputedStyle)
_elem.style.height = _elemSrc.style.height; {
var _s = window.getComputedStyle(_elemSrc);
_elem.style.left = _s.left;
_elem.style.top = _s.top;
_elem.style.width = _s.width;
_elem.style.height = _s.height;
}
else
{
_elem.style.left = _elemSrc.style.left;
_elem.style.top = _elemSrc.style.top;
_elem.style.width = _width;
_elem.style.height = _elemSrc.style.height;
}
}, },
checkFocus : function() checkFocus : function()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment