From bab6d85c5bfb8d0dc9aac4f6b9c5211b2adab37e Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Fri, 12 Nov 2021 16:21:01 +0300 Subject: [PATCH] [DE PE SSE] Fix alt hints for compact toolbar --- .../main/app/controller/Toolbar.js | 1 + apps/documenteditor/main/app/view/Toolbar.js | 24 ++++++++++++----- .../main/app/controller/Toolbar.js | 1 + .../main/app/view/Toolbar.js | 24 ++++++++++++----- .../main/app/controller/Toolbar.js | 1 + .../main/app/view/Toolbar.js | 26 ++++++++++++++----- 6 files changed, 58 insertions(+), 19 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index ae5dea3a8..59fab48b4 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -3199,6 +3199,7 @@ 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'); } diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index 758ceccb2..917a8e50d 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -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); diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index a9615a08c..adbede1ab 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -2444,6 +2444,7 @@ 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'); } diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index cd3207d6a..fc58bd2b7 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -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); diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 1e64b6725..f0a44ac1b 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -3775,6 +3775,7 @@ 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'); } diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index 9255437ca..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 ) { @@ -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;