Commit cb1678e6 authored by Sergey Luzyanin's avatar Sergey Luzyanin

fix Bug 32308 - NullState is not defined при передаче данных в совместном редактировании

Перенес некоторые файлы в mobile_banners
parent 1fbdcd9a
...@@ -2,7 +2,5 @@ CD /D %~dp0 ...@@ -2,7 +2,5 @@ CD /D %~dp0
call npm install -g grunt-cli call npm install -g grunt-cli
call npm install call npm install
call grunt --level=WHITESPACE_ONLY --nomap=true --mobile=true --formatting=PRETTY_PRINT call grunt --level=WHITESPACE_ONLY --nomap=true --mobile=true --formatting=PRETTY_PRINT
move ..\slide\sdk-all.js ..\..\core\test_mobile\sdk-all.js copy ..\slide\sdk-all.js ..\..\core\test_mobile\sdk-all.js
copy ..\common\Native\native.js ..\..\core\test_mobile\native.js
copy ..\common\Native\jquery_native.js ..\..\core\test_mobile\jquery_native.js
pause pause
\ No newline at end of file
...@@ -152,16 +152,18 @@ ...@@ -152,16 +152,18 @@
"../slide/Local/api.js" "../slide/Local/api.js"
], ],
"mobile_banners": [ "mobile_banners": [
"../slide/Native/native.js" "../common/Native/native.js",
"../common/Native/jquery_native.js",
"../../web-apps/vendor/xregexp/xregexp-all-min.js"
], ],
"mobile": [ "mobile": [
"../../web-apps/vendor/xregexp/xregexp-all-min.js",
"../common/browser.js", "../common/browser.js",
"../common/Native/Wrappers/memory.js", "../common/Native/Wrappers/memory.js",
"../common/Native/Wrappers/TextMeasurerWrapper.js", "../common/Native/Wrappers/TextMeasurerWrapper.js",
"../common/Native/Wrappers/DrawingStream.js", "../common/Native/Wrappers/DrawingStream.js",
"../common/Native/Wrappers/ShapeDrawer.js", "../common/Native/Wrappers/ShapeDrawer.js",
"../common/Native/Wrappers/Overlay.js", "../common/Native/Wrappers/Overlay.js",
"../slide/Native/native.js",
"../slide/Native/Wrappers/api.js", "../slide/Native/Wrappers/api.js",
"../slide/Native/Wrappers/HtmlPage.js", "../slide/Native/Wrappers/HtmlPage.js",
"../slide/Native/Wrappers/DrawingDocument.js" "../slide/Native/Wrappers/DrawingDocument.js"
...@@ -172,7 +174,6 @@ ...@@ -172,7 +174,6 @@
"../common/Overlay.js", "../common/Overlay.js",
"../slide/Drawing/HtmlPage.js", "../slide/Drawing/HtmlPage.js",
"../slide/Drawing/DrawingDocument.js", "../slide/Drawing/DrawingDocument.js",
"../common/FontsFreeType/font_engine.js",
"../common/FontsFreeType/FontFile.js", "../common/FontsFreeType/FontFile.js",
"../common/FontsFreeType/FontManager.js" "../common/FontsFreeType/FontManager.js"
], ],
......
...@@ -2130,7 +2130,7 @@ CPresentation.prototype = ...@@ -2130,7 +2130,7 @@ CPresentation.prototype =
|| oDrawingObjects.curState instanceof AscFormat.AddPolyLine2State || oDrawingObjects.curState instanceof AscFormat.AddPolyLine2State
|| oDrawingObjects.arrTrackObjects.length > 0) || oDrawingObjects.arrTrackObjects.length > 0)
{ {
oDrawingObjects.changeCurrentState(new NullState(oDrawingObjects)); oDrawingObjects.changeCurrentState(new AscFormat.NullState(oDrawingObjects));
if( oDrawingObjects.arrTrackObjects.length > 0) if( oDrawingObjects.arrTrackObjects.length > 0)
{ {
oDrawingObjects.clearTrackObjects(); oDrawingObjects.clearTrackObjects();
...@@ -3664,7 +3664,7 @@ CPresentation.prototype = ...@@ -3664,7 +3664,7 @@ CPresentation.prototype =
oDrawingObjects.clearPreTrackObjects(); oDrawingObjects.clearPreTrackObjects();
oDrawingObjects.clearTrackObjects(); oDrawingObjects.clearTrackObjects();
oDrawingObjects.resetSelection(); oDrawingObjects.resetSelection();
oDrawingObjects.changeCurrentState(new NullState(oDrawingObjects)); oDrawingObjects.changeCurrentState(new AscFormat.NullState(oDrawingObjects));
oDrawingObjects.loadDocumentStateAfterLoadChanges(oState); oDrawingObjects.loadDocumentStateAfterLoadChanges(oState);
} }
}, },
......
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