diff --git a/apps/common/main/lib/component/ComboBoxFonts.js b/apps/common/main/lib/component/ComboBoxFonts.js index 958b4026e..319d15f89 100644 --- a/apps/common/main/lib/component/ComboBoxFonts.js +++ b/apps/common/main/lib/component/ComboBoxFonts.js @@ -182,6 +182,7 @@ define([ }, onInputKeyUp: function(e) { + if (!this._isKeyDown) return; if (e.keyCode != Common.UI.Keys.RETURN && e.keyCode !== Common.UI.Keys.SHIFT && e.keyCode !== Common.UI.Keys.CTRL && e.keyCode !== Common.UI.Keys.ALT && e.keyCode !== Common.UI.Keys.LEFT && e.keyCode !== Common.UI.Keys.RIGHT && @@ -213,9 +214,11 @@ define([ }, 10); } } + this._isKeyDown = false; }, onInputKeyDown: function(e) { + this._isKeyDown = true; this._inInputKeyDown = (new Date()); var me = this; diff --git a/apps/common/main/lib/component/Mixtbar.js b/apps/common/main/lib/component/Mixtbar.js index 44fc291ab..a1d5188d5 100644 --- a/apps/common/main/lib/component/Mixtbar.js +++ b/apps/common/main/lib/component/Mixtbar.js @@ -100,7 +100,7 @@ define([ '
  • ' + '<% if (items[i].extcls) print(\' \' + items[i].extcls) %>">' + - '<%= items[i].caption %>' + + ' data-hint-title="<%= items[i].dataHintTitle %>" <% } %>><%= items[i].caption %>' + '
    • ' + '<% } %>' + '<% } %>' + @@ -316,7 +316,7 @@ define([ return config.tabs[index].action; } - var _tabTemplate = _.template(''); + var _tabTemplate = _.template(''); config.tabs[after + 1] = tab; var _after_action = _get_tab_action(after); diff --git a/apps/common/main/lib/controller/Plugins.js b/apps/common/main/lib/controller/Plugins.js index 1513fc2cd..d8dd5a909 100644 --- a/apps/common/main/lib/controller/Plugins.js +++ b/apps/common/main/lib/controller/Plugins.js @@ -63,7 +63,7 @@ define([ var appOptions = me.getApplication().getController('Main').appOptions; if ( !appOptions.isEditMailMerge && !appOptions.isEditDiagram ) { - var tab = {action: 'plugins', caption: me.panelPlugins.groupCaption}; + var tab = {action: 'plugins', caption: me.panelPlugins.groupCaption, dataHintTitle: 'E'}; me.$toolbarPanelPlugins = me.panelPlugins.getPanel(); toolbar.addTab(tab, me.$toolbarPanelPlugins, 10); // TODO: clear plugins list in left panel diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js index 62f41c7e8..d14a04d90 100644 --- a/apps/common/main/lib/view/Header.js +++ b/apps/common/main/lib/view/Header.js @@ -470,14 +470,15 @@ define([ getPanel: function (role, config) { var me = this; - function createTitleButton(iconid, slot, disabled, hintDirection, hintOffset) { + function createTitleButton(iconid, slot, disabled, hintDirection, hintOffset, hintTitle) { return (new Common.UI.Button({ cls: 'btn-header', iconCls: iconid, disabled: disabled === true, dataHint:'0', dataHintDirection: hintDirection ? hintDirection : 'left', - dataHintOffset: hintOffset ? hintOffset : '10, 10' + dataHintOffset: hintOffset ? hintOffset : '10, 10', + dataHintTitle: hintTitle })).render(slot); } @@ -532,7 +533,7 @@ define([ this.btnDownload = createTitleButton('toolbar__icon icon--inverse btn-download', $html.findById('#slot-hbtn-download'), undefined, 'bottom', 'big'); if ( config.canPrint ) - this.btnPrint = createTitleButton('toolbar__icon icon--inverse btn-print', $html.findById('#slot-hbtn-print'), undefined, 'bottom', 'big'); + this.btnPrint = createTitleButton('toolbar__icon icon--inverse btn-print', $html.findById('#slot-hbtn-print'), undefined, 'bottom', 'big', 'P'); if ( config.canEdit && config.canRequestEditRights ) this.btnEdit = createTitleButton('toolbar__icon icon--inverse btn-edit', $html.findById('#slot-hbtn-edit'), undefined, 'bottom', 'big'); @@ -541,7 +542,7 @@ define([ if (!config.isEdit || config.customization && !!config.customization.compactHeader) { if (config.user.guest && config.canRenameAnonymous) - me.btnUserName = createTitleButton('toolbar__icon icon--inverse btn-user', $html.findById('#slot-btn-user-name'), undefined, 'bottom', 'big'); + me.btnUserName = createTitleButton('toolbar__icon icon--inverse btn-user', $html.findById('#slot-btn-user-name'), undefined, 'bottom', 'big' ); else { me.elUserName = $html.find('.btn-current-user'); me.elUserName.removeClass('hidden'); @@ -567,12 +568,12 @@ define([ me.setUserName(me.options.userName); if ( config.canPrint && config.isEdit ) { - me.btnPrint = createTitleButton('toolbar__icon icon--inverse btn-print', $html.findById('#slot-btn-dt-print'), true); + me.btnPrint = createTitleButton('toolbar__icon icon--inverse btn-print', $html.findById('#slot-btn-dt-print'), true, undefined, undefined, 'P'); } - me.btnSave = createTitleButton('toolbar__icon icon--inverse btn-save', $html.findById('#slot-btn-dt-save'), true); - me.btnUndo = createTitleButton('toolbar__icon icon--inverse btn-undo', $html.findById('#slot-btn-dt-undo'), true); - me.btnRedo = createTitleButton('toolbar__icon icon--inverse btn-redo', $html.findById('#slot-btn-dt-redo'), true); + me.btnSave = createTitleButton('toolbar__icon icon--inverse btn-save', $html.findById('#slot-btn-dt-save'), true, undefined, undefined, 'S'); + me.btnUndo = createTitleButton('toolbar__icon icon--inverse btn-undo', $html.findById('#slot-btn-dt-undo'), true, undefined, undefined, 'Z'); + me.btnRedo = createTitleButton('toolbar__icon icon--inverse btn-redo', $html.findById('#slot-btn-dt-redo'), true, undefined, undefined, 'Y'); if ( me.btnSave.$icon.is('svg') ) { me.btnSave.$icon.addClass('icon-save btn-save'); diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 07ccd796f..59fab48b4 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -3178,7 +3178,7 @@ define([ me.toolbar.render(_.extend({isCompactView: compactview}, config)); - var tab = {action: 'review', caption: me.toolbar.textTabCollaboration}; + var tab = {action: 'review', caption: me.toolbar.textTabCollaboration, dataHintTitle: 'U'}; var $panel = me.application.getController('Common.Controllers.ReviewChanges').createToolbarPanel(); if ( $panel ) { me.toolbar.addTab(tab, $panel, 5); @@ -3199,12 +3199,13 @@ define([ // move 'paste' button to the container instead of 'undo' and 'redo' me.toolbar.btnPaste.$el.detach().appendTo($box); + me.toolbar.btnPaste.$el.find('button').attr('data-hint-direction', 'bottom'); me.toolbar.btnCopy.$el.removeClass('split'); } if ( config.isDesktopApp ) { if ( config.canProtect ) { - tab = {action: 'protect', caption: me.toolbar.textTabProtect}; + tab = {action: 'protect', caption: me.toolbar.textTabProtect, dataHintTitle: 'T'}; $panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel(); if ($panel) me.toolbar.addTab(tab, $panel, 6); @@ -3217,7 +3218,7 @@ define([ } if ( config.isEdit && config.canFeatureContentControl || config.isRestrictedEdit && config.canFillForms ) { if (config.canFeatureForms) { - tab = {caption: me.textTabForms, action: 'forms'}; + tab = {caption: me.textTabForms, action: 'forms', dataHintTitle: 'M'}; var forms = me.getApplication().getController('FormsTab'); forms.setApi(me.api).setConfig({toolbar: me, config: config}); $panel = forms.createToolbarPanel(); diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index 27297de15..917a8e50d 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -109,11 +109,11 @@ define([ Common.UI.Mixtbar.prototype.initialize.call(this, { template: _.template(template), tabs: [ - {caption: me.textTabFile, action: 'file', extcls: 'canedit', haspanel:false}, - {caption: me.textTabHome, action: 'home', extcls: 'canedit'}, - {caption: me.textTabInsert, action: 'ins', extcls: 'canedit'}, - {caption: me.textTabLayout, action: 'layout', extcls: 'canedit'}, - {caption: me.textTabLinks, action: 'links', extcls: 'canedit'} + {caption: me.textTabFile, action: 'file', extcls: 'canedit', haspanel:false, dataHintTitle: 'F'}, + {caption: me.textTabHome, action: 'home', extcls: 'canedit', dataHintTitle: 'H'}, + {caption: me.textTabInsert, action: 'ins', extcls: 'canedit', dataHintTitle: 'I'}, + {caption: me.textTabLayout, action: 'layout', extcls: 'canedit', dataHintTitle: 'L'}, + {caption: me.textTabLinks, action: 'links', extcls: 'canedit', dataHintTitle: 'R'} ] } ); @@ -125,7 +125,10 @@ define([ id: 'id-toolbar-btn-print', cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-print no-mask', - signals: ['disabled'] + signals: ['disabled'], + dataHint: '1', + dataHintDirection: 'top', + dataHintTitle: 'P' }); this.toolbarControls.push(this.btnPrint); @@ -133,7 +136,10 @@ define([ id: 'id-toolbar-btn-save', cls: 'btn-toolbar', iconCls: 'toolbar__icon no-mask ' + this.btnSaveCls, - signals: ['disabled'] + signals: ['disabled'], + dataHint: '1', + dataHintDirection: 'bottom', + dataHintTitle: 'S' }); this.toolbarControls.push(this.btnSave); this.btnCollabChanges = this.btnSave; @@ -142,7 +148,10 @@ define([ id: 'id-toolbar-btn-undo', cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-undo', - signals: ['disabled'] + signals: ['disabled'], + dataHint: '1', + dataHintDirection: 'bottom', + dataHintTitle: 'Z' }); this.toolbarControls.push(this.btnUndo); @@ -150,7 +159,10 @@ define([ id: 'id-toolbar-btn-redo', cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-redo', - signals: ['disabled'] + signals: ['disabled'], + dataHint: '1', + dataHintDirection: 'bottom', + dataHintTitle: 'Y' }); this.toolbarControls.push(this.btnRedo); @@ -169,8 +181,8 @@ define([ cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-paste', dataHint: '1', - dataHintDirection: 'bottom', - dataHintTitle: 'P' + dataHintDirection: 'top', + dataHintTitle: 'V' }); this.paragraphControls.push(this.btnPaste); @@ -1398,7 +1410,7 @@ define([ Common.UI.Mixtbar.prototype.initialize.call(this, { template: _.template(template_view), tabs: [ - {caption: me.textTabFile, action: 'file', haspanel: false} + {caption: me.textTabFile, action: 'file', haspanel: false, dataHintTitle: 'F'} ] } ); diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index 38dcbfe6b..adbede1ab 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -2418,7 +2418,7 @@ define([ } me.toolbar.render(_.extend({compactview: compactview}, config)); - var tab = {action: 'review', caption: me.toolbar.textTabCollaboration}; + var tab = {action: 'review', caption: me.toolbar.textTabCollaboration, dataHintTitle: 'U'}; var $panel = me.getApplication().getController('Common.Controllers.ReviewChanges').createToolbarPanel(); if ( $panel ) { me.toolbar.addTab(tab, $panel, 4); @@ -2444,12 +2444,13 @@ define([ // move 'paste' button to the container instead of 'undo' and 'redo' me.toolbar.btnPaste.$el.detach().appendTo($box); + me.toolbar.btnPaste.$el.find('button').attr('data-hint-direction', 'bottom'); me.toolbar.btnCopy.$el.removeClass('split'); } if ( config.isDesktopApp ) { if ( config.canProtect ) { // don't add protect panel to toolbar - tab = {action: 'protect', caption: me.toolbar.textTabProtect}; + tab = {action: 'protect', caption: me.toolbar.textTabProtect, dataHintTitle: 'T'}; $panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel(); if ($panel) me.toolbar.addTab(tab, $panel, 4); diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index 0d48419c8..fc58bd2b7 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -128,10 +128,10 @@ define([ Common.UI.Mixtbar.prototype.initialize.call(this, { template: _.template(template), tabs: [ - {caption: me.textTabFile, action: 'file', extcls: 'canedit', haspanel:false}, - {caption: me.textTabHome, action: 'home', extcls: 'canedit'}, - {caption: me.textTabInsert, action: 'ins', extcls: 'canedit'}, - {caption: me.textTabTransitions, action: 'transit', extcls: 'canedit'} + {caption: me.textTabFile, action: 'file', extcls: 'canedit', haspanel:false, dataHintTitle: 'F'}, + {caption: me.textTabHome, action: 'home', extcls: 'canedit', dataHintTitle: 'H'}, + {caption: me.textTabInsert, action: 'ins', extcls: 'canedit', dataHintTitle: 'I'}, + {caption: me.textTabTransitions, action: 'transit', extcls: 'canedit', dataHintTitle: 'N'} ] } ); @@ -186,7 +186,10 @@ define([ cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-print no-mask', lock: [_set.slideDeleted, _set.noSlides, _set.cantPrint, _set.disableOnStart], - signals: ['disabled'] + signals: ['disabled'], + dataHint: '1', + dataHintDirection: 'top', + dataHintTitle: 'P' }); me.slideOnlyControls.push(me.btnPrint); @@ -195,7 +198,10 @@ define([ cls: 'btn-toolbar', iconCls: 'toolbar__icon no-mask ' + me.btnSaveCls, lock: [_set.lostConnect], - signals: ['disabled'] + signals: ['disabled'], + dataHint: '1', + dataHintDirection: 'bottom', + dataHintTitle: 'S' }); me.btnCollabChanges = me.btnSave; @@ -204,7 +210,10 @@ define([ cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-undo', lock: [_set.undoLock, _set.slideDeleted, _set.lostConnect, _set.disableOnStart], - signals: ['disabled'] + signals: ['disabled'], + dataHint: '1', + dataHintDirection: 'bottom', + dataHintTitle: 'Z' }); me.slideOnlyControls.push(me.btnUndo); @@ -213,7 +222,10 @@ define([ cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-redo', lock: [_set.redoLock, _set.slideDeleted, _set.lostConnect, _set.disableOnStart], - signals: ['disabled'] + signals: ['disabled'], + dataHint: '1', + dataHintDirection: 'bottom', + dataHintTitle: 'Y' }); me.slideOnlyControls.push(me.btnRedo); @@ -234,8 +246,8 @@ define([ iconCls: 'toolbar__icon btn-paste', lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides], dataHint: '1', - dataHintDirection: 'bottom', - dataHintTitle: 'P' + dataHintDirection: 'top', + dataHintTitle: 'V' }); me.paragraphControls.push(me.btnPaste); @@ -1073,7 +1085,7 @@ define([ Common.UI.Mixtbar.prototype.initialize.call(this, { template: _.template(template_view), tabs: [ - {caption: me.textTabFile, action: 'file', haspanel:false} + {caption: me.textTabFile, action: 'file', haspanel:false, dataHintTitle: 'F'} ] } ); diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 55997074b..f0a44ac1b 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -3715,7 +3715,7 @@ define([ me.toolbar.render(_.extend({isCompactView: compactview}, config)); if ( !config.isEditDiagram && !config.isEditMailMerge ) { - var tab = {action: 'review', caption: me.toolbar.textTabCollaboration}; + var tab = {action: 'review', caption: me.toolbar.textTabCollaboration, dataHintTitle: 'U'}; var $panel = me.getApplication().getController('Common.Controllers.ReviewChanges').createToolbarPanel(); if ($panel) { me.toolbar.addTab(tab, $panel, 6); @@ -3755,7 +3755,7 @@ define([ Array.prototype.push.apply(me.toolbar.lockControls, formulatab.getButtons()); if ( config.canFeaturePivot ) { - tab = {action: 'pivot', caption: me.textPivot}; + tab = {action: 'pivot', caption: me.textPivot, dataHintTitle: 'B'}; var pivottab = me.getApplication().getController('PivotTable'); pivottab.setApi(me.api).setConfig({toolbar: me}); $panel = pivottab.createToolbarPanel(); @@ -3775,10 +3775,11 @@ define([ // move 'paste' button to the container instead of 'undo' and 'redo' me.toolbar.btnPaste.$el.detach().appendTo($box); + me.toolbar.btnPaste.$el.find('button').attr('data-hint-direction', 'bottom'); me.toolbar.btnCopy.$el.removeClass('split'); } - var tab = {action: 'protect', caption: me.toolbar.textTabProtect}; + var tab = {action: 'protect', caption: me.toolbar.textTabProtect, dataHintTitle: 'T'}; var $panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel(); if ($panel) { config.canProtect && $panel.append($('
    ')); diff --git a/apps/spreadsheeteditor/main/app/template/StatusBar.template b/apps/spreadsheeteditor/main/app/template/StatusBar.template index b0dfb6c95..780145617 100644 --- a/apps/spreadsheeteditor/main/app/template/StatusBar.template +++ b/apps/spreadsheeteditor/main/app/template/StatusBar.template @@ -1,15 +1,15 @@
    - - - - + + + +
    - +
    - +
    diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index 190ebfce9..f431b40f4 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -196,9 +196,9 @@ define([ cls : 'btn-toolbar', iconCls : 'toolbar__icon btn-paste', lock : [/*_set.editCell,*/ _set.coAuth, _set.lostConnect], - dataHint: '1', - dataHintDirection: 'bottom', - dataHintTitle: 'P' + dataHint : '1', + dataHintDirection: 'top', + dataHintTitle: 'V' }); me.btnUndo = new Common.UI.Button({ @@ -207,7 +207,10 @@ define([ iconCls : 'toolbar__icon btn-undo', disabled : true, lock : [_set.lostConnect], - signals : ['disabled'] + signals : ['disabled'], + dataHint : '1', + dataHintDirection: 'bottom', + dataHintTitle: 'Z' }); me.btnRedo = new Common.UI.Button({ @@ -216,7 +219,10 @@ define([ iconCls : 'toolbar__icon btn-redo', disabled : true, lock : [_set.lostConnect], - signals : ['disabled'] + signals : ['disabled'], + dataHint : '1', + dataHintDirection: 'bottom', + dataHintTitle: 'Y' }); if ( config.isEditDiagram ) { @@ -352,14 +358,14 @@ define([ Common.UI.Mixtbar.prototype.initialize.call(this, { template: _.template(template), tabs: [ - { caption: me.textTabFile, action: 'file', extcls: 'canedit', haspanel:false}, - { caption: me.textTabHome, action: 'home', extcls: 'canedit'}, - { caption: me.textTabInsert, action: 'ins', extcls: 'canedit'}, - {caption: me.textTabLayout, action: 'layout', extcls: 'canedit'}, - {caption: me.textTabFormula, action: 'formula', extcls: 'canedit'}, - {caption: me.textTabData, action: 'data', extcls: 'canedit'}, + { caption: me.textTabFile, action: 'file', extcls: 'canedit', haspanel:false, dataHintTitle: 'F'}, + { caption: me.textTabHome, action: 'home', extcls: 'canedit', dataHintTitle: 'H'}, + { caption: me.textTabInsert, action: 'ins', extcls: 'canedit', dataHintTitle: 'I'}, + {caption: me.textTabLayout, action: 'layout', extcls: 'canedit', dataHintTitle: 'L'}, + {caption: me.textTabFormula, action: 'formula', extcls: 'canedit', dataHintTitle: 'O'}, + {caption: me.textTabData, action: 'data', extcls: 'canedit', dataHintTitle: 'D'}, undefined, undefined, undefined, - {caption: me.textTabView, action: 'view', extcls: 'canedit'} + {caption: me.textTabView, action: 'view', extcls: 'canedit', dataHintTitle: 'W'} ]} ); @@ -407,7 +413,10 @@ define([ cls : 'btn-toolbar', iconCls : 'toolbar__icon btn-print no-mask', lock : [_set.editCell, _set.cantPrint, _set.disableOnStart], - signals: ['disabled'] + signals: ['disabled'], + dataHint : '1', + dataHintDirection: 'top', + dataHintTitle: 'P' }); me.btnSave = new Common.UI.Button({ @@ -415,7 +424,10 @@ define([ cls : 'btn-toolbar', iconCls : 'toolbar__icon no-mask ' + me.btnSaveCls, lock : [_set.lostConnect], - signals : ['disabled'] + signals : ['disabled'], + dataHint : '1', + dataHintDirection: 'bottom', + dataHintTitle: 'S' }); me.btnCollabChanges = me.btnSave; @@ -1615,7 +1627,7 @@ define([ Common.UI.Mixtbar.prototype.initialize.call(this, { template: _.template(template_view), tabs: [ - {caption: me.textTabFile, action: 'file', haspanel:false} + {caption: me.textTabFile, action: 'file', haspanel:false, dataHintTitle: 'F'} ] } );