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

add baseUrl param to plugin

Browse source
This commit is contained in:
Oleg Korshul 2016-05-24 11:48:59 +03:00
parent 2d7812fe48
commit 7a650ebddb
4 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/common/main/lib/controller/Plugins.js
View file

@ -93,6 +93,7 @@ define([
var plugin = new Asc.CPlugin(); var plugin = new Asc.CPlugin();
plugin.set_Name(item.get('name')); plugin.set_Name(item.get('name'));
plugin.set_Guid(item.get('guid')); plugin.set_Guid(item.get('guid'));
plugin.set_BaseUrl(item.get('baseUrl'));
var variations = item.get('variations'), var variations = item.get('variations'),
variationsArr = []; variationsArr = [];
variations.forEach(function(itemVar){ variations.forEach(function(itemVar){
@ -136,9 +137,10 @@ define([
}); });
} }
var _baseUrl = (plugin.get_BaseUrl().length == 0) ? me.panelPlugins.pluginsPath : plugin.get_BaseUrl();
me.pluginDlg = new Common.Views.PluginDlg({ me.pluginDlg = new Common.Views.PluginDlg({
title: plugin.get_Name(), title: plugin.get_Name(),
url: me.panelPlugins.pluginsPath + variation.get_Url(), url: _baseUrl + variation.get_Url(),
buttons: newBtns, buttons: newBtns,
toolcallback: _.bind(this.onToolClose, this) toolcallback: _.bind(this.onToolClose, this)
}); });

1
apps/common/main/lib/model/Plugin.js
View file

@ -73,6 +73,7 @@ define([
return { return {
id: Common.UI.getId(), id: Common.UI.getId(),
name : '', name : '',
baseUrl : '',
guid: Common.UI.getId(), guid: Common.UI.getId(),
variations: [], variations: [],
currentVariation: 0, currentVariation: 0,

2
apps/common/main/lib/view/Plugins.js
View file

@ -75,7 +75,7 @@ define([
el: $('#plugins-list'), el: $('#plugins-list'),
store: this.storePlugins, store: this.storePlugins,
enableKeyEvents: false, enableKeyEvents: false,
itemTemplate: _.template('<div id="<%= id %>" class="item-plugins" style="background-image: url(' + this.pluginsPath + '<%= variations[currentVariation].get("icons")[(window.devicePixelRatio > 1) ? 1 : 0] %>); background-position: 0 0;"></div>') itemTemplate: _.template('<div id="<%= id %>" class="item-plugins" style="background-image: url(' + '<% if (baseUrl !=="") { %>' + '<%= baseUrl %>' + '<% } else { %>' + this.pluginsPath + '<% } %>' + '<%= variations[currentVariation].get("icons")[(window.devicePixelRatio > 1) ? 1 : 0] %>); background-position: 0 0;"></div>')
}); });
this.trigger('render:after', this); this.trigger('render:after', this);

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

@ -1730,6 +1730,7 @@ define([
arr.push(new Common.Models.Plugin({ arr.push(new Common.Models.Plugin({
name : item.name, name : item.name,
guid: item.guid, guid: item.guid,
baseUrl : item.baseUrl,
variations: variationsArr, variations: variationsArr,
currentVariation: 0 currentVariation: 0
})); }));