Skip to content

S
sdkjs
Commit 31544bae authored by Sergey Luzyanin's avatar Sergey Luzyanin Committed by GitHub
Browse files
Options

Merge pull request #53 from ONLYOFFICE/release/v4.1.0 

Release/v4.1.0
parents 720f6768 e9e0e625
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 274 deletions
common/apiBase.js
View file @ 31544bae
......@@ -143,6 +143,8 @@
// Использовать ли обрезанные шрифты
this.isUseEmbeddedCutFonts = ("true" == ASC_DOCS_API_USE_EMBEDDED_FONTS.toLowerCase());
this.isSendStandartTextures = false;
this.tmpFocus = null;
this.fCurCallback = null;
......@@ -915,6 +917,11 @@
baseEditorsApi.prototype.sendStandartTextures = function()
{
if (this.isSendStandartTextures)
return;
this.isSendStandartTextures = true;
var _count = AscCommon.g_oUserTexturePresets.length;
var arr = new Array(_count);
for (var i = 0; i < _count; ++i)
......
common/plugins.js
View file @ 31544bae
......@@ -243,6 +243,8 @@
};
this.api.asc_CheckCopy(text_data, 1);
if (text_data.data == null)
text_data.data = "";
this.startData.setAttribute("data", text_data.data);
break;
}
......@@ -257,6 +259,8 @@
};
this.api.asc_CheckCopy(text_data, 2);
if (text_data.data == null)
text_data.data = "";
this.startData.setAttribute("data", text_data.data);
break;
}
......@@ -543,276 +547,4 @@
return this[name] = value;
};
};
})(window, undefined);
// потом удалить!!!
function TEST_PLUGINS()
{
var _plugins = [
{
name : "chess (fen)",
guid : "asc.{FFE1F462-1EA2-4391-990D-4CC84940B754}",
variations : [
{
description : "chess",
url : "chess/index.html",
icons : ["chess/icon.png", "chess/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}]
},
{
description : "about",
url : "chess/index_about.html",
icons : ["chess/icon.png", "chess/icon@2x.png"],
isViewer : true,
EditorsSupport : ["word", "cell", "slide"],
isVisual : true,
isModal : true,
isInsideMode : false,
initDataType : "none",
initData : "",
isUpdateOleOnResize : false,
buttons : [{"text" : "Ok", "primary" : true}]
}
]
},
{
name : "glavred",
guid : "asc.{B631E142-E40B-4B4C-90B9-2D00222A286E}",
variations : [
{
description : "glavred",
url : "glavred/index.html",
icons : ["glavred/icon.png", "glavred/icon@2x.png"],
isViewer : true,
EditorsSupport : ["word", "cell", "slide"],
isVisual : true,
isModal : true,
isInsideMode : false,
initDataType : "text",
initData : "",
isUpdateOleOnResize : false,
buttons : [{text : "Ok", primary : true}]
}
]
},
{
name : "bold",
guid : "asc.{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 : "asc.{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 : "asc.{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 : false,
buttons : [{text : "Ok", primary : true},
{text : "Cancel", primary : false}]
}
]
},
{
"name" : "cbr",
"guid" : "asc.{5F9D4EB4-AF61-46EF-AE25-46C96E75E1DD}",
"variations" : [
{
"description" : "cbr",
"url" : "cbr/index.html",
"icons" : ["cbr/icon.png", "cbr/icon@2x.png"],
// "isViewer" : true,
"isViewer" : false,
"EditorsSupport" : ["word", "cell", "slide"],
// "isVisual" : true,
// "isModal" : true,
"isVisual" : false,
"isModal" : false,
"isInsideMode" : false,
"initDataType" : "none",
"initData" : "",
// "isUpdateOleOnResize" : true,
"isUpdateOleOnResize" : false,
// "buttons" : [ { "text": "Ok", "primary": true },
// { "text": "Cancel", "primary": false } ]
"buttons" : []
}
]
},
{
"name" : "ocr(Tesseract.js)",
"guid" : "asc.{440EBF13-9B19-4BD8-8621-05200E58140B}",
"baseUrl" : "",
"variations" : [
{
"description" : "ocr",
"url" : "ocr/index.html",
"icons" : ["ocr/icon.png", "ocr/icon@2x.png"],
"isViewer" : false,
"EditorsSupport" : ["word"],
"isVisual" : true,
"isModal" : false,
"isInsideMode" : false,
"initDataType" : "html",
"initData" : "",
"isUpdateOleOnResize" : false,
"buttons" : [{"text" : "Insert In Document", "primary" : true},
{"text" : "Cancel", "primary" : false}]
}
]
},
{
"name" : "yandextranslate",
"guid" : "asc.{D3E759F7-3947-4BD6-B066-E184BBEDC675}",
"variations" : [
{
"description" : "yandextranslate",
"url" : "yandextranslate/index.html",
"icons" : ["yandextranslate/icon.png", "yandextranslate/icon@2x.png"],
"isViewer" : false,
"EditorsSupport" : ["word", "cell", "slide"],
"isVisual" : false,
"isModal" : false,
"isInsideMode" : false,
"initDataType" : "text",
"initData" : "",
"isUpdateOleOnResize" : false,
"buttons" : []
}
]
},
{
"name" : "ClipArt",
"guid" : "asc.{F5BACB61-64C5-4711-AC8A-D01EC3B2B6F1}",
"variations" : [
{
"description" : "ClipArt",
"url" : "clipart/index.html",
"icons" : ["clipart/icon.png", "clipart/icon@2x.png"],
"isViewer" : true,
"EditorsSupport" : ["word"],
"isVisual" : true,
"isModal" : false,
"isInsideMode" : true,
"initDataType" : "none",
"initData" : "",
"isUpdateOleOnResize" : false,
"buttons" : [{"text" : "Ok", "primary" : true}]
}
]
}
];
window.g_asc_plugins.loadExtensionPlugins(_plugins);
}
})(window, undefined);
\ No newline at end of file
slide/Editor/Format/Presentation.js
View file @ 31544bae
......@@ -3165,7 +3165,6 @@ CPresentation.prototype =
return this.Slides[this.CurPage].graphicObjects.Get_SelectedText(bClearText);
}
return "";
},
//-----------------------------------------------------------------------------------
......@@ -3448,6 +3447,10 @@ CPresentation.prototype =
drawing_props.imageProps.Width = drawing_props.imageProps.w;
drawing_props.imageProps.Height = drawing_props.imageProps.h;
drawing_props.imageProps.Position = {X: drawing_props.imageProps.x, Y: drawing_props.imageProps.y};
if(AscFormat.isRealBool(drawing_props.imageProps.locked) && drawing_props.imageProps.locked)
{
drawing_props.imageProps.Locked = true;
}
editor.sync_ImgPropCallback(drawing_props.imageProps);
}
......
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