Skip to content

W
web-apps
Commit 4a2fee85 authored by Julia Radzhabova's avatar Julia Radzhabova Committed by GitHub
Browse files
Options

Merge pull request #9 from ONLYOFFICE/release/4.0.1 

Release/4.0.1
parents 8e435634 fcecb0c6
Hide whitespace changes
Inline Side-by-side
Showing with 163 additions and 19 deletions
apps/common/main/lib/view/Plugins.js
View file @ 4a2fee85
......@@ -66,7 +66,8 @@ define([
'</div>',
'<div id="current-plugin-frame" class="">',
'</div>',
'</div>'
'</div>',
'<div id="plugins-mask" style="display: none;">'
].join('')),
initialize: function(options) {
......@@ -104,6 +105,7 @@ define([
this.pluginName = $('#current-plugin-header label');
this.pluginsPanel = $('#plugins-box');
this.pluginsMask = $('#plugins-mask');
this.currentPluginPanel = $('#current-plugin-box');
this.pluginMenu = new Common.UI.Menu({
......@@ -129,6 +131,8 @@ define([
_.each(this.lockedControls, function(item) {
item.setDisabled(disable);
});
this.pluginsMask.css('display', disable ? 'block' : 'none');
}
},
......
apps/common/main/resources/less/plugins.less
View file @ 4a2fee85
......@@ -106,3 +106,14 @@
padding-top: 38px;
}
}
#plugins-mask {
position: absolute;
top: 0;
left: 40px;
width: 100%;
height: 100%;
opacity: 0.4;
background-color: @gray-light;
z-index: @zindex-tooltip + 1;
}
\ No newline at end of file
apps/documenteditor/main/app/view/LeftMenu.js
View file @ 4a2fee85
......@@ -141,6 +141,13 @@ define([
toggleGroup: 'leftMenuGroup'
});
this.btnComments.hide();
this.btnChat.hide();
this.btnComments.on('click', _.bind(this.onBtnMenuClick, this));
this.btnChat.on('click', _.bind(this.onBtnMenuClick, this));
/** coauthoring end **/
this.btnPlugins = new Common.UI.Button({
el: $('#left-btn-plugins'),
hint: this.tipPlugins,
......@@ -148,15 +155,8 @@ define([
disabled: true,
toggleGroup: 'leftMenuGroup'
});
this.btnComments.hide();
this.btnChat.hide();
this.btnPlugins.hide();
this.btnComments.on('click', _.bind(this.onBtnMenuClick, this));
this.btnChat.on('click', _.bind(this.onBtnMenuClick, this));
this.btnPlugins.on('click', _.bind(this.onBtnMenuClick, this));
/** coauthoring end **/
this.btnSearch.on('click', _.bind(this.onBtnMenuClick, this));
this.btnAbout.on('toggle', _.bind(this.onBtnMenuToggle, this));
......@@ -279,12 +279,12 @@ define([
this.panelChat['hide']();
this.btnChat.toggle(false, true);
}
if (this.mode.canPlugins && this.panelPlugins) {
this.panelPlugins['hide']();
this.btnPlugins.toggle(false, true);
}
}
/** coauthoring end **/
if (this.mode.canPlugins && this.panelPlugins) {
this.panelPlugins['hide']();
this.btnPlugins.toggle(false, true);
}
},
isOpened: function() {
......
apps/spreadsheeteditor/main/app.js
View file @ 4a2fee85
......@@ -157,7 +157,8 @@ require([
'Main',
'Common.Controllers.Fonts',
'Common.Controllers.Chat',
'Common.Controllers.Comments'
'Common.Controllers.Comments',
'Common.Controllers.Plugins'
]
});
......@@ -182,7 +183,8 @@ require([
'common/main/lib/util/LocalStorage',
'common/main/lib/controller/Fonts',
'common/main/lib/controller/Comments',
'common/main/lib/controller/Chat'
'common/main/lib/controller/Chat',
'common/main/lib/controller/Plugins'
], function() {
app.start();
});
......
apps/spreadsheeteditor/main/app/controller/LeftMenu.js
View file @ 4a2fee85
......@@ -181,6 +181,14 @@ define([
return this;
},
enablePlugins: function() {
if (this.mode.canPlugins) {
this.leftMenu.btnPlugins.show();
this.leftMenu.setOptionsPanel('plugins', this.getApplication().getController('Common.Controllers.Plugins').getView('Common.Views.Plugins'));
} else
this.leftMenu.btnPlugins.hide();
},
clickMenuFileItem: function(menu, action, isopts) {
var close_menu = true;
switch (action) {
......@@ -496,6 +504,7 @@ define([
this.leftMenu.btnComments.setDisabled(true);
this.leftMenu.btnChat.setDisabled(true);
/** coauthoring end **/
this.leftMenu.btnPlugins.setDisabled(true);
this.leftMenu.getMenu('file').setMode({isDisconnected: true});
if ( this.dlgSearch ) {
......@@ -605,8 +614,15 @@ define([
$.fn.dropdown.Constructor.prototype.keydown.call(menu_opened[0], e);
return false;
}
if (this.mode.canPlugins && this.leftMenu.panelPlugins && this.api.isCellEdited!==true) {
menu_opened = this.leftMenu.panelPlugins.$el.find('#menu-plugin-container.open > [data-toggle="dropdown"]');
if (menu_opened.length) {
$.fn.dropdown.Constructor.prototype.keydown.call(menu_opened[0], e);
return false;
}
}
if (this.leftMenu.btnFile.pressed || this.leftMenu.btnAbout.pressed ||
$(e.target).parents('#left-menu').length && this.api.isCellEdited!==true) {
($(e.target).parents('#left-menu').length || this.leftMenu.btnPlugins.pressed) && this.api.isCellEdited!==true) {
this.leftMenu.close();
Common.NotificationCenter.trigger('layout:changed', 'leftmenu');
return false;
......@@ -643,6 +659,10 @@ define([
this.leftMenu.btnFile.setDisabled(isRangeSelection);
this.leftMenu.btnAbout.setDisabled(isRangeSelection);
this.leftMenu.btnSearch.setDisabled(isRangeSelection);
if (this.mode.canPlugins && this.leftMenu.panelPlugins) {
this.leftMenu.panelPlugins.setLocked(isRangeSelection);
this.leftMenu.panelPlugins.disableControls(isRangeSelection);
}
},
onApiEditCell: function(state) {
......@@ -652,6 +672,10 @@ define([
this.leftMenu.btnFile.setDisabled(isEditFormula);
this.leftMenu.btnAbout.setDisabled(isEditFormula);
this.leftMenu.btnSearch.setDisabled(isEditFormula);
if (this.mode.canPlugins && this.leftMenu.panelPlugins) {
this.leftMenu.panelPlugins.setLocked(isEditFormula);
this.leftMenu.panelPlugins.disableControls(isEditFormula);
}
},
textNoTextFound : 'Text not found',
......
apps/spreadsheeteditor/main/app/controller/Main.js
View file @ 4a2fee85
......@@ -136,6 +136,7 @@ define([
// Initialize api gateway
this.editorConfig = {};
this.plugins = undefined;
Common.Gateway.on('init', _.bind(this.loadConfig, this));
Common.Gateway.on('showmessage', _.bind(this.onExternalMessage, this));
Common.Gateway.on('opendocument', _.bind(this.loadDocument, this));
......@@ -261,6 +262,8 @@ define([
this.appOptions.canBackToFolder = (this.editorConfig.canBackToFolder!==false) && (typeof (this.editorConfig.customization) == 'object')
&& (typeof (this.editorConfig.customization.goback) == 'object') && !_.isEmpty(this.editorConfig.customization.goback.url);
this.appOptions.canBack = this.editorConfig.nativeApp !== true && this.appOptions.canBackToFolder === true;
this.appOptions.canPlugins = false;
this.plugins = this.editorConfig.plugins;
this.headerView = this.getApplication().getController('Viewport').getView('Common.Views.Header');
this.headerView.setCanBack(this.appOptions.canBackToFolder === true);
......@@ -595,10 +598,18 @@ define([
statusbarView = statusbarController.getView('Statusbar'),
leftMenuView = leftmenuController.getView('LeftMenu'),
documentHolderView = documentHolderController.getView('DocumentHolder'),
chatController = application.getController('Common.Controllers.Chat');
chatController = application.getController('Common.Controllers.Chat'),
pluginsController = application.getController('Common.Controllers.Plugins');
leftMenuView.getMenu('file').loadDocument({doc:me.appOptions.spreadsheet});
leftmenuController.setMode(me.appOptions).createDelayedElements().setApi(me.api);
if (!me.appOptions.isLightVersion && !me.appOptions.isEditMailMerge && !me.appOptions.isEditDiagram) {
pluginsController.setApi(me.api);
me.updatePluginsList(me.plugins);
me.api.asc_registerCallback('asc_onPluginsInit', _.bind(me.updatePluginsList, me));
}
leftMenuView.disableMenu('all',false);
if (!me.appOptions.isEditMailMerge && !me.appOptions.isEditDiagram && me.appOptions.canBranding) {
......@@ -1696,6 +1707,61 @@ define([
if (url) this.iframePrint.src = url;
},
updatePluginsList: function(plugins) {
var pluginStore = this.getApplication().getCollection('Common.Collections.Plugins'),
isEdit = this.appOptions.isEdit;
if (pluginStore && plugins) {
var arr = [];
plugins.pluginsData.forEach(function(item){
var variations = item.variations,
variationsArr = [];
variations.forEach(function(itemVar){
var isSupported = false;
for (var i=0; i<itemVar.EditorsSupport.length; i++){
if (itemVar.EditorsSupport[i]=='cell') {
isSupported = true; break;
}
}
if (isSupported && (isEdit || itemVar.isViewer))
variationsArr.push(new Common.Models.PluginVariation({
description: itemVar.description,
index: variationsArr.length,
url : itemVar.url,
icons : itemVar.icons,
isViewer: itemVar.isViewer,
EditorsSupport: itemVar.EditorsSupport,
isVisual: itemVar.isVisual,
isModal: itemVar.isModal,
isInsideMode: itemVar.isInsideMode,
initDataType: itemVar.initDataType,
initData: itemVar.initData,
isUpdateOleOnResize : itemVar.isUpdateOleOnResize,
buttons: itemVar.buttons
}));
});
if (variationsArr.length>0)
arr.push(new Common.Models.Plugin({
name : item.name,
guid: item.guid,
baseUrl : item.baseUrl,
variations: variationsArr,
currentVariation: 0
}));
});
pluginStore.reset(arr);
this.appOptions.pluginsPath = (plugins.url);
this.appOptions.canPlugins = (arr.length>0);
} else {
this.appOptions.pluginsPath = '';
this.appOptions.canPlugins = false;
}
if (this.appOptions.canPlugins)
this.getApplication().getController('Common.Controllers.Plugins').setMode(this.appOptions);
this.getApplication().getController('LeftMenu').enablePlugins();
},
leavePageText: 'You have unsaved changes in this document. Click \'Stay on this Page\' then \'Save\' to save them. Click \'Leave this Page\' to discard all the unsaved changes.',
criticalErrorTitle: 'Error',
notcriticalErrorTitle: 'Warning',
......
apps/spreadsheeteditor/main/app/template/LeftMenu.template
View file @ 4a2fee85
......@@ -6,6 +6,7 @@
<button id="left-btn-comments" class="btn btn-category" content-target="left-panel-comments"><span class="btn-icon img-toolbarmenu btn-menu-comments">&nbsp;</span></button>
<button id="left-btn-chat" class="btn btn-category" content-target="left-panel-chat"><span class="btn-icon img-toolbarmenu btn-menu-chat">&nbsp;</span></button>
<!-- /** coauthoring end **/ -->
<button id="left-btn-plugins" class="btn btn-category" content-target=""><span class="btn-icon img-toolbarmenu btn-menu-plugin">&nbsp;</span></button>
<button id="left-btn-support" class="btn btn-category" content-target=""><span class="btn-icon img-toolbarmenu btn-menu-support">&nbsp;</span></button>
<button id="left-btn-about" class="btn btn-category" content-target=""><span class="btn-icon img-toolbarmenu btn-menu-about">&nbsp;</span></button>
</div>
......@@ -14,5 +15,6 @@
<div id="left-panel-comments" class="" style="display: none;" />
<div id="left-panel-chat" class="" style="display: none;" />
<!-- /** coauthoring end **/ -->
<div id="left-panel-plugins" class="" style="display: none; height: 100%;" />
</div>
</div>
\ No newline at end of file
apps/spreadsheeteditor/main/app/view/LeftMenu.js
View file @ 4a2fee85
......@@ -42,6 +42,7 @@ define([
'common/main/lib/view/Chat',
/** coauthoring end **/
'common/main/lib/view/SearchDialog',
'common/main/lib/view/Plugins',
'spreadsheeteditor/main/app/view/FileMenu'
], function (menuTemplate, $, _, Backbone) {
'use strict';
......@@ -61,6 +62,7 @@ define([
'click #left-btn-comments': _.bind(this.onCoauthOptions, this),
'click #left-btn-chat': _.bind(this.onCoauthOptions, this),
/** coauthoring end **/
'click #left-btn-plugins': _.bind(this.onCoauthOptions, this),
'click #left-btn-support': function() {
var config = this.mode.customization;
config && !!config.feedback && !!config.feedback.url ?
......@@ -136,6 +138,16 @@ define([
this.btnChat.on('click', _.bind(this.onBtnMenuClick, this));
/** coauthoring end **/
this.btnPlugins = new Common.UI.Button({
el: $('#left-btn-plugins'),
hint: this.tipPlugins,
enableToggle: true,
disabled: true,
toggleGroup: 'leftMenuGroup'
});
this.btnPlugins.hide();
this.btnPlugins.on('click', _.bind(this.onBtnMenuClick, this));
this.btnSearch.on('click', _.bind(this.onBtnMenuClick, this));
this.btnAbout.on('toggle', _.bind(this.onBtnMenuToggle, this));
this.btnFile.on('toggle', _.bind(this.onBtnMenuToggle, this));
......@@ -205,6 +217,12 @@ define([
this.panelChat['hide']();
}
}
if (this.mode.canPlugins && this.panelPlugins) {
if (this.btnPlugins.pressed) {
this.panelPlugins.show();
} else
this.panelPlugins['hide']();
}
},
setOptionsPanel: function(name, panel) {
......@@ -212,6 +230,9 @@ define([
this.panelChat = panel.render('#left-panel-chat');
} else if (name == 'comment') {
this.panelComments = panel;
} else
if (name == 'plugins' && !this.panelPlugins) {
this.panelPlugins = panel.render('#left-panel-plugins');
}
},
......@@ -245,6 +266,10 @@ define([
}
}
/** coauthoring end **/
if (this.mode.canPlugins && this.panelPlugins) {
this.panelPlugins['hide']();
this.btnPlugins.toggle(false, true);
}
},
isOpened: function() {
......@@ -264,6 +289,7 @@ define([
this.btnComments.setDisabled(false);
this.btnChat.setDisabled(false);
/** coauthoring end **/
this.btnPlugins.setDisabled(false);
},
showMenu: function(menu) {
......@@ -319,6 +345,7 @@ define([
tipAbout : 'About',
tipSupport : 'Feedback & Support',
tipFile : 'File',
tipSearch : 'Search'
tipSearch : 'Search',
tipPlugins : 'Add-ons'
}, SSE.Views.LeftMenu || {}));
});
apps/spreadsheeteditor/main/app_dev.js
View file @ 4a2fee85
......@@ -147,7 +147,8 @@ require([
'Main',
'Common.Controllers.Fonts',
'Common.Controllers.Chat',
'Common.Controllers.Comments'
'Common.Controllers.Comments',
'Common.Controllers.Plugins'
]
});
......@@ -172,7 +173,8 @@ require([
'common/main/lib/util/LocalStorage',
'common/main/lib/controller/Fonts',
'common/main/lib/controller/Comments',
'common/main/lib/controller/Chat'
'common/main/lib/controller/Chat',
'common/main/lib/controller/Plugins'
], function() {
app.start();
});
......
apps/spreadsheeteditor/main/locale/en.json
View file @ 4a2fee85
......@@ -84,6 +84,9 @@
"Common.Views.OpenDialog.txtSpace": "Space",
"Common.Views.OpenDialog.txtTab": "Tab",
"Common.Views.OpenDialog.txtTitle": "Choose %1 options",
"Common.Views.Plugins.strPlugins": "Add-ons",
"Common.Views.Plugins.textLoading": "Loading",
"Common.Views.Plugins.textStart": "Start",
"SSE.Controllers.DocumentHolder.guestText": "Guest",
"SSE.Controllers.DocumentHolder.textChangeColumnWidth": "Column Width {0} symbols ({1} pixels)",
"SSE.Controllers.DocumentHolder.textChangeRowHeight": "Row Height {0} points ({1} pixels)",
......@@ -625,6 +628,7 @@
"SSE.Views.LeftMenu.tipChat": "Chat",
"SSE.Views.LeftMenu.tipComments": "Comments",
"SSE.Views.LeftMenu.tipFile": "File",
"SSE.Views.LeftMenu.tipPlugins": "Add-ons",
"SSE.Views.LeftMenu.tipSearch": "Search",
"SSE.Views.LeftMenu.tipSupport": "Feedback & Support",
"SSE.Views.MainSettingsPrint.okButtonText": "Save",
......
apps/spreadsheeteditor/main/resources/less/app.less
View file @ 4a2fee85
......@@ -111,6 +111,7 @@
@import "../../../../common/main/resources/less/tabbar.less";
@import "../../../../common/main/resources/less/common.less";
@import "../../../../common/main/resources/less/opendialog.less";
@import "../../../../common/main/resources/less/plugins.less";
// App
// --------------------------------------------------
......
apps/spreadsheeteditor/main/resources/less/leftmenu.less
View file @ 4a2fee85
......@@ -14,6 +14,7 @@
.toolbar-btn-icon(btn-menu-chat, 59, @toolbar-icon-size);
.toolbar-btn-icon(btn-menu-about, 58, @toolbar-icon-size);
.toolbar-btn-icon(btn-menu-support, 75, @toolbar-icon-size);
.toolbar-btn-icon(btn-menu-plugin, 81, @toolbar-icon-size);
button.notify .btn-menu-chat,
button.notify.over > .btn-menu-chat {background-position: -0*@toolbar-icon-size -60*@toolbar-icon-size;}
......
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