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

[DE, PE] tab 'File' didn't select after 'FileMenu' opened programmatically

Browse source
This commit is contained in:
Maxim Kadushkin 2017-04-27 17:34:34 +03:00
parent fe3bd89aa9
commit ac59e8b46e
4 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/documenteditor/main/app/controller/Toolbar.js
View file

@ -109,9 +109,8 @@ define([
'change:compact' : this.onClickChangeCompact 'change:compact' : this.onClickChangeCompact
}, },
'FileMenu': { 'FileMenu': {
'filemenu:hide': function () { 'menu:hide': this.onFileMenu.bind(this, 'hide'),
this.toolbar.setTab(''); 'menu:show': this.onFileMenu.bind(this, 'show')
}.bind(this)
} }
}); });
@ -1425,7 +1424,6 @@ define([
}, },
onAdvSettingsClick: function(btn, e) { onAdvSettingsClick: function(btn, e) {
this.toolbar.setTab('file');
this.toolbar.fireEvent('file:settings', this); this.toolbar.fireEvent('file:settings', this);
btn.cmpEl.blur(); btn.cmpEl.blur();
}, },
@ -2831,6 +2829,10 @@ define([
return !name ? this.toolbar : Backbone.Controller.prototype.getView.apply(this, arguments); return !name ? this.toolbar : Backbone.Controller.prototype.getView.apply(this, arguments);
}, },
onFileMenu: function (opts) {
this.toolbar.setTab( opts == 'show' ? 'file' : undefined );
},
textEmptyImgUrl : 'You need to specify image URL.', textEmptyImgUrl : 'You need to specify image URL.',
textWarning : 'Warning', textWarning : 'Warning',
textFontSizeErr : 'The entered value is incorrect.<br>Please enter a numeric value between 1 and 100', textFontSizeErr : 'The entered value is incorrect.<br>Please enter a numeric value between 1 and 100',

4
apps/documenteditor/main/app/view/FileMenu.js
View file

@ -200,12 +200,14 @@ define([
this.$el.show(); this.$el.show();
this.selectMenu(panel, opts); this.selectMenu(panel, opts);
this.api.asc_enableKeyEvents(false); this.api.asc_enableKeyEvents(false);
this.fireEvent('menu:show', [this]);
}, },
hide: function() { hide: function() {
this.$el.hide(); this.$el.hide();
// if (this.mode.isEdit) DE.getController('Toolbar').DisableToolbar(false); // if (this.mode.isEdit) DE.getController('Toolbar').DisableToolbar(false);
this.fireEvent('filemenu:hide', [this]); this.fireEvent('menu:hide', [this]);
// this.api.asc_enableKeyEvents(true); // this.api.asc_enableKeyEvents(true);
}, },

9
apps/presentationeditor/main/app/controller/Toolbar.js
View file

@ -121,9 +121,8 @@ define([
'change:compact' : this.onClickChangeCompact 'change:compact' : this.onClickChangeCompact
}, },
'FileMenu': { 'FileMenu': {
'filemenu:hide': function () { 'menu:hide': this.onFileMenu.bind(this, 'hide'),
this.toolbar.setTab(''); 'menu:show': this.onFileMenu.bind(this, 'show')
}.bind(this)
} }
}); });
@ -2098,6 +2097,10 @@ define([
}); });
}, },
onFileMenu: function (opts) {
this.toolbar.setTab( opts == 'show' ? 'file' : undefined );
},
textEmptyImgUrl : 'You need to specify image URL.', textEmptyImgUrl : 'You need to specify image URL.',
textWarning : 'Warning', textWarning : 'Warning',
textFontSizeErr : 'The entered value must be more than 0', textFontSizeErr : 'The entered value must be more than 0',

4
apps/presentationeditor/main/app/view/FileMenu.js
View file

@ -197,11 +197,13 @@ define([
this.$el.show(); this.$el.show();
this.selectMenu(panel); this.selectMenu(panel);
this.api.asc_enableKeyEvents(false); this.api.asc_enableKeyEvents(false);
this.fireEvent('menu:show', [this]);
}, },
hide: function() { hide: function() {
this.$el.hide(); this.$el.hide();
this.fireEvent('filemenu:hide', [this]); this.fireEvent('menu:hide', [this]);
this.api.asc_enableKeyEvents(true); this.api.asc_enableKeyEvents(true);
}, },