From 9f2ffc408c41c1d3afa58b70e79ca8b57c596308 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 13 Sep 2017 14:43:35 +0300 Subject: [PATCH] Plugins: remove deprecated parameter "url". --- .../main/app/controller/Main.js | 21 +++---------------- .../main/app/controller/Main.js | 21 +++---------------- .../main/app/controller/Main.js | 21 +++---------------- 3 files changed, 9 insertions(+), 54 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 663bb9faa..b52c20798 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -1882,18 +1882,11 @@ define([ var pluginsData = (uiCustomize) ? plugins.UIpluginsData : plugins.pluginsData; if (!pluginsData || pluginsData.length<1) return; - 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."); - + var arr = []; 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); if (value) { value.baseUrl = item.substring(0, item.lastIndexOf("config.json")); - value.oldVersion = (baseUrl !== ""); arr.push(value); } }); @@ -1923,14 +1916,6 @@ define([ var visible = (isEdit || itemVar.isViewer) && _.contains(itemVar.EditorsSupport, 'word'); 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 ) { visible && arrUI.push(item.baseUrl + itemVar.url); } else { @@ -1938,8 +1923,8 @@ define([ model.set({ index: variationsArr.length, - url: (item.oldVersion) ? (itemVar.url.substring(itemVar.url.lastIndexOf("\/") + 1) ) : itemVar.url, - icons: icons, + url: itemVar.url, + icons: itemVar.icons, visible: visible }); diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index ea5309e5d..b01e61f38 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -1654,18 +1654,11 @@ define([ var pluginsData = (uiCustomize) ? plugins.UIpluginsData : plugins.pluginsData; if (!pluginsData || pluginsData.length<1) return; - 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."); - + var arr = []; 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); if (value) { value.baseUrl = item.substring(0, item.lastIndexOf("config.json")); - value.oldVersion = (baseUrl !== ""); arr.push(value); } }); @@ -1699,14 +1692,6 @@ define([ visible = isSupported && (isEdit || itemVar.isViewer); 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 ) { visible && arrUI.push(item.baseUrl + itemVar.url); } else { @@ -1714,8 +1699,8 @@ define([ model.set({ index: variationsArr.length, - url: (item.oldVersion) ? (itemVar.url.substring(itemVar.url.lastIndexOf("\/") + 1) ) : itemVar.url, - icons: icons, + url: itemVar.url, + icons: itemVar.icons, visible: visible }); diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index ab395f577..b56afb92e 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1834,18 +1834,11 @@ define([ var pluginsData = (uiCustomize) ? plugins.UIpluginsData : plugins.pluginsData; if (!pluginsData || pluginsData.length<1) return; - 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."); - + var arr = []; 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); if (value) { value.baseUrl = item.substring(0, item.lastIndexOf("config.json")); - value.oldVersion = (baseUrl !== ""); arr.push(value); } }); @@ -1878,14 +1871,6 @@ define([ var visible = (isEdit || itemVar.isViewer) && itemVar.EditorsSupport.includes('cell'); 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 ) { visible && arrUI.push(item.baseUrl + itemVar.url); } else { @@ -1893,8 +1878,8 @@ define([ model.set({ index: variationsArr.length, - url: (item.oldVersion) ? (itemVar.url.substring(itemVar.url.lastIndexOf("\/") + 1)) : itemVar.url, - icons: icons, + url: itemVar.url, + icons: itemVar.icons, visible: visible });