Skip to content

S
sdkjs
Commit 7e9b70ba authored by Oleg Korshul's avatar Oleg Korshul Committed by GitHub
Browse files
Options

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

Hotfix/v4.1.2
parents d8e480b3 0cb44c05
Show whitespace changes
Inline Side-by-side
Showing with 42 additions and 43 deletions
Readme.md
View file @ 7e9b70ba
[![License](https://img.shields.io/badge/License-GNU%20AGPL%20V3-green.svg?style=flat)](http://www.gnu.org/licenses/agpl-3.0.ru.html) ![Release](https://img.shields.io/badge/Release-v4.1.1-blue.svg?style=flat) [![License](https://img.shields.io/badge/License-GNU%20AGPL%20V3-green.svg?style=flat)](http://www.gnu.org/licenses/agpl-3.0.ru.html) ![Release](https://img.shields.io/badge/Release-v4.1.2-blue.svg?style=flat)
## Sdkjs ## Sdkjs
......
build/build-desktop.bat
View file @ 7e9b70ba
...@@ -13,24 +13,14 @@ copy ..\cell\sdk-all-min.js ..\..\core\build\jsdesktop\cell\sdk-all-min.js ...@@ -13,24 +13,14 @@ copy ..\cell\sdk-all-min.js ..\..\core\build\jsdesktop\cell\sdk-all-min.js
copy ..\common\Native\native.js ..\..\core\build\jsdesktop\common\Native\native.js copy ..\common\Native\native.js ..\..\core\build\jsdesktop\common\Native\native.js
copy ..\word\sdk-all.js ..\..\core-ext\ChromiumBasedEditors\app\test\src\build\win_64\Debug\Local\editors\sdkjs\word\sdk-all.js copy ..\word\sdk-all.js ..\..\core-ext\desktop-sdk-wrapper\test\src\build\win_64\Debug\Local\editors\sdkjs\word\sdk-all.js
copy ..\slide\sdk-all.js ..\..\core-ext\ChromiumBasedEditors\app\test\src\build\win_64\Debug\Local\editors\sdkjs\slide\sdk-all.js copy ..\slide\sdk-all.js ..\..\core-ext\desktop-sdk-wrapper\test\src\build\win_64\Debug\Local\editors\sdkjs\slide\sdk-all.js
copy ..\cell\sdk-all.js ..\..\core-ext\ChromiumBasedEditors\app\test\src\build\win_64\Debug\Local\editors\sdkjs\cell\sdk-all.js copy ..\cell\sdk-all.js ..\..\core-ext\desktop-sdk-wrapper\test\src\build\win_64\Debug\Local\editors\sdkjs\cell\sdk-all.js
copy ..\word\sdk-all-min.js ..\..\core-ext\ChromiumBasedEditors\app\test\src\build\win_64\Debug\Local\editors\sdkjs\word\sdk-all-min.js copy ..\word\sdk-all-min.js ..\..\core-ext\desktop-sdk-wrapper\test\src\build\win_64\Debug\Local\editors\sdkjs\word\sdk-all-min.js
copy ..\slide\sdk-all-min.js ..\..\core-ext\ChromiumBasedEditors\app\test\src\build\win_64\Debug\Local\editors\sdkjs\slide\sdk-all-min.js copy ..\slide\sdk-all-min.js ..\..\core-ext\desktop-sdk-wrapper\test\src\build\win_64\Debug\Local\editors\sdkjs\slide\sdk-all-min.js
copy ..\cell\sdk-all-min.js ..\..\core-ext\ChromiumBasedEditors\app\test\src\build\win_64\Debug\Local\editors\sdkjs\cell\sdk-all-min.js copy ..\cell\sdk-all-min.js ..\..\core-ext\desktop-sdk-wrapper\test\src\build\win_64\Debug\Local\editors\sdkjs\cell\sdk-all-min.js
copy ..\common\Native\native.js ..\..\core-ext\ChromiumBasedEditors\app\test\src\build\win_64\Debug\Local\editors\sdkjs\common\Native\native.js copy ..\common\Native\native.js ..\..\core-ext\desktop-sdk-wrapper\test\src\build\win_64\Debug\Local\editors\sdkjs\common\Native\native.js
copy ..\word\sdk-all.js ..\..\core-ext\ChromiumBasedEditors\app\test\src\build\win_64\Release\Local\editors\sdkjs\word\sdk-all.js
copy ..\slide\sdk-all.js ..\..\core-ext\ChromiumBasedEditors\app\test\src\build\win_64\Release\Local\editors\sdkjs\slide\sdk-all.js
copy ..\cell\sdk-all.js ..\..\core-ext\ChromiumBasedEditors\app\test\src\build\win_64\Release\Local\editors\sdkjs\cell\sdk-all.js
copy ..\word\sdk-all-min.js ..\..\core-ext\ChromiumBasedEditors\app\test\src\build\win_64\Release\Local\editors\sdkjs\word\sdk-all-min.js
copy ..\slide\sdk-all-min.js ..\..\core-ext\ChromiumBasedEditors\app\test\src\build\win_64\Release\Local\editors\sdkjs\slide\sdk-all-min.js
copy ..\cell\sdk-all-min.js ..\..\core-ext\ChromiumBasedEditors\app\test\src\build\win_64\Release\Local\editors\sdkjs\cell\sdk-all-min.js
copy ..\common\Native\native.js ..\..\core-ext\ChromiumBasedEditors\app\test\src\build\win_64\Release\Local\editors\sdkjs\common\Native\native.js
pause pause
\ No newline at end of file
cell/Local/api.js
View file @ 7e9b70ba
...@@ -112,16 +112,20 @@ var c_oAscError = Asc.c_oAscError; ...@@ -112,16 +112,20 @@ var c_oAscError = Asc.c_oAscError;
window["Asc"]['spreadsheet_api'].prototype.asc_setAdvancedOptions = function(idOption, option) window["Asc"]['spreadsheet_api'].prototype.asc_setAdvancedOptions = function(idOption, option)
{ {
if (window["Asc"].c_oAscAdvancedOptionsID.CSV === idOption) { if (window["Asc"].c_oAscAdvancedOptionsID.CSV === idOption) {
window["AscDesktopEditor"]["SetAdvancedOptions"]("" + option.asc_getCodePage(), "" + option.asc_getDelimiter()); var _param = "";
_param += ("<m_nCsvTxtEncoding>" + option.asc_getCodePage() + "</m_nCsvTxtEncoding>");
_param += ("<m_nCsvDelimiter>" + option.asc_getDelimiter() + "</m_nCsvDelimiter>");
window["AscDesktopEditor"]["SetAdvancedOptions"](_param);
}
else if (window["Asc"].c_oAscAdvancedOptionsID.DRM === idOption) {
var _param = "";
_param += ("<m_sPassword>" + AscCommon.CopyPasteCorrectString(option.asc_getPassword()) + "</m_sPassword>");
window["AscDesktopEditor"]["SetAdvancedOptions"](_param);
} }
}; };
window["Asc"]['spreadsheet_api'].prototype["asc_setAdvancedOptions"] = window["Asc"]['spreadsheet_api'].prototype.asc_setAdvancedOptions; window["Asc"]['spreadsheet_api'].prototype["asc_setAdvancedOptions"] = window["Asc"]['spreadsheet_api'].prototype.asc_setAdvancedOptions;
window["asc_initAdvancedOptions"] = function()
{
window["Asc"]["editor"]._onNeedParams(undefined);
};
window["DesktopOfflineAppDocumentEndLoad"] = function(_url, _data) window["DesktopOfflineAppDocumentEndLoad"] = function(_url, _data)
{ {
AscCommon.g_oDocumentUrls.documentUrl = _url; AscCommon.g_oDocumentUrls.documentUrl = _url;
......
cell/css/main-mobile.css
View file @ 7e9b70ba
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
border: 0; border: 0;
} }
#ws-canvas-overlay { #ws-canvas-overlay, #ws-canvas-graphic, #ws-canvas-graphic-overlay {
border: 0; border: 0;
position: absolute; position: absolute;
left: 0; left: 0;
......
cell/model/DrawingObjects/Format/ChartSpacePrototype.js
View file @ 7e9b70ba
...@@ -119,7 +119,6 @@ CChartSpace.prototype.setRecalculateInfo = function() ...@@ -119,7 +119,6 @@ CChartSpace.prototype.setRecalculateInfo = function()
recalculateBBoxRange: true recalculateBBoxRange: true
}; };
this.baseColors = []; this.baseColors = [];
this.bounds = {l: 0, t: 0, r: 0, b:0, w: 0, h:0};
this.chartObj = null; this.chartObj = null;
this.rectGeometry = AscFormat.ExecuteNoHistory(function(){return AscFormat.CreateGeometry("rect");}, this, []); this.rectGeometry = AscFormat.ExecuteNoHistory(function(){return AscFormat.CreateGeometry("rect");}, this, []);
this.lockType = AscCommon.c_oAscLockTypes.kLockTypeNone; this.lockType = AscCommon.c_oAscLockTypes.kLockTypeNone;
......
cell/model/DrawingObjects/Format/GroupPrototype.js
View file @ 7e9b70ba
...@@ -90,8 +90,6 @@ CGroupShape.prototype.setRecalculateInfo = function() ...@@ -90,8 +90,6 @@ CGroupShape.prototype.setRecalculateInfo = function()
recalculateScaleCoefficients: true recalculateScaleCoefficients: true
}; };
this.localTransform = new AscCommon.CMatrix(); this.localTransform = new AscCommon.CMatrix();
this.bounds = {l: 0, t: 0, r: 0, b:0, w: 0, h:0};
this.lockType = AscCommon.c_oAscLockTypes.kLockTypeNone; this.lockType = AscCommon.c_oAscLockTypes.kLockTypeNone;
}; };
......
cell/model/DrawingObjects/Format/ImagePrototype.js
View file @ 7e9b70ba
...@@ -71,7 +71,6 @@ CImageShape.prototype.setRecalculateInfo = function() ...@@ -71,7 +71,6 @@ CImageShape.prototype.setRecalculateInfo = function()
recalculateLine: true, recalculateLine: true,
recalculateTransparent: true recalculateTransparent: true
}; };
this.bounds = {l: 0, t: 0, r: 0, b:0, w: 0, h:0};
this.lockType = AscCommon.c_oAscLockTypes.kLockTypeNone; this.lockType = AscCommon.c_oAscLockTypes.kLockTypeNone;
}; };
......
cell/model/DrawingObjects/Format/ShapePrototype.js
View file @ 7e9b70ba
...@@ -260,7 +260,6 @@ CShape.prototype.setRecalculateInfo = function() ...@@ -260,7 +260,6 @@ CShape.prototype.setRecalculateInfo = function()
oContentMetrics: null oContentMetrics: null
}; };
this.compiledStyles = []; this.compiledStyles = [];
this.bounds = {l: 0, t: 0, r: 0, b:0, w: 0, h:0};
this.lockType = AscCommon.c_oAscLockTypes.kLockTypeNone; this.lockType = AscCommon.c_oAscLockTypes.kLockTypeNone;
}; };
CShape.prototype.recalcContent = function() CShape.prototype.recalcContent = function()
......
common/Local/common.js
View file @ 7e9b70ba
...@@ -226,6 +226,12 @@ AscCommon.InitDragAndDrop = function(oHtmlElement, callback) { ...@@ -226,6 +226,12 @@ AscCommon.InitDragAndDrop = function(oHtmlElement, callback) {
} }
} }
window["asc_initAdvancedOptions"] = function(_code)
{
var _editor = window["Asc"]["editor"] ? window["Asc"]["editor"] : window.editor;
_editor._onNeedParams(undefined, (_code == 90 || _code == 91) ? true : undefined);
};
// меняем среду // меняем среду
//AscBrowser.isSafari = false; //AscBrowser.isSafari = false;
//AscBrowser.isSafariMacOs = false; //AscBrowser.isSafariMacOs = false;
......
slide/Editor/Format/ChartSpacePrototype.js
View file @ 7e9b70ba
...@@ -225,7 +225,6 @@ CChartSpace.prototype.setRecalculateInfo = function() ...@@ -225,7 +225,6 @@ CChartSpace.prototype.setRecalculateInfo = function()
recalculateBBoxRange: true recalculateBBoxRange: true
}; };
this.baseColors = []; this.baseColors = [];
this.bounds = {l: 0, t: 0, r: 0, b:0, w: 0, h:0};
this.chartObj = null; this.chartObj = null;
this.rectGeometry = AscFormat.ExecuteNoHistory(function(){return AscFormat.CreateGeometry("rect");}, this, []); this.rectGeometry = AscFormat.ExecuteNoHistory(function(){return AscFormat.CreateGeometry("rect");}, this, []);
this.lockType = AscCommon.c_oAscLockTypes.kLockTypeNone; this.lockType = AscCommon.c_oAscLockTypes.kLockTypeNone;
......
slide/Editor/Format/GroupPrototype.js
View file @ 7e9b70ba
...@@ -88,7 +88,6 @@ CGroupShape.prototype.setRecalculateInfo = function() ...@@ -88,7 +88,6 @@ CGroupShape.prototype.setRecalculateInfo = function()
recalculateScaleCoefficients: true recalculateScaleCoefficients: true
}; };
this.localTransform = new AscCommon.CMatrix(); this.localTransform = new AscCommon.CMatrix();
this.bounds = {l: 0, t: 0, r: 0, b:0, w: 0, h:0};
this.lockType = AscCommon.c_oAscLockTypes.kLockTypeNone; this.lockType = AscCommon.c_oAscLockTypes.kLockTypeNone;
}; };
......
slide/Editor/Format/ImagePrototype.js
View file @ 7e9b70ba
...@@ -73,7 +73,6 @@ CImageShape.prototype.setRecalculateInfo = function() ...@@ -73,7 +73,6 @@ CImageShape.prototype.setRecalculateInfo = function()
recalculateLine: true, recalculateLine: true,
recalculateTransparent: true recalculateTransparent: true
}; };
this.bounds = {l: 0, t: 0, r: 0, b:0, w: 0, h:0};
this.lockType = AscCommon.c_oAscLockTypes.kLockTypeNone; this.lockType = AscCommon.c_oAscLockTypes.kLockTypeNone;
}; };
......
slide/Editor/Format/ShapePrototype.js
View file @ 7e9b70ba
...@@ -223,7 +223,6 @@ CShape.prototype.setRecalculateInfo = function() ...@@ -223,7 +223,6 @@ CShape.prototype.setRecalculateInfo = function()
}; };
this.compiledStyles = []; this.compiledStyles = [];
this.bounds = {l: 0, t: 0, r: 0, b:0, w: 0, h:0};
this.lockType = AscCommon.c_oAscLockTypes.kLockTypeNone; this.lockType = AscCommon.c_oAscLockTypes.kLockTypeNone;
}; };
CShape.prototype.recalcContent = function() CShape.prototype.recalcContent = function()
......
slide/Local/api.js
View file @ 7e9b70ba
...@@ -260,3 +260,12 @@ window["on_editor_native_message"] = function(sCommand, sParam) ...@@ -260,3 +260,12 @@ window["on_editor_native_message"] = function(sCommand, sParam)
else if (sCommand == "editor:stopDemonstration") else if (sCommand == "editor:stopDemonstration")
editor.EndDemonstration(true); editor.EndDemonstration(true);
}; };
Asc['asc_docs_api'].prototype.asc_setAdvancedOptions = function(idOption, option)
{
if (window["Asc"].c_oAscAdvancedOptionsID.DRM === idOption) {
var _param = "";
_param += ("<m_sPassword>" + AscCommon.CopyPasteCorrectString(option.asc_getPassword()) + "</m_sPassword>");
window["AscDesktopEditor"]["SetAdvancedOptions"](_param);
}
};
\ No newline at end of file
word/Editor/GraphicObjects/Format/GroupPrototype.js
View file @ 7e9b70ba
...@@ -146,7 +146,6 @@ CGroupShape.prototype.setRecalculateInfo = function() ...@@ -146,7 +146,6 @@ CGroupShape.prototype.setRecalculateInfo = function()
recalculateWrapPolygon: true recalculateWrapPolygon: true
}; };
this.localTransform = new AscCommon.CMatrix(); this.localTransform = new AscCommon.CMatrix();
this.bounds = {l: 0, t: 0, r: 0, b:0, w: 0, h:0};
this.posX = null; this.posX = null;
this.posY = null; this.posY = null;
this.bNeedUpdatePosition = true; this.bNeedUpdatePosition = true;
......
word/Editor/GraphicObjects/Format/ImagePrototype.js
View file @ 7e9b70ba
...@@ -71,7 +71,6 @@ CImageShape.prototype.setRecalculateInfo = function() ...@@ -71,7 +71,6 @@ CImageShape.prototype.setRecalculateInfo = function()
this.bNeedUpdatePosition = true; this.bNeedUpdatePosition = true;
this.bounds = {l: 0, t: 0, r: 0, b:0, w: 0, h:0};
this.posX = null; this.posX = null;
this.posY = null; this.posY = null;
......
word/Editor/GraphicObjects/Format/ShapePrototype.js
View file @ 7e9b70ba
...@@ -66,7 +66,6 @@ CShape.prototype.setRecalculateInfo = function() ...@@ -66,7 +66,6 @@ CShape.prototype.setRecalculateInfo = function()
this.contentWidth = null; this.contentWidth = null;
this.contentHeight = null; this.contentHeight = null;
this.compiledStyles = []; this.compiledStyles = [];
this.bounds = {l: 0, t: 0, r: 0, b:0, w: 0, h:0};
this.posX = null; this.posX = null;
this.posY = null; this.posY = null;
......
word/Local/api.js
View file @ 7e9b70ba
...@@ -84,16 +84,18 @@ window["DesktopOfflineAppDocumentEndLoad"] = function(_url, _data) ...@@ -84,16 +84,18 @@ window["DesktopOfflineAppDocumentEndLoad"] = function(_url, _data)
Asc['asc_docs_api'].prototype.asc_setAdvancedOptions = function(idOption, option) Asc['asc_docs_api'].prototype.asc_setAdvancedOptions = function(idOption, option)
{ {
if (window["Asc"].c_oAscAdvancedOptionsID.TXT === idOption) { if (window["Asc"].c_oAscAdvancedOptionsID.TXT === idOption) {
window["AscDesktopEditor"]["SetAdvancedOptions"]("" + option.asc_getCodePage()); var _param = "";
_param += ("<m_nCsvTxtEncoding>" + option.asc_getCodePage() + "</m_nCsvTxtEncoding>");
window["AscDesktopEditor"]["SetAdvancedOptions"](_param);
}
else if (window["Asc"].c_oAscAdvancedOptionsID.DRM === idOption) {
var _param = "";
_param += ("<m_sPassword>" + AscCommon.CopyPasteCorrectString(option.asc_getPassword()) + "</m_sPassword>");
window["AscDesktopEditor"]["SetAdvancedOptions"](_param);
} }
}; };
Asc['asc_docs_api'].prototype["asc_setAdvancedOptions"] = Asc['asc_docs_api'].prototype.asc_setAdvancedOptions; Asc['asc_docs_api'].prototype["asc_setAdvancedOptions"] = Asc['asc_docs_api'].prototype.asc_setAdvancedOptions;
window["asc_initAdvancedOptions"] = function()
{
editor._onNeedParams(undefined);
};
///////////////////////////////////////////////////////// /////////////////////////////////////////////////////////
////////////// CHANGES ///////////////////// ////////////// CHANGES /////////////////////
///////////////////////////////////////////////////////// /////////////////////////////////////////////////////////
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7