Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Plugins: remove deprecated parameter "url".

Browse source
This commit is contained in:
Julia Radzhabova 2017-09-13 14:43:35 +03:00
parent a147880f22
commit 9f2ffc408c
3 changed files with 9 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
apps/documenteditor/main/app/controller/Main.js
View file

@ -1882,18 +1882,11 @@ define([
var pluginsData = (uiCustomize) ? plugins.UIpluginsData : plugins.pluginsData; var pluginsData = (uiCustomize) ? plugins.UIpluginsData : plugins.pluginsData;
if (!pluginsData || pluginsData.length<1) return; if (!pluginsData || pluginsData.length<1) return;
var arr = [], var arr = [];
baseUrl = _.isEmpty(plugins.url) ? "" : plugins.url;
if (baseUrl !== "")
console.warn("Obsolete: The url parameter is deprecated. Please check the documentation for new plugin connection configuration.");
pluginsData.forEach(function(item){ pluginsData.forEach(function(item){
item = baseUrl + item; // for compatibility with previous version of server, where plugins.url is used.
var value = Common.Utils.getConfigJson(item); var value = Common.Utils.getConfigJson(item);
if (value) { if (value) {
value.baseUrl = item.substring(0, item.lastIndexOf("config.json")); value.baseUrl = item.substring(0, item.lastIndexOf("config.json"));
value.oldVersion = (baseUrl !== "");
arr.push(value); arr.push(value);
} }
}); });
@ -1923,14 +1916,6 @@ define([
var visible = (isEdit || itemVar.isViewer) && _.contains(itemVar.EditorsSupport, 'word'); var visible = (isEdit || itemVar.isViewer) && _.contains(itemVar.EditorsSupport, 'word');
if ( visible ) pluginVisible = true; if ( visible ) pluginVisible = true;
var icons = itemVar.icons;
if (item.oldVersion) { // for compatibility with previouse version of server, where plugins.url is used.
icons = [];
itemVar.icons.forEach(function(icon){
icons.push(icon.substring(icon.lastIndexOf("\/")+1));
});
}
if (item.isUICustomizer ) { if (item.isUICustomizer ) {
visible && arrUI.push(item.baseUrl + itemVar.url); visible && arrUI.push(item.baseUrl + itemVar.url);
} else { } else {
@ -1938,8 +1923,8 @@ define([
model.set({ model.set({
index: variationsArr.length, index: variationsArr.length,
url: (item.oldVersion) ? (itemVar.url.substring(itemVar.url.lastIndexOf("\/") + 1) ) : itemVar.url, url: itemVar.url,
icons: icons, icons: itemVar.icons,
visible: visible visible: visible
}); });

21
apps/presentationeditor/main/app/controller/Main.js
View file

@ -1654,18 +1654,11 @@ define([
var pluginsData = (uiCustomize) ? plugins.UIpluginsData : plugins.pluginsData; var pluginsData = (uiCustomize) ? plugins.UIpluginsData : plugins.pluginsData;
if (!pluginsData || pluginsData.length<1) return; if (!pluginsData || pluginsData.length<1) return;
var arr = [], var arr = [];
baseUrl = _.isEmpty(plugins.url) ? "" : plugins.url;
if (baseUrl !== "")
console.warn("Obsolete: The url parameter is deprecated. Please check the documentation for new plugin connection configuration.");
pluginsData.forEach(function(item){ pluginsData.forEach(function(item){
item = baseUrl + item; // for compatibility with previouse version of server, where plugins.url is used.
var value = Common.Utils.getConfigJson(item); var value = Common.Utils.getConfigJson(item);
if (value) { if (value) {
value.baseUrl = item.substring(0, item.lastIndexOf("config.json")); value.baseUrl = item.substring(0, item.lastIndexOf("config.json"));
value.oldVersion = (baseUrl !== "");
arr.push(value); arr.push(value);
} }
}); });
@ -1699,14 +1692,6 @@ define([
visible = isSupported && (isEdit || itemVar.isViewer); visible = isSupported && (isEdit || itemVar.isViewer);
if ( visible ) pluginVisible = true; if ( visible ) pluginVisible = true;
var icons = itemVar.icons;
if (item.oldVersion) { // for compatibility with previouse version of server, where plugins.url is used.
icons = [];
itemVar.icons.forEach(function(icon){
icons.push(icon.substring(icon.lastIndexOf("\/")+1));
});
}
if ( item.isUICustomizer ) { if ( item.isUICustomizer ) {
visible && arrUI.push(item.baseUrl + itemVar.url); visible && arrUI.push(item.baseUrl + itemVar.url);
} else { } else {
@ -1714,8 +1699,8 @@ define([
model.set({ model.set({
index: variationsArr.length, index: variationsArr.length,
url: (item.oldVersion) ? (itemVar.url.substring(itemVar.url.lastIndexOf("\/") + 1) ) : itemVar.url, url: itemVar.url,
icons: icons, icons: itemVar.icons,
visible: visible visible: visible
}); });

21
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -1834,18 +1834,11 @@ define([
var pluginsData = (uiCustomize) ? plugins.UIpluginsData : plugins.pluginsData; var pluginsData = (uiCustomize) ? plugins.UIpluginsData : plugins.pluginsData;
if (!pluginsData || pluginsData.length<1) return; if (!pluginsData || pluginsData.length<1) return;
var arr = [], var arr = [];
baseUrl = _.isEmpty(plugins.url) ? "" : plugins.url;
if (baseUrl !== "")
console.warn("Obsolete: The url parameter is deprecated. Please check the documentation for new plugin connection configuration.");
pluginsData.forEach(function(item){ pluginsData.forEach(function(item){
item = baseUrl + item; // for compatibility with previouse version of server, where plugins.url is used.
var value = Common.Utils.getConfigJson(item); var value = Common.Utils.getConfigJson(item);
if (value) { if (value) {
value.baseUrl = item.substring(0, item.lastIndexOf("config.json")); value.baseUrl = item.substring(0, item.lastIndexOf("config.json"));
value.oldVersion = (baseUrl !== "");
arr.push(value); arr.push(value);
} }
}); });
@ -1878,14 +1871,6 @@ define([
var visible = (isEdit || itemVar.isViewer) && itemVar.EditorsSupport.includes('cell'); var visible = (isEdit || itemVar.isViewer) && itemVar.EditorsSupport.includes('cell');
if ( visible ) pluginVisible = true; if ( visible ) pluginVisible = true;
var icons = itemVar.icons;
if (item.oldVersion) { // for compatibility with previouse version of server, where plugins.url is used.
icons = [];
itemVar.icons.forEach(function(icon){
icons.push(icon.substring(icon.lastIndexOf("\/")+1));
});
}
if ( item.isUICustomizer ) { if ( item.isUICustomizer ) {
visible && arrUI.push(item.baseUrl + itemVar.url); visible && arrUI.push(item.baseUrl + itemVar.url);
} else { } else {
@ -1893,8 +1878,8 @@ define([
model.set({ model.set({
index: variationsArr.length, index: variationsArr.length,
url: (item.oldVersion) ? (itemVar.url.substring(itemVar.url.lastIndexOf("\/") + 1)) : itemVar.url, url: itemVar.url,
icons: icons, icons: itemVar.icons,
visible: visible visible: visible
}); });