Skip to content

S
sdkjs
Commit 2dc4111b authored by Alexander.Trofimov's avatar Alexander.Trofimov
Browse files
Options

slides -> sdk-all + sdk-all-min

parent a1aa7cca
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 697 additions and 641 deletions
build/configs/webpowerpoint.json
View file @ 2dc4111b
......@@ -2,16 +2,22 @@
"compile": {
"sdk": {
"min": [
],
"common": [
"../common/browser.js",
"../common/commonDefines.js",
"../common/downloaderfiles.js",
"../common/docscoapicommon.js",
"../common/docscoapicommon.js",
"../common/docscoapi.js",
"../common/apiCommon.js",
"../common/apiCommon.js",
"../common/SerializeCommonWordExcel.js",
"../common/editorscommon.js",
"../slide/apiDefines.js",
"../common/CollaborativeEditingBase.js",
"../slide/Editor/CollaborativeEditing.js",
"../common/apiBase.js",
"../common/Private/license.js",
"../slide/api.js"
],
"common": [
"../common/downloaderfiles.js",
"../common/NumFormat.js",
"../common/SerializeChart.js",
"../common/AdvancedOptions.js",
......@@ -69,7 +75,6 @@
"../common/Drawings/Externals.js",
"../common/GlobalLoaders.js",
"../common/CollaborativeEditingBase.js",
"../common/Controls.js",
"../common/Overlay.js",
"../common/Drawings/HatchPattern.js",
......@@ -78,7 +83,6 @@
"../common/wordcopypaste.js",
"../slide/apiDefines.js",
"../slide/themes/Themes.js",
"../cell/utils/utils.js",
......@@ -93,7 +97,6 @@
"../word/Editor/Styles.js",
"../slide/Editor/Format/StylesPrototype.js",
"../word/Editor/Numbering.js",
"../slide/Editor/CollaborativeEditing.js",
"../word/Drawing/GraphicsEvents.js",
"../word/Drawing/Rulers.js",
"../word/Editor/Table.js",
......@@ -152,13 +155,9 @@
"../slide/Editor/Format/GroupPrototype.js",
"../slide/Editor/Format/ChartSpacePrototype.js",
"../slide/apiCommon.js",
"../word/apiCommon.js",
"../common/apiBase.js",
"../slide/api.js"
"../word/apiCommon.js"
],
"private": [
"../common/Private/license.js",
"../slide/Private/comments.js",
"../common/Private/Locks.js"
],
......
common/CollaborativeEditingBase.js
View file @ 2dc4111b
......@@ -328,7 +328,7 @@ CCollaborativeEditingBase.prototype.Apply_Changes = function()
// Если нет чужих изменений, тогда и делать ничего не надо
if (true === OtherChanges)
{
editor.Stop_Recalculate();
editor.WordControl.m_oLogicDocument.Stop_Recalculate();
editor.WordControl.m_oLogicDocument.EndPreview_MailMergeResult();
editor.sync_StartAction(Asc.c_oAscAsyncActionType.BlockInteraction, Asc.c_oAscAsyncAction.ApplyChanges);
......
common/editorscommon.js
View file @ 2dc4111b
......@@ -2238,7 +2238,7 @@ CTableId.prototype.Load_Changes = function(Reader, Reader2)
oLogicDocument.DrawingObjects.addGraphicObject(oParaDrawing);
}, this, []);
}
else if(oLogicDocument instanceof CPresentation)
else if(oLogicDocument instanceof AscCommonSlide.CPresentation)
{
if(oLogicDocument.Slides[0])
{
......
slide/Drawing/HtmlPage.js
View file @ 2dc4111b
......@@ -1554,8 +1554,8 @@ function CEditorPage(api)
_yOffset += (7 * g_dKoef_mm_to_pix);
}
if (window.closeDialogs != undefined)
closeDialogs();
if (window['closeDialogs'] != undefined)
window['closeDialogs']();
AscCommon.check_MouseDownEvent(e, true);
global_mouseEvent.LockMouse();
......
slide/Drawing/ThemeLoader.js
View file @ 2dc4111b
"use strict";
function CAscThemes()
{
this.EditorThemes = [];
this.DocumentThemes = [];
var _count = AscCommon._presentation_editor_themes.length;
for (var i = 0; i < _count; i++)
{
this.EditorThemes[i] = new CAscThemeInfo(AscCommon._presentation_editor_themes[i]);
this.EditorThemes[i].Index = i;
}
}
CAscThemes.prototype.get_EditorThemes = function(){ return this.EditorThemes; };
CAscThemes.prototype.get_DocumentThemes = function(){ return this.DocumentThemes; };
function CThemeLoadInfo()
{
this.FontMap = null;
......@@ -165,3 +180,10 @@ function CThemeLoader()
this.CurrentLoadThemeIndex = -1;
};
}
//-------------------------------------------------------------export---------------------------------------------------
window['AscCommonSlide'] = window['AscCommonSlide'] || {};
window['AscCommonSlide'].CThemeLoader = CThemeLoader;
window['AscCommonSlide'].CThemeLoadInfo = CThemeLoadInfo;
CAscThemes.prototype['get_EditorThemes'] = CAscThemes.prototype.get_EditorThemes;
CAscThemes.prototype['get_DocumentThemes'] = CAscThemes.prototype.get_DocumentThemes;
\ No newline at end of file
slide/Editor/CollaborativeEditing.js
View file @ 2dc4111b
......@@ -81,7 +81,7 @@ CCollaborativeEditing.prototype.Send_Changes = function(IsUserSave, AdditionalIn
{
editor.WordControl.m_oLogicDocument.DrawingDocument.UnLockSlide(Class.num);
}
if(Class instanceof PropLocker)
if(Class instanceof AscCommonSlide.PropLocker)
{
var Class2 = AscCommon.g_oTableId.Get_ById(Class.objectId);
if(Class2 && Class2.getObjectType && Class2.getObjectType() === AscDFH.historyitem_type_Slide && Class2.deleteLock === Class)
......@@ -206,14 +206,14 @@ CCollaborativeEditing.prototype.Release_Locks = function()
var CurLockType = this.m_aNeedUnlock[Index].Lock.Get_Type();
if ( AscCommon.locktype_Other3 != CurLockType && AscCommon.locktype_Other != CurLockType )
{
//if(this.m_aNeedUnlock[Index] instanceof Slide) //TODO: проверять LockObject
//if(this.m_aNeedUnlock[Index] instanceof AscCommonSlide.Slide) //TODO: проверять LockObject
// editor.WordControl.m_oLogicDocument.DrawingDocument.UnLockSlide(this.m_aNeedUnlock[Index].num);
var Class = this.m_aNeedUnlock[Index];
this.m_aNeedUnlock[Index].Lock.Set_Type( AscCommon.locktype_None, false);
if ( Class instanceof PropLocker )
if ( Class instanceof AscCommonSlide.PropLocker )
{
var object = AscCommon.g_oTableId.Get_ById(Class.objectId);
if(object instanceof CPresentation)
if(object instanceof AscCommonSlide.CPresentation)
{
if(Class === editor.WordControl.m_oLogicDocument.themeLock)
{
......@@ -233,7 +233,7 @@ CCollaborativeEditing.prototype.Release_Locks = function()
editor.WordControl.m_oLogicDocument.DrawingDocument.UnLockSlide(object.num);
}
}
if(Class instanceof CComment)
if(Class instanceof AscCommon.CComment)
{
editor.sync_UnLockComment(Class.Get_Id());
}
......@@ -241,7 +241,7 @@ CCollaborativeEditing.prototype.Release_Locks = function()
else if ( AscCommon.locktype_Other3 === CurLockType )
{
this.m_aNeedUnlock[Index].Lock.Set_Type( AscCommon.locktype_Other, false);
if(this.m_aNeedUnlock[Index] instanceof Slide)
if(this.m_aNeedUnlock[Index] instanceof AscCommonSlide.Slide)
editor.WordControl.m_oLogicDocument.DrawingDocument.LockSlide(this.m_aNeedUnlock[Index].num);
}
if(this.m_aNeedUnlock[Index].parent && AscFormat.isRealNumber(this.m_aNeedUnlock[Index].parent.num))
......@@ -339,7 +339,7 @@ CCollaborativeEditing.prototype.OnEnd_CheckLock = function()
if ( null != Class )
{
Class.Lock.Set_Type( AscCommon.locktype_Mine, false );
if(Class instanceof Slide)
if(Class instanceof AscCommonSlide.Slide)
editor.WordControl.m_oLogicDocument.DrawingDocument.UnLockSlide(Class.num);
this.Add_Unlock2( Class );
}
......@@ -396,7 +396,7 @@ CCollaborativeEditing.prototype.OnCallback_AskLock = function(result)
if ( null != Class )
{
Class.Lock.Set_Type( AscCommon.locktype_Mine );
if(Class instanceof Slide)
if(Class instanceof AscCommonSlide.Slide)
editor.WordControl.m_oLogicDocument.DrawingDocument.UnLockSlide(Class.num);
AscCommon.CollaborativeEditing.Add_Unlock2( Class );
}
......@@ -475,7 +475,7 @@ CCollaborativeEditing.prototype.Update_ForeignCursorsPositions = function()
}
return;
}
var bTable = (oTargetDocContentOrTable instanceof CTable);
var bTable = (oTargetDocContentOrTable instanceof AscCommonWord.CTable);
for (var UserId in this.m_aForeignCursors){
var DocPos = this.m_aForeignCursors[UserId];
if (!DocPos || DocPos.length <= 0)
......@@ -490,7 +490,7 @@ CCollaborativeEditing.prototype.Update_ForeignCursorsPositions = function()
};
CCollaborativeEditing.prototype.Update_ForeignCursorPosition = function(UserId, Run, InRunPos, isRemoveLabel, oTargetDocContentOrTable, bTable){
if (!(Run instanceof ParaRun))
if (!(Run instanceof AscCommonWord.ParaRun))
return;
var DrawingDocument = editor.WordControl.m_oDrawingDocument;
......
slide/Editor/Format/Presentation.js
View file @ 2dc4111b
......@@ -5164,4 +5164,8 @@ function collectSelectedObjects(aSpTree, aCollectArray, bRecursive)
collectSelectedObjects(aSpTree[i].spTree, aCollectArray, bRecursive);
}
}
}
\ No newline at end of file
}
//------------------------------------------------------------export----------------------------------------------------
window['AscCommonSlide'] = window['AscCommonSlide'] || {};
window['AscCommonSlide'].CPresentation = CPresentation;
slide/api.js
View file @ 2dc4111b
This diff is collapsed.
slide/apiCommon.js
View file @ 2dc4111b
This diff is collapsed.
word/Drawing/HtmlPage.js
View file @ 2dc4111b
......@@ -1601,8 +1601,8 @@ function CEditorPage(api)
_yOffset += (7 * g_dKoef_mm_to_pix);
}
if (window.closeDialogs != undefined)
closeDialogs();
if (window['closeDialogs'] != undefined)
window['closeDialogs']();
AscCommon.check_MouseDownEvent(e, true);
global_mouseEvent.LockMouse();
......
word/Editor/CollaborativeEditing.js
View file @ 2dc4111b
......@@ -111,7 +111,7 @@ CWordCollaborativeEditing.prototype.Send_Changes = function(IsUserSave, Addition
}
// TODO: Пока у нас обнуляется история на сохранении нужно обновлять Undo/Redo
editor.Document_UpdateUndoRedoState();
editor.WordControl.m_oLogicDocument.Document_UpdateUndoRedoState();
// Перерисовываем документ (для обновления локов)
editor.WordControl.m_oLogicDocument.DrawingDocument.ClearCachePages();
......
word/api.js
View file @ 2dc4111b
......@@ -6786,13 +6786,6 @@ asc_docs_api.prototype._onEndLoadSdk = function() {
asc_docs_api.superclass._onEndLoadSdk.call(this);
};
asc_docs_api.prototype.Stop_Recalculate = function() {
this.WordControl.m_oLogicDocument.Stop_Recalculate();
};
asc_docs_api.prototype.Document_UpdateUndoRedoState = function() {
editor.WordControl.m_oLogicDocument.Document_UpdateUndoRedoState();
};
window["asc_docs_api"] = asc_docs_api;
window["asc_docs_api"].prototype["asc_nativeOpenFile"] = function(base64File, version)
{
......
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