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

repaired z-order for 'FileMenu'

Browse source
This commit is contained in:
Maxim Kadushkin 2017-05-01 14:30:44 +03:00
parent a178bfcb45
commit 75100b9a37
9 changed files with 68 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
apps/common/main/lib/component/Mixtbar.js
View file

@ -64,8 +64,6 @@ define([
}
function onShowFullviewPanel(state) {
this.collapseToolbar();
if ( state )
optsFold.$bar.addClass('cover'); else
optsFold.$bar.removeClass('cover');
@ -104,6 +102,7 @@ define([
me.$tabs = $boxTabs.find('> li');
me.$panels = me.$('.box-panels > .panel');
me.$marker = me.$('.tabs .marker');
optsFold.$bar = me.$('.toolbar');
var $scrollR = me.$('.tabs .scroll.right');
$scrollL = me.$('.tabs .scroll.left');
@ -123,7 +122,6 @@ define([
var me = this;
if ( this.isFolded ) {
if (!optsFold.$bar) optsFold.$bar = me.$el.find('.toolbar');
if (!optsFold.$box) optsFold.$box = me.$el.find('.box-controls');
optsFold.$bar.addClass('folded');
@ -191,7 +189,9 @@ define([
setTab: function (tab) {
if ( !tab ) {
if ( this.isFolded ) onShowFullviewPanel.call(this, false);
onShowFullviewPanel.call(this, false);
if ( this.isFolded ) { /*this.collapseToolbar();*/ }
else tab = this.lastPanel;
}
@ -216,10 +216,11 @@ define([
else this.$marker.css({left: $tp.position().left});
}
if ( this.isFolded ) {
if ( panel.length )
this.expandToolbar(); else
onShowFullviewPanel.call(this, true);
if ( panel.length ) {
if ( this.isFolded ) this.expandToolbar();
} else {
onShowFullviewPanel.call(this, true);
if ( this.isFolded ) this.collapseToolbar();
}
}
},

11
apps/common/main/lib/component/Window.js
View file

@ -183,7 +183,8 @@ define([
}
function _keydown(event) {
if (!this.isLocked() && this.isVisible() && this.initConfig.enableKeyEvents) {
if (!this.isLocked() && this.isVisible()
&& this.initConfig.enableKeyEvents && this.pauseKeyEvents !== false) {
switch (event.keyCode) {
case Common.UI.Keys.ESC:
if ( $('.asc-loadmask').length<1 ) {
@ -863,7 +864,15 @@ define([
this.resizable = resizable;
}
},
suspendKeyEvents: function () {
this.pauseKeyEvents = false;
},
resumeKeyEvents: function () {
this.initConfig.enableKeyEvents && (this.pauseKeyEvents = true);
},
onPrimary: function() {},
cancelButtonText: 'Cancel',

10
apps/common/main/resources/less/toolbar.less
View file

@ -237,7 +237,15 @@
top: @height-tabs;
bottom: 0;
width: 100%;
z-index: 995;
z-index: 1041;
}
.toolbar {
&.cover {
ul {
z-index: 1042;
}
}
}
.btn-toolbar {

12
apps/documenteditor/main/app/controller/LeftMenu.js
View file

@ -78,7 +78,8 @@ define([
'hide': _.bind(this.aboutShowHide, this, true)
},
'FileMenu': {
'filemenu:hide': _.bind(this.menuFilesHide, this),
'menu:hide': _.bind(this.menuFilesShowHide, this, 'hide'),
'menu:show': _.bind(this.menuFilesShowHide, this, 'show'),
'item:click': _.bind(this.clickMenuFileItem, this),
'saveas:format': _.bind(this.clickSaveAsFormat, this),
'settings:apply': _.bind(this.applySettings, this),
@ -532,8 +533,13 @@ define([
if (value) $(this.leftMenu.btnAbout.el).blur();
},
menuFilesHide: function(obj) {
// $(this.leftMenu.btnFile.el).blur();
menuFilesShowHide: function(state) {
if ( this.dlgSearch ) {
if ( state == 'show' )
this.dlgSearch.suspendKeyEvents();
else
Common.Utils.asyncCall(this.dlgSearch.resumeKeyEvents);
}
},
onMenuChange: function (value) {

4
apps/documenteditor/main/resources/less/toolbar.less
View file

@ -4,7 +4,9 @@
}
.toolbar {
z-index: 101;
&:not(.cover) {
z-index: 101;
}
&.masked {
button.disabled .icon:not(.no-mask) {

11
apps/presentationeditor/main/app/controller/LeftMenu.js
View file

@ -75,6 +75,8 @@ define([
'hide': _.bind(this.aboutShowHide, this, true)
},
'FileMenu': {
'menu:hide': _.bind(this.menuFilesShowHide, this, 'hide'),
'menu:show': _.bind(this.menuFilesShowHide, this, 'show'),
'filemenu:hide': _.bind(this.menuFilesHide, this),
'item:click': _.bind(this.clickMenuFileItem, this),
'saveas:format': _.bind(this.clickSaveAsFormat, this),
@ -421,6 +423,15 @@ define([
if (value) $(this.leftMenu.btnAbout.el).blur();
},
menuFilesShowHide: function(state) {
if ( this.dlgSearch ) {
if ( state == 'show' )
this.dlgSearch.suspendKeyEvents();
else
Common.Utils.asyncCall(this.dlgSearch.resumeKeyEvents);
}
},
onShortcut: function(s, e) {
var previewPanel = PE.getController('Viewport').getView('DocumentPreview');

4
apps/presentationeditor/main/resources/less/toolbar.less
View file

@ -1,6 +1,8 @@
.toolbar {
z-index: 101;
&:not(.cover) {
z-index: 101;
}
&.masked {
.btn-toolbar.disabled .icon:not(.btn-print):not(.btn-save):not(.btn-save-coauth):not(.btn-settings):not(.btn-hidebars) {

11
apps/spreadsheeteditor/main/app/controller/LeftMenu.js
View file

@ -66,6 +66,8 @@ define([
'hide': _.bind(this.aboutShowHide, this, false)
},
'FileMenu': {
'menu:hide': _.bind(this.menuFilesShowHide, this, 'hide'),
'menu:show': _.bind(this.menuFilesShowHide, this, 'show'),
'item:click': _.bind(this.clickMenuFileItem, this),
'saveas:format': _.bind(this.clickSaveAsFormat, this),
'settings:apply': _.bind(this.applySettings, this),
@ -576,6 +578,15 @@ define([
}
},
menuFilesShowHide: function(state) {
if ( this.dlgSearch ) {
if ( state == 'show' )
this.dlgSearch.suspendKeyEvents();
else
Common.Utils.asyncCall(this.dlgSearch.resumeKeyEvents);
}
},
/** coauthoring end **/
onShortcut: function(s, e) {

4
apps/spreadsheeteditor/main/resources/less/toolbar.less
View file

@ -1,5 +1,7 @@
.toolbar {
z-index: 102;
&:not(.cover) {
z-index: 102;
}
&.masked {
button.disabled .btn-icon:not(.btn-print):not(.btn-save):not(.btn-save-coauth):not(.btn-settings):not(.btn-showmode) {