Skip to content

S
sdkjs
Commit 61a39c89 authored by Oleg Korshul's avatar Oleg Korshul
Browse files
Options

plugins

parent a5896310
Show whitespace changes
Inline Side-by-side
Showing with 258 additions and 120 deletions
cell/model/clipboard.js
View file @ 61a39c89
...@@ -181,32 +181,32 @@ ...@@ -181,32 +181,32 @@
var fragments = wb.cellEditor.copySelection(); var fragments = wb.cellEditor.copySelection();
_data = wb.cellEditor._getFragmentsText(fragments); _data = wb.cellEditor._getFragmentsText(fragments);
_clipboard.pushData(c_oAscClipboardDataFormat.Text, _data) _clipboard.pushData(AscCommon.c_oAscClipboardDataFormat.Text, _data)
} }
else else
{ {
//TEXT //TEXT
if (c_oAscClipboardDataFormat.Text & _formats) if (AscCommon.c_oAscClipboardDataFormat.Text & _formats)
{ {
//_data = ; //_data = ;
//_clipboard.pushData(c_oAscClipboardDataFormat.Text, _data) //_clipboard.pushData(AscCommon.c_oAscClipboardDataFormat.Text, _data)
} }
//HTML //HTML
if(c_oAscClipboardDataFormat.Html & _formats) if(AscCommon.c_oAscClipboardDataFormat.Html & _formats)
{ {
_data = this._getHtml(activeRange, ws); _data = this._getHtml(activeRange, ws);
_clipboard.pushData(c_oAscClipboardDataFormat.Html, _data.html) _clipboard.pushData(AscCommon.c_oAscClipboardDataFormat.Html, _data.html)
} }
//INTERNAL //INTERNAL
if(c_oAscClipboardDataFormat.Internal & _formats) if(AscCommon.c_oAscClipboardDataFormat.Internal & _formats)
{ {
if(_data && _data.base64) if(_data && _data.base64)
_data = _data.base64; _data = _data.base64;
else else
_data = this._getBinaryForCopy(worksheetView); _data = this._getBinaryForCopy(worksheetView);
_clipboard.pushData(c_oAscClipboardDataFormat.Internal, _data) _clipboard.pushData(AscCommon.c_oAscClipboardDataFormat.Internal, _data)
} }
} }
}, },
......
common/Local/common.js
View file @ 61a39c89
...@@ -164,6 +164,13 @@ window["NativeCorrectImageUrlOnPaste"] = function(url) ...@@ -164,6 +164,13 @@ window["NativeCorrectImageUrlOnPaste"] = function(url)
return window["AscDesktopEditor"]["LocalFileGetImageUrl"](url); return window["AscDesktopEditor"]["LocalFileGetImageUrl"](url);
}; };
window["UpdateInstallPlugins"] = function()
{
var _plugins = JSON.parse(window["AscDesktopEditor"]["GetInstallPlugins"]());
var _editor = window["Asc"]["editor"] ? window["Asc"]["editor"] : window.editor;
_editor.asc_fireCallback("asc_onPluginsInit", _plugins);
};
AscCommon.InitDragAndDrop = function(oHtmlElement, callback) { AscCommon.InitDragAndDrop = function(oHtmlElement, callback) {
if ("undefined" != typeof(FileReader) && null != oHtmlElement) { if ("undefined" != typeof(FileReader) && null != oHtmlElement) {
oHtmlElement["ondragover"] = function (e) { oHtmlElement["ondragover"] = function (e) {
......
common/apiBase.js
View file @ 61a39c89
...@@ -686,10 +686,10 @@ baseEditorsApi.prototype.asc_pluginsRegister = function(basePath, plugins) ...@@ -686,10 +686,10 @@ baseEditorsApi.prototype.asc_pluginsRegister = function(basePath, plugins)
if (null != this.pluginsManager) if (null != this.pluginsManager)
this.pluginsManager.register(basePath, plugins); this.pluginsManager.register(basePath, plugins);
}; };
baseEditorsApi.prototype.asc_pluginRun = function(guid, data) baseEditorsApi.prototype.asc_pluginRun = function(guid, variation, data)
{ {
if (null != this.pluginsManager) if (null != this.pluginsManager)
this.pluginsManager.run(guid, data); this.pluginsManager.run(guid, variation, data);
}; };
baseEditorsApi.prototype.asc_pluginResize = function(guid, data, width, height) baseEditorsApi.prototype.asc_pluginResize = function(guid, data, width, height)
{ {
......
common/clipboard_base.js
View file @ 61a39c89
...@@ -22,6 +22,7 @@ var c_oAscClipboardDataFormat = { ...@@ -22,6 +22,7 @@ var c_oAscClipboardDataFormat = {
Internal : 4, Internal : 4,
HtmlElement : 8 HtmlElement : 8
}; };
AscCommon.c_oAscClipboardDataFormat = c_oAscClipboardDataFormat;
function CClipboardBase() function CClipboardBase()
{ {
...@@ -70,7 +71,7 @@ CClipboardBase.prototype = ...@@ -70,7 +71,7 @@ CClipboardBase.prototype =
} }
else else
{ {
this.Api.asc_CheckCopy(this, c_oAscClipboardDataFormat.Text | c_oAscClipboardDataFormat.Html | c_oAscClipboardDataFormat.Internal); this.Api.asc_CheckCopy(this, AscCommon.c_oAscClipboardDataFormat.Text | AscCommon.c_oAscClipboardDataFormat.Html | AscCommon.c_oAscClipboardDataFormat.Internal);
e.preventDefault(); e.preventDefault();
return false; return false;
} }
...@@ -90,7 +91,7 @@ CClipboardBase.prototype = ...@@ -90,7 +91,7 @@ CClipboardBase.prototype =
} }
else else
{ {
this.Api.asc_CheckCopy(this, c_oAscClipboardDataFormat.Text | c_oAscClipboardDataFormat.Html | c_oAscClipboardDataFormat.Internal); this.Api.asc_CheckCopy(this, AscCommon.c_oAscClipboardDataFormat.Text | AscCommon.c_oAscClipboardDataFormat.Html | AscCommon.c_oAscClipboardDataFormat.Internal);
} }
this.Api.asc_SelectionCut(); this.Api.asc_SelectionCut();
...@@ -123,7 +124,7 @@ CClipboardBase.prototype = ...@@ -123,7 +124,7 @@ CClipboardBase.prototype =
{ {
window.setTimeout( function() { window.setTimeout( function() {
g_clipboardBase.Api.asc_PasteData(c_oAscClipboardDataFormat.HtmlElement, g_clipboardBase.CommonDiv); g_clipboardBase.Api.asc_PasteData(AscCommon.c_oAscClipboardDataFormat.HtmlElement, g_clipboardBase.CommonDiv);
g_clipboardBase.CommonDiv_End(); g_clipboardBase.CommonDiv_End();
g_clipboardBase.Paste_End(); g_clipboardBase.Paste_End();
...@@ -139,7 +140,7 @@ CClipboardBase.prototype = ...@@ -139,7 +140,7 @@ CClipboardBase.prototype =
var _internal = this.ClosureParams.getData("text/x-custom"); var _internal = this.ClosureParams.getData("text/x-custom");
if (_internal && _internal != "" && _internal.indexOf("asc_internalData;") == 0) if (_internal && _internal != "" && _internal.indexOf("asc_internalData;") == 0)
{ {
this.Api.asc_PasteData(c_oAscClipboardDataFormat.Internal, _internal.substr("asc_internalData;".length)); this.Api.asc_PasteData(AscCommon.c_oAscClipboardDataFormat.Internal, _internal.substr("asc_internalData;".length));
g_clipboardBase.Paste_End(); g_clipboardBase.Paste_End();
return false; return false;
} }
...@@ -543,7 +544,7 @@ CClipboardBase.prototype = ...@@ -543,7 +544,7 @@ CClipboardBase.prototype =
this.CommonDiv_Start(); this.CommonDiv_Start();
this.ClosureParams.isDivCopy = true; this.ClosureParams.isDivCopy = true;
this.Api.asc_CheckCopy(this, c_oAscClipboardDataFormat.Html); this.Api.asc_CheckCopy(this, AscCommon.c_oAscClipboardDataFormat.Html);
this.ClosureParams.isDivCopy = false; this.ClosureParams.isDivCopy = false;
this.CommonDiv_Select(); this.CommonDiv_Select();
...@@ -596,7 +597,7 @@ CClipboardBase.prototype = ...@@ -596,7 +597,7 @@ CClipboardBase.prototype =
{ {
ifr.style.display = "block"; ifr.style.display = "block";
this.Api.asc_PasteData(c_oAscClipboardDataFormat.HtmlElement, frameWindow.document.body, ifr); this.Api.asc_PasteData(AscCommon.c_oAscClipboardDataFormat.HtmlElement, frameWindow.document.body, ifr);
} }
} }
...@@ -625,7 +626,7 @@ CClipboardBase.prototype = ...@@ -625,7 +626,7 @@ CClipboardBase.prototype =
{ {
if (this.ClosureParams.isDivCopy === true) if (this.ClosureParams.isDivCopy === true)
{ {
if (_format == c_oAscClipboardDataFormat.Html) if (_format == AscCommon.c_oAscClipboardDataFormat.Html)
this.CommonDiv.innerHTML = _data; this.CommonDiv.innerHTML = _data;
return; return;
} }
...@@ -633,13 +634,13 @@ CClipboardBase.prototype = ...@@ -633,13 +634,13 @@ CClipboardBase.prototype =
var _data_format = ""; var _data_format = "";
switch (_format) switch (_format)
{ {
case c_oAscClipboardDataFormat.Html: case AscCommon.c_oAscClipboardDataFormat.Html:
_data_format = "text/html"; _data_format = "text/html";
break; break;
case c_oAscClipboardDataFormat.Text: case AscCommon.c_oAscClipboardDataFormat.Text:
_data_format = "text/plain"; _data_format = "text/plain";
break; break;
case c_oAscClipboardDataFormat.Internal: case AscCommon.c_oAscClipboardDataFormat.Internal:
_data_format = "text/x-custom"; _data_format = "text/x-custom";
break; break;
default: default:
......
common/commonDefines.js
View file @ 61a39c89
...@@ -1454,9 +1454,10 @@ window['Asc']['c_oAscMaxCellOrCommentLength'] = window['Asc'].c_oAscMaxCellOrCom ...@@ -1454,9 +1454,10 @@ window['Asc']['c_oAscMaxCellOrCommentLength'] = window['Asc'].c_oAscMaxCellOrCom
// ----------------------------- plugins ------------------------------- // // ----------------------------- plugins ------------------------------- //
var EPluginDataType = var EPluginDataType =
{ {
none : 0, none : "none",
text : 1, text : "text",
ole : 2 ole : "ole",
html : "html"
}; };
window["Asc"]["EPluginDataType"] = EPluginDataType; window["Asc"]["EPluginDataType"] = EPluginDataType;
...@@ -1464,16 +1465,21 @@ window['Asc']['c_oAscMaxCellOrCommentLength'] = window['Asc'].c_oAscMaxCellOrCom ...@@ -1464,16 +1465,21 @@ window['Asc']['c_oAscMaxCellOrCommentLength'] = window['Asc'].c_oAscMaxCellOrCom
prot['none'] = prot.none; prot['none'] = prot.none;
prot['text'] = prot.text; prot['text'] = prot.text;
prot['ole'] = prot.ole; prot['ole'] = prot.ole;
prot['html'] = prot.html;
function CPlugin() function CPluginVariation()
{ {
this.name = ""; this.description = "";
this.guid = "";
this.url = ""; this.url = "";
this.index = 0; // сверху не выставляем. оттуда в каком порядке пришли - в таком порядке и работают
this.icons = ["1x", "2x"]; this.icons = ["1x", "2x"];
this.isViewer = false;
this.EditorsSupport = ["word", "cell", "slide"];
this.isVisual = false; this.isVisual = false; // визуальный ли
this.isModal = false; // модальное ли окно (используется только для визуального)
this.isInsideMode = false; // отрисовка не в окне а внутри редактора (в панели) (используется только для визуального немодального)
this.initDataType = EPluginDataType.none; this.initDataType = EPluginDataType.none;
this.initData = ""; this.initData = "";
...@@ -1482,28 +1488,55 @@ window['Asc']['c_oAscMaxCellOrCommentLength'] = window['Asc'].c_oAscMaxCellOrCom ...@@ -1482,28 +1488,55 @@ window['Asc']['c_oAscMaxCellOrCommentLength'] = window['Asc'].c_oAscMaxCellOrCom
this.buttons = [{"text":"Ok","primary":true},{"text":"Cancel","primary":false}]; this.buttons = [{"text":"Ok","primary":true},{"text":"Cancel","primary":false}];
} }
CPluginVariation.prototype["get_Description"] = function() { return this.description; };
CPluginVariation.prototype["set_Description"] = function(value) { this.description = value; } ;
CPluginVariation.prototype["get_Url"] = function() { return this.url; };
CPluginVariation.prototype["set_Url"] = function(value) { this.url = value; };
CPluginVariation.prototype["get_Icons"] = function() { return this.icons; };
CPluginVariation.prototype["set_Icons"] = function(value) { this.icons = value; };
CPluginVariation.prototype["get_Viewer"] = function() { return this.isViewer; };
CPluginVariation.prototype["set_Viewer"] = function(value) { this.isViewer = value; };
CPluginVariation.prototype["get_EditorsSupport"] = function() { return this.EditorsSupport; };
CPluginVariation.prototype["set_EditorsSupport"] = function(value) { this.EditorsSupport = value; };
CPluginVariation.prototype["get_Visual"] = function() { return this.isVisual; };
CPluginVariation.prototype["set_Visual"] = function(value) { this.isVisual = value; };
CPluginVariation.prototype["get_Modal"] = function() { return this.isModal; };
CPluginVariation.prototype["set_Modal"] = function(value) { this.isModal = value; };
CPluginVariation.prototype["get_InsideMode"] = function() { return this.isInsideMode; };
CPluginVariation.prototype["set_InsideMode"] = function(value) { this.isInsideMode = value; };
CPluginVariation.prototype["get_InitDataType"] = function() { return this.initDataType; };
CPluginVariation.prototype["set_InitDataType"] = function(value) { this.initDataType = value; };
CPluginVariation.prototype["get_InitData"] = function() { return this.initData; };
CPluginVariation.prototype["set_InitData"] = function(value) { this.initData = value; };
CPluginVariation.prototype["get_UpdateOleOnResize"] = function() { return this.isUpdateOleOnResize; };
CPluginVariation.prototype["set_UpdateOleOnResize"] = function(value) { this.isUpdateOleOnResize = value; };
CPluginVariation.prototype["get_Buttons"] = function() { return this.buttons; };
CPluginVariation.prototype["set_Buttons"] = function(value) { this.buttons = value; };
function CPlugin()
{
this.name = "";
this.guid = "";
this.variations = [];
}
CPlugin.prototype["get_Name"] = function() { return this.name; }; CPlugin.prototype["get_Name"] = function() { return this.name; };
CPlugin.prototype["set_Name"] = function(value) { this.name = value; } ; CPlugin.prototype["set_Name"] = function(value) { this.name = value; } ;
CPlugin.prototype["get_Guid"] = function() { return this.guid; }; CPlugin.prototype["get_Guid"] = function() { return this.guid; };
CPlugin.prototype["set_Guid"] = function(value) { this.guid = value; }; CPlugin.prototype["set_Guid"] = function(value) { this.guid = value; };
CPlugin.prototype["get_Url"] = function() { return this.url; };
CPlugin.prototype["set_Url"] = function(value) { this.url = value; };
CPlugin.prototype["get_Icons"] = function() { return this.icons; };
CPlugin.prototype["set_Icons"] = function(value) { this.icons = value; };
CPlugin.prototype["get_Visual"] = function() { return this.isVisual; };
CPlugin.prototype["set_Visual"] = function(value) { this.isVisual = value; };
CPlugin.prototype["get_InitDataType"] = function() { return this.initDataType; };
CPlugin.prototype["set_InitDataType"] = function(value) { this.initDataType = value; };
CPlugin.prototype["get_InitData"] = function() { return this.initData; };
CPlugin.prototype["set_InitData"] = function(value) { this.initData = value; };
CPlugin.prototype["get_UpdateOleOnResize"] = function() { return this.isUpdateOleOnResize; }; CPlugin.prototype["get_Variations"] = function() { return this.variations; };
CPlugin.prototype["set_UpdateOleOnResize"] = function(value) { this.isUpdateOleOnResize = value; }; CPlugin.prototype["set_Variations"] = function(value) { this.variations = value; };
CPlugin.prototype["get_Buttons"] = function() { return this.buttons; };
CPlugin.prototype["set_Buttons"] = function(value) { this.buttons = value; };
window["Asc"]["CPluginVariation"] = CPluginVariation;
window["Asc"]["CPlugin"] = CPlugin; window["Asc"]["CPlugin"] = CPlugin;
// --------------------------------------------------------------------- // // --------------------------------------------------------------------- //
})(window); })(window);
common/plugins.js
View file @ 61a39c89
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
for (var i = 0; i < plugins.length; i++) for (var i = 0; i < plugins.length; i++)
this.plugins.push(plugins[i]); this.plugins.push(plugins[i]);
}, },
run : function(guid, data) run : function(guid, variation, data)
{ {
if (null != this.current) if (null != this.current)
{ {
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
{ {
this.runAndCloseData = {}; this.runAndCloseData = {};
this.runAndCloseData.guid = guid; this.runAndCloseData.guid = guid;
this.runAndCloseData.variation = variation;
this.runAndCloseData.data = data; this.runAndCloseData.data = data;
} }
// закрываем // закрываем
...@@ -46,7 +47,7 @@ ...@@ -46,7 +47,7 @@
if (this.current == null) if (this.current == null)
return false; return false;
this.startData = data; this.startData = (data == null) ? "" : data;
this.show(); this.show();
}, },
runResize : function(guid, data, width, height) runResize : function(guid, data, width, height)
...@@ -54,7 +55,7 @@ ...@@ -54,7 +55,7 @@
}, },
close : function() close : function()
{ {
if (!this.current.isVisual) { if (!this.current.variations[0].isVisual) {
var _div = document.getElementById("plugin_iframe"); var _div = document.getElementById("plugin_iframe");
if (_div) if (_div)
_div.parentNode.removeChild(_div); _div.parentNode.removeChild(_div);
...@@ -63,7 +64,7 @@ ...@@ -63,7 +64,7 @@
if (this.runAndCloseData) if (this.runAndCloseData)
{ {
this.run(this.runAndCloseData.guid, this.runAndCloseData.data); this.run(this.runAndCloseData.guid, this.runAndCloseData.variation, this.runAndCloseData.data);
this.runAndCloseData = null; this.runAndCloseData = null;
} }
this.api.asc_fireCallback("asc_onPluginClose"); this.api.asc_fireCallback("asc_onPluginClose");
...@@ -71,7 +72,7 @@ ...@@ -71,7 +72,7 @@
show : function() show : function()
{ {
if (this.current.isVisual) if (this.current.variations[0].isVisual)
{ {
this.api.asc_fireCallback("asc_onPluginShow", this.current); this.api.asc_fireCallback("asc_onPluginShow", this.current);
} }
...@@ -80,7 +81,7 @@ ...@@ -80,7 +81,7 @@
var ifr = document.createElement("iframe"); var ifr = document.createElement("iframe");
ifr.name = "plugin_iframe"; ifr.name = "plugin_iframe";
ifr.id = "plugin_iframe"; ifr.id = "plugin_iframe";
ifr.src = this.path + this.current.url; ifr.src = this.path + this.current.variations[0].url;
ifr.style.position = 'absolute'; ifr.style.position = 'absolute';
ifr.style.top = '-100px'; ifr.style.top = '-100px';
ifr.style.left = '0px'; ifr.style.left = '0px';
...@@ -104,7 +105,7 @@ ...@@ -104,7 +105,7 @@
init : function() init : function()
{ {
var _data = ""; var _data = "";
switch (this.current.initDataType) switch (this.current.variations[0].initDataType)
{ {
case Asc.EPluginDataType.text: case Asc.EPluginDataType.text:
{ {
...@@ -205,47 +206,141 @@ ...@@ -205,47 +206,141 @@
// потом удалить!!! // потом удалить!!!
function TEST_PLUGINS() function TEST_PLUGINS()
{ {
var plugin1 = new Asc.CPlugin(); var _plugins = [
plugin1.name = "chess (fen)"; {
plugin1.guid = "{FFE1F462-1EA2-4391-990D-4CC84940B754}"; name : "chess (fen)",
plugin1.url = "chess/index.html"; guid : "{FFE1F462-1EA2-4391-990D-4CC84940B754}",
plugin1.icons = ["chess/icon.png", "chess/icon@2x.png"];
plugin1.isVisual = true; variations : [
plugin1.initDataType = Asc.EPluginDataType.ole; {
plugin1.isUpdateOleOnResize = true; description : "chess",
plugin1.buttons = [{"text":"Ok","primary":true},{"text":"Cancel","primary":false}]; url : "chess/index.html",
var plugin2 = new Asc.CPlugin(); icons : ["chess/icon.png", "chess/icon@2x.png"],
plugin2.name = "glavred"; isViewer : true,
plugin2.guid = "{B631E142-E40B-4B4C-90B9-2D00222A286E}"; EditorsSupport : ["word", "cell", "slide"],
plugin2.url = "glavred/index.html";
plugin2.icons = ["glavred/icon.png", "glavred/icon@2x.png"]; isVisual : true,
plugin2.isVisual = true; isModal : true,
plugin2.initDataType = Asc.EPluginDataType.text; isInsideMode : false,
plugin2.isUpdateOleOnResize = false;
plugin2.buttons = [{"text":"Ok","primary":true}]; initDataType : "ole",
initData : "",
var plugin3 = new Asc.CPlugin();
plugin3.name = "bold"; isUpdateOleOnResize : true,
plugin3.guid = "{14E46CC2-5E56-429C-9D55-1032B596D928}";
plugin3.url = "bold/index.html"; buttons : [ { text: "Ok", primary: true },
plugin3.icons = ["bold/icon.png", "bold/icon@2x.png"]; { text: "Cancel", primary: false } ]
plugin3.isVisual = false; }
plugin3.initDataType = Asc.EPluginDataType.none; ]
plugin3.isUpdateOleOnResize = false; },
plugin3.buttons = []; {
name : "glavred",
var plugin4 = new Asc.CPlugin(); guid : "{B631E142-E40B-4B4C-90B9-2D00222A286E}",
plugin4.name = "speech";
plugin4.guid = "{D71C2EF0-F15B-47C7-80E9-86D671F9C595}"; variations : [
plugin4.url = "speech/index.html"; {
plugin4.icons = ["speech/icon.png", "speech/icon@2x.png"]; description : "glavred",
plugin4.isVisual = false; url : "glavred/index.html",
plugin4.initDataType = Asc.EPluginDataType.text;
plugin4.isUpdateOleOnResize = false; icons : ["glavred/icon.png", "glavred/icon@2x.png"],
plugin4.buttons = []; isViewer : true,
EditorsSupport : ["word", "cell", "slide"],
var _plugins = [plugin1, plugin2, plugin3, plugin4];
isVisual : true,
isModal : true,
isInsideMode : false,
initDataType : "text",
initData : "",
isUpdateOleOnResize : false,
buttons : [ { text: "Ok", primary: true } ]
}
]
},
{
name : "bold",
guid : "{14E46CC2-5E56-429C-9D55-1032B596D928}",
variations : [
{
description : "bold",
url : "bold/index.html",
icons : ["bold/icon.png", "bold/icon@2x.png"],
isViewer : false,
EditorsSupport : ["word", "cell", "slide"],
isVisual : false,
isModal : false,
isInsideMode : false,
initDataType : "none",
initData : "",
isUpdateOleOnResize : false,
buttons : []
}
]
},
{
name : "speech",
guid : "{D71C2EF0-F15B-47C7-80E9-86D671F9C595}",
variations : [
{
description : "speech",
url : "speech/index.html",
icons : ["speech/icon.png", "speech/icon@2x.png"],
isViewer : true,
EditorsSupport : ["word", "cell", "slide"],
isVisual : false,
isModal : false,
isInsideMode : false,
initDataType : "text",
initData : "",
isUpdateOleOnResize : false,
buttons : [ ]
}
]
},
{
name : "youtube",
guid : "{38E022EA-AD92-45FC-B22B-49DF39746DB4}",
variations : [
{
description : "youtube",
url : "youtube/index.html",
icons : ["youtube/icon.png", "youtube/icon@2x.png"],
isViewer : true,
EditorsSupport : ["word", "cell", "slide"],
isVisual : true,
isModal : true,
isInsideMode : false,
initDataType : "ole",
initData : "",
isUpdateOleOnResize : true,
buttons : [ { text: "Ok", primary: true },
{ text: "Cancel", primary: false } ]
}
]
}
];
window.g_asc_plugins.api.asc_pluginsRegister("../../../../sdkjs-plugins/", _plugins); window.g_asc_plugins.api.asc_pluginsRegister("../../../../sdkjs-plugins/", _plugins);
// добавляем кнопки (тест) // добавляем кнопки (тест)
......
word/Editor/GraphicObjects/GraphicObjects.js
View file @ 61a39c89
...@@ -1220,7 +1220,7 @@ CGraphicObjects.prototype = ...@@ -1220,7 +1220,7 @@ CGraphicObjects.prototype =
{ {
if(false === this.document.Document_Is_SelectionLocked(changestype_Drawing_Props)) if(false === this.document.Document_Is_SelectionLocked(changestype_Drawing_Props))
{ {
editor.asc_pluginRun(oleObject.m_sApplicationId, oleObject.m_sData); editor.asc_pluginRun(oleObject.m_sApplicationId, 0, oleObject.m_sData);
} }
this.changeCurrentState(new AscFormat.NullState(this)); this.changeCurrentState(new AscFormat.NullState(this));
this.document.OnMouseUp(e, x, y, pageIndex); this.document.OnMouseUp(e, x, y, pageIndex);
......
word/Local/api.js
View file @ 61a39c89
...@@ -10,6 +10,8 @@ Asc['asc_docs_api'].prototype._OfflineAppDocumentStartLoad = function() ...@@ -10,6 +10,8 @@ Asc['asc_docs_api'].prototype._OfflineAppDocumentStartLoad = function()
{ {
this.asc_registerCallback('asc_onDocumentContentReady', function(){ this.asc_registerCallback('asc_onDocumentContentReady', function(){
DesktopOfflineUpdateLocalName(editor); DesktopOfflineUpdateLocalName(editor);
setTimeout(function(){window["UpdateInstallPlugins"]();}, 10);
}); });
AscCommon.History.UserSaveMode = true; AscCommon.History.UserSaveMode = true;
......
word/api.js
View file @ 61a39c89
...@@ -1911,18 +1911,18 @@ asc_docs_api.prototype.asc_CheckCopy = function(_clipboard /* CClipboardData */, ...@@ -1911,18 +1911,18 @@ asc_docs_api.prototype.asc_CheckCopy = function(_clipboard /* CClipboardData */,
{ {
if (!this.WordControl.m_oLogicDocument) if (!this.WordControl.m_oLogicDocument)
{ {
var _text_object = (c_oAscClipboardDataFormat.Text & _formats) ? { Text : "" } : null; var _text_object = (AscCommon.c_oAscClipboardDataFormat.Text & _formats) ? { Text : "" } : null;
var _html_data = this.WordControl.m_oDrawingDocument.m_oDocumentRenderer.Copy(_text_object); var _html_data = this.WordControl.m_oDrawingDocument.m_oDocumentRenderer.Copy(_text_object);
//TEXT //TEXT
if (c_oAscClipboardDataFormat.Text & _formats) if (AscCommon.c_oAscClipboardDataFormat.Text & _formats)
{ {
_clipboard.pushData(c_oAscClipboardDataFormat.Text, _text_object.Text); _clipboard.pushData(AscCommon.c_oAscClipboardDataFormat.Text, _text_object.Text);
} }
//HTML //HTML
if(c_oAscClipboardDataFormat.Html & _formats) if(AscCommon.c_oAscClipboardDataFormat.Html & _formats)
{ {
_clipboard.pushData(c_oAscClipboardDataFormat.Html, _html_data); _clipboard.pushData(AscCommon.c_oAscClipboardDataFormat.Html, _html_data);
} }
return; return;
} }
...@@ -1930,22 +1930,22 @@ asc_docs_api.prototype.asc_CheckCopy = function(_clipboard /* CClipboardData */, ...@@ -1930,22 +1930,22 @@ asc_docs_api.prototype.asc_CheckCopy = function(_clipboard /* CClipboardData */,
var sBase64 = null, _data; var sBase64 = null, _data;
//TEXT //TEXT
if (c_oAscClipboardDataFormat.Text & _formats) if (AscCommon.c_oAscClipboardDataFormat.Text & _formats)
{ {
_data = this.WordControl.m_oLogicDocument.Get_SelectedText(); _data = this.WordControl.m_oLogicDocument.Get_SelectedText();
_clipboard.pushData(c_oAscClipboardDataFormat.Text, _data) _clipboard.pushData(AscCommon.c_oAscClipboardDataFormat.Text, _data)
} }
//HTML //HTML
if(c_oAscClipboardDataFormat.Html & _formats) if(AscCommon.c_oAscClipboardDataFormat.Html & _formats)
{ {
var oCopyProcessor = new AscCommon.CopyProcessor(this); var oCopyProcessor = new AscCommon.CopyProcessor(this);
sBase64 = oCopyProcessor.Start(); sBase64 = oCopyProcessor.Start();
_data = oCopyProcessor.getInnerHtml(); _data = oCopyProcessor.getInnerHtml();
_clipboard.pushData(c_oAscClipboardDataFormat.Html, _data) _clipboard.pushData(AscCommon.c_oAscClipboardDataFormat.Html, _data)
} }
//INTERNAL //INTERNAL
if(c_oAscClipboardDataFormat.Internal & _formats) if(AscCommon.c_oAscClipboardDataFormat.Internal & _formats)
{ {
if(sBase64 === null) if(sBase64 === null)
{ {
...@@ -1954,7 +1954,7 @@ asc_docs_api.prototype.asc_CheckCopy = function(_clipboard /* CClipboardData */, ...@@ -1954,7 +1954,7 @@ asc_docs_api.prototype.asc_CheckCopy = function(_clipboard /* CClipboardData */,
} }
_data = sBase64; _data = sBase64;
_clipboard.pushData(c_oAscClipboardDataFormat.Internal, _data) _clipboard.pushData(AscCommon.c_oAscClipboardDataFormat.Internal, _data)
} }
}; };
...@@ -1977,10 +1977,10 @@ asc_docs_api.prototype.asc_PasteData = function(_format, data1, data2) ...@@ -1977,10 +1977,10 @@ asc_docs_api.prototype.asc_PasteData = function(_format, data1, data2)
this.WordControl.m_oLogicDocument.Create_NewHistoryPoint(AscDFH.historydescription_Document_PasteHotKey); this.WordControl.m_oLogicDocument.Create_NewHistoryPoint(AscDFH.historydescription_Document_PasteHotKey);
switch (_format) switch (_format)
{ {
case c_oAscClipboardDataFormat.HtmlElement: case AscCommon.c_oAscClipboardDataFormat.HtmlElement:
AscCommon.Editor_Paste_Exec(this, data1, data2); AscCommon.Editor_Paste_Exec(this, data1, data2);
break; break;
case c_oAscClipboardDataFormat.Internal: case AscCommon.c_oAscClipboardDataFormat.Internal:
AscCommon.Editor_Paste_Exec(this, null, null, data1); AscCommon.Editor_Paste_Exec(this, null, null, data1);
break; break;
default: default:
......
word/apiBuilder.js
View file @ 61a39c89
...@@ -1521,15 +1521,15 @@ ...@@ -1521,15 +1521,15 @@
ApiSection.prototype.SetType = function(sType) ApiSection.prototype.SetType = function(sType)
{ {
if ("oddPage" === sType) if ("oddPage" === sType)
this.Section.Set_Type(Asc.c_oAscSectionBreakType.OddPage); this.Section.Set_Type(c_oAscSectionBreakType.OddPage);
else if ("evenPage" === sType) else if ("evenPage" === sType)
this.Section.Set_Type(Asc.c_oAscSectionBreakType.EvenPage); this.Section.Set_Type(c_oAscSectionBreakType.EvenPage);
else if ("continuous" === sType) else if ("continuous" === sType)
this.Section.Set_Type(Asc.c_oAscSectionBreakType.Continuous); this.Section.Set_Type(c_oAscSectionBreakType.Continuous);
else if ("nextColumn" === sType) else if ("nextColumn" === sType)
this.Section.Set_Type(Asc.c_oAscSectionBreakType.Column); this.Section.Set_Type(c_oAscSectionBreakType.Column);
else if ("nextPage" === sType) else if ("nextPage" === sType)
this.Section.Set_Type(Asc.c_oAscSectionBreakType.NextPage); this.Section.Set_Type(c_oAscSectionBreakType.NextPage);
}; };
/** /**
* Specify all text columns in the current section are of equal width. * Specify all text columns in the current section are of equal width.
......
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