pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-25 12:18:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2701 from ONLYOFFICE/fix/fix-more

Browse Source 
Fix/fix more
This commit is contained in:
Julia Radzhabova
2023-11-22 18:17:01 +03:00
committed by GitHub
parent 6b7de8d849 22b08215aa
commit 84a99a515b
8 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/common/main/lib/component/SideMenu.js
View File

@ -46,6 +46,7 @@ define([
Common.UI.SideMenu = Backbone.View.extend((function () {
return {
buttons: [],
btnMoreContainer: undefined,
render: function () {
@ -123,7 +124,7 @@ define([
caption: btn.hint,
iconImg: btn.options.iconImg,
template: _.template([
'<a id="<%= id %>" class="menu-item">',
'<a id="<%= id %>" class="menu-item" tabindex="-1" type="menuitem">',
'<img class="menu-item-icon" src="<%= options.iconImg %>">',
'<%= caption %>',
'</a>'

1
apps/common/main/lib/view/Plugins.js
View File

@ -333,6 +333,7 @@ define([
dataHintDirection: 'bottom',
dataHintOffset: 'small'
});
this.lockedControls.push(btn);
return btn;
},

1
apps/documenteditor/main/app/controller/LeftMenu.js
View File

@ -645,6 +645,7 @@ define([
this.viewmode = viewmode;
this.leftMenu.panelSearch && this.leftMenu.panelSearch.setSearchMode(this.viewmode ? 'no-replace' : 'search');
this.leftMenu.setDisabledPluginButtons(this.viewmode);
},
SetDisabled: function(disable, options) {

1
apps/pdfeditor/main/app/controller/LeftMenu.js
View File

@ -568,6 +568,7 @@ define([
var viewmode = this._state.disableEditing;
if (this.viewmode === viewmode) return;
this.viewmode = viewmode;
this.leftMenu.setDisabledPluginButtons(this.viewmode);
},
SetDisabled: function(disable, options) {

1
apps/presentationeditor/main/app/controller/LeftMenu.js
View File

@ -498,6 +498,7 @@ define([
this.viewmode = mode;
this.leftMenu.panelSearch && this.leftMenu.panelSearch.setSearchMode(this.viewmode ? 'no-replace' : 'search');
this.leftMenu.setDisabledPluginButtons(this.viewmode);
},
onApiServerDisconnect: function(enableDownload) {

1
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View File

@ -192,6 +192,7 @@ define([
me.onCellsRange(status);
},
'tabs:dragend': _.bind(me.onDragEndMouseUp, me),
'pivot:dragend': _.bind(me.onDragEndMouseUp, me),
'protect:wslock': _.bind(me.onChangeProtectSheet, me)
});
Common.Gateway.on('processmouse', _.bind(me.onProcessMouse, me));

1
apps/spreadsheeteditor/main/app/controller/LeftMenu.js
View File

@ -629,6 +629,7 @@ define([
this.viewmode = mode;
this.leftMenu.panelSearch && this.leftMenu.panelSearch.setSearchMode(this.viewmode ? 'no-replace' : 'search');
this.leftMenu.setDisabledPluginButtons(this.viewmode);
},
onApiServerDisconnect: function(enableDownload) {

1
apps/spreadsheeteditor/main/app/view/PivotSettings.js
View File

@ -208,6 +208,7 @@ define([
onDragEnd: function() {
this._dragEl && this._dragEl.remove();
this._dragEl = null;
Common.NotificationCenter.trigger('pivot:dragend', this);
},
onFieldsDragStart: function (item, index, event) {