From 529d6c2ad09216932624a9319d5dc71b2c6618dd Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Thu, 10 Jun 2021 23:05:49 +0300 Subject: [PATCH] [SSE] Hint manager: add hints into right menu and file menu --- .../main/app/controller/LeftMenu.js | 3 +- .../main/app/template/ChartSettings.template | 2 +- .../main/app/template/ImageSettings.template | 4 +- .../app/template/ParagraphSettings.template | 2 +- .../main/app/template/PivotSettings.template | 2 +- .../main/app/template/SlicerSettings.template | 2 +- .../app/template/TextArtSettings.template | 4 +- .../main/app/view/ChartSettings.js | 30 ++++-- .../main/app/view/FileMenu.js | 80 ++++++++++++---- .../main/app/view/FileMenuPanels.js | 2 +- .../main/app/view/ImageSettings.js | 45 +++++++-- .../main/app/view/ParagraphSettings.js | 20 +++- .../main/app/view/SlicerSettings.js | 80 ++++++++++++---- .../main/app/view/TextArtSettings.js | 95 +++++++++++++++---- 14 files changed, 290 insertions(+), 81 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js index 2357ad1e3..e73b62829 100644 --- a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js +++ b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js @@ -846,7 +846,8 @@ define([ return false; case 'escape': if ( this.leftMenu.menuFile.isVisible() ) { - this.leftMenu.menuFile.hide(); + if (Common.UI.HintManager.needCloseMenu()) + this.leftMenu.menuFile.hide(); return false; } diff --git a/apps/spreadsheeteditor/main/app/template/ChartSettings.template b/apps/spreadsheeteditor/main/app/template/ChartSettings.template index da13d1774..6d6d54589 100644 --- a/apps/spreadsheeteditor/main/app/template/ChartSettings.template +++ b/apps/spreadsheeteditor/main/app/template/ChartSettings.template @@ -125,7 +125,7 @@ - + diff --git a/apps/spreadsheeteditor/main/app/template/ImageSettings.template b/apps/spreadsheeteditor/main/app/template/ImageSettings.template index da2f10b99..9d7e446a7 100644 --- a/apps/spreadsheeteditor/main/app/template/ImageSettings.template +++ b/apps/spreadsheeteditor/main/app/template/ImageSettings.template @@ -21,7 +21,7 @@ @@ -77,7 +77,7 @@ diff --git a/apps/spreadsheeteditor/main/app/template/ParagraphSettings.template b/apps/spreadsheeteditor/main/app/template/ParagraphSettings.template index 5c680a54c..d736979fc 100644 --- a/apps/spreadsheeteditor/main/app/template/ParagraphSettings.template +++ b/apps/spreadsheeteditor/main/app/template/ParagraphSettings.template @@ -34,7 +34,7 @@ diff --git a/apps/spreadsheeteditor/main/app/template/PivotSettings.template b/apps/spreadsheeteditor/main/app/template/PivotSettings.template index 975e84675..47855e7c1 100644 --- a/apps/spreadsheeteditor/main/app/template/PivotSettings.template +++ b/apps/spreadsheeteditor/main/app/template/PivotSettings.template @@ -48,7 +48,7 @@ diff --git a/apps/spreadsheeteditor/main/app/template/SlicerSettings.template b/apps/spreadsheeteditor/main/app/template/SlicerSettings.template index b3f78bdc8..27b937ffe 100644 --- a/apps/spreadsheeteditor/main/app/template/SlicerSettings.template +++ b/apps/spreadsheeteditor/main/app/template/SlicerSettings.template @@ -122,7 +122,7 @@ diff --git a/apps/spreadsheeteditor/main/app/template/TextArtSettings.template b/apps/spreadsheeteditor/main/app/template/TextArtSettings.template index d480b1716..d129cfd94 100644 --- a/apps/spreadsheeteditor/main/app/template/TextArtSettings.template +++ b/apps/spreadsheeteditor/main/app/template/TextArtSettings.template @@ -33,10 +33,10 @@
- +
- +
- +
- +
- +
diff --git a/apps/spreadsheeteditor/main/app/view/ChartSettings.js b/apps/spreadsheeteditor/main/app/view/ChartSettings.js index 3ca5d4ed0..68bbc16fb 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ChartSettings.js @@ -609,7 +609,10 @@ define([ defaultUnit : "cm", value: '3 cm', maxValue: 55.88, - minValue: 0 + minValue: 0, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.spinners.push(this.spnWidth); this.lockedControls.push(this.spnWidth); @@ -621,7 +624,10 @@ define([ defaultUnit : "cm", value: '3 cm', maxValue: 55.88, - minValue: 0 + minValue: 0, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.spinners.push(this.spnHeight); this.lockedControls.push(this.spnHeight); @@ -637,7 +643,10 @@ define([ iconCls: 'toolbar__icon advanced-btn-ratio', style: 'margin-bottom: 1px;', enableToggle: true, - hint: this.textKeepRatio + hint: this.textKeepRatio, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.lockedControls.push(this.btnRatio); @@ -738,7 +747,10 @@ define([ cls : 'btn-toolbar', iconCls : 'toolbar__icon btn-menu-chart', caption : this.textChangeType, - style : 'width: 100%;text-align: left;' + style : 'width: 100%;text-align: left;', + dataHint : '1', + dataHintDirection: 'left', + dataHintOffset: 'small' }); this.btnChangeType.on('click', _.bind(this.onChangeType, this)); this.lockedControls.push(this.btnChangeType); @@ -748,7 +760,10 @@ define([ cls : 'btn-toolbar', iconCls : 'toolbar__icon btn-select-range', caption : this.textSelectData, - style : 'width: 100%;text-align: left;' + style : 'width: 100%;text-align: left;', + dataHint : '1', + dataHintDirection: 'left', + dataHintOffset: 'small' }); this.btnSelectData.on('click', _.bind(this.onSelectData, this)); this.lockedControls.push(this.btnSelectData); @@ -976,7 +991,10 @@ define([ itemHeight: 50, menuMaxHeight: 270, enableKeyEvents: true, - cls: 'combo-chart-style' + cls: 'combo-chart-style', + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.cmbChartStyle.render($('#chart-combo-style')); this.cmbChartStyle.openButton.menu.cmpEl.css({ diff --git a/apps/spreadsheeteditor/main/app/view/FileMenu.js b/apps/spreadsheeteditor/main/app/view/FileMenu.js index 4f41c7ba0..75171a225 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenu.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenu.js @@ -79,7 +79,10 @@ define([ action : 'save', caption : this.btnSaveCaption, canFocused: false, - disabled: true + disabled: true, + dataHint: 1, + dataHintDirection: 'left-top', + dataHintOffset: [2, 14] }); if ( !!this.options.miSave ) { this.miSave.setDisabled(this.options.miSave.isDisabled()); @@ -90,49 +93,70 @@ define([ el : $markup.elementById('#fm-btn-edit'), action : 'edit', caption : this.btnToEditCaption, - canFocused: false + canFocused: false, + dataHint: 1, + dataHintDirection: 'left-top', + dataHintOffset: [2, 14] }); this.miDownload = new Common.UI.MenuItem({ el : $markup.elementById('#fm-btn-download'), action : 'saveas', caption : this.btnDownloadCaption, - canFocused: false + canFocused: false, + dataHint: 1, + dataHintDirection: 'left-top', + dataHintOffset: [2, 14] }); this.miSaveCopyAs = new Common.UI.MenuItem({ el : $markup.elementById('#fm-btn-save-copy'), action : 'save-copy', caption : this.btnSaveCopyAsCaption, - canFocused: false + canFocused: false, + dataHint: 1, + dataHintDirection: 'left-top', + dataHintOffset: [2, 14] }); this.miSaveAs = new Common.UI.MenuItem({ el : $markup.elementById('#fm-btn-save-desktop'), action : 'save-desktop', caption : this.btnSaveAsCaption, - canFocused: false + canFocused: false, + dataHint: 1, + dataHintDirection: 'left-top', + dataHintOffset: [2, 14] }); this.miPrint = new Common.UI.MenuItem({ el : $markup.elementById('#fm-btn-print'), action : 'print', caption : this.btnPrintCaption, - canFocused: false + canFocused: false, + dataHint: 1, + dataHintDirection: 'left-top', + dataHintOffset: [2, 14] }); this.miRename = new Common.UI.MenuItem({ el : $markup.elementById('#fm-btn-rename'), action : 'rename', caption : this.btnRenameCaption, - canFocused: false + canFocused: false, + dataHint: 1, + dataHintDirection: 'left-top', + dataHintOffset: [2, 14] }); this.miProtect = new Common.UI.MenuItem({ el : $markup.elementById('#fm-btn-protect'), action : 'protect', caption : this.btnProtectCaption, - canFocused: false + canFocused: false, + dataHint: 1, + dataHintDirection: 'left-top', + dataHintOffset: [2, 14] }); if ( !!this.options.miProtect ) { this.miProtect.setDisabled(this.options.miProtect.isDisabled()); @@ -143,35 +167,50 @@ define([ el : $markup.elementById('#fm-btn-recent'), action : 'recent', caption : this.btnRecentFilesCaption, - canFocused: false + canFocused: false, + dataHint: 1, + dataHintDirection: 'left-top', + dataHintOffset: [2, 14] }); this.miNew = new Common.UI.MenuItem({ el : $markup.elementById('#fm-btn-create'), action : 'new', caption : this.btnCreateNewCaption, - canFocused: false + canFocused: false, + dataHint: 1, + dataHintDirection: 'left-top', + dataHintOffset: [2, 14] }); this.miAccess = new Common.UI.MenuItem({ el : $markup.elementById('#fm-btn-rights'), action : 'rights', caption : this.btnRightsCaption, - canFocused: false + canFocused: false, + dataHint: 1, + dataHintDirection: 'left-top', + dataHintOffset: [2, 14] }); this.miSettings = new Common.UI.MenuItem({ el : $markup.elementById('#fm-btn-settings'), action : 'opts', caption : this.btnSettingsCaption, - canFocused: false + canFocused: false, + dataHint: 1, + dataHintDirection: 'left-top', + dataHintOffset: [2, 14] }); this.miHelp = new Common.UI.MenuItem({ el : $markup.elementById('#fm-btn-help'), action : 'help', caption : this.btnHelpCaption, - canFocused: false + canFocused: false, + dataHint: 1, + dataHintDirection: 'left-top', + dataHintOffset: [2, 14] }); this.items = []; @@ -180,7 +219,10 @@ define([ el : $markup.elementById('#fm-btn-return'), action : 'back', caption : this.btnCloseMenuCaption, - canFocused: false + canFocused: false, + dataHint: 1, + dataHintDirection: 'left-top', + dataHintOffset: [2, 14] }), this.miSave, this.miEdit, @@ -196,7 +238,10 @@ define([ el : $markup.elementById('#fm-btn-info'), action : 'info', caption : this.btnInfoCaption, - canFocused: false + canFocused: false, + dataHint: 1, + dataHintDirection: 'left-top', + dataHintOffset: [2, 14] }), this.miAccess, this.miSettings, @@ -205,7 +250,10 @@ define([ el : $markup.elementById('#fm-btn-back'), action : 'exit', caption : this.btnBackCaption, - canFocused: false + canFocused: false, + dataHint: 1, + dataHintDirection: 'left-top', + dataHintOffset: [2, 14] }) ); diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js index 020579857..b22baf0a9 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js @@ -63,7 +63,7 @@ define([ '<% _.each(rows, function(row) { %>', '', '<% _.each(row, function(item) { %>', - '', '<% }) %>', diff --git a/apps/spreadsheeteditor/main/app/view/ImageSettings.js b/apps/spreadsheeteditor/main/app/view/ImageSettings.js index 86e6c9324..1a3b289cd 100644 --- a/apps/spreadsheeteditor/main/app/view/ImageSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ImageSettings.js @@ -130,7 +130,10 @@ define([ defaultUnit : "cm", value: '3 cm', maxValue: 55.88, - minValue: 0 + minValue: 0, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.spinners.push(this.spnWidth); this.lockedControls.push(this.spnWidth); @@ -142,7 +145,10 @@ define([ defaultUnit : "cm", value: '3 cm', maxValue: 55.88, - minValue: 0 + minValue: 0, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.spinners.push(this.spnHeight); this.lockedControls.push(this.spnHeight); @@ -153,7 +159,10 @@ define([ iconCls: 'toolbar__icon advanced-btn-ratio', style: 'margin-bottom: 1px;', enableToggle: true, - hint: this.textKeepRatio + hint: this.textKeepRatio, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.lockedControls.push(this.btnRatio); @@ -186,7 +195,10 @@ define([ {caption: this.textFromUrl, value: 1}, {caption: this.textFromStorage, value: 2} ] - }) + }), + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.lockedControls.push(this.btnSelectImage); this.btnSelectImage.menu.on('item:click', _.bind(this.onImageSelect, this)); @@ -235,7 +247,10 @@ define([ caption: this.textCropFit, value: 2 }] - }) + }), + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.btnCrop.on('click', _.bind(this.onCrop, this)); this.btnCrop.menu.on('item:click', _.bind(this.onCropMenu, this)); @@ -246,7 +261,10 @@ define([ cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-rotate-270', value: 0, - hint: this.textHint270 + hint: this.textHint270, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); this.btnRotate270.on('click', _.bind(this.onBtnRotateClick, this)); this.lockedControls.push(this.btnRotate270); @@ -256,7 +274,10 @@ define([ cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-rotate-90', value: 1, - hint: this.textHint90 + hint: this.textHint90, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); this.btnRotate90.on('click', _.bind(this.onBtnRotateClick, this)); this.lockedControls.push(this.btnRotate90); @@ -266,7 +287,10 @@ define([ cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-flip-vert', value: 0, - hint: this.textHintFlipV + hint: this.textHintFlipV, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); this.btnFlipV.on('click', _.bind(this.onBtnFlipClick, this)); this.lockedControls.push(this.btnFlipV); @@ -276,7 +300,10 @@ define([ cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-flip-hor', value: 1, - hint: this.textHintFlipH + hint: this.textHintFlipH, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); this.btnFlipH.on('click', _.bind(this.onBtnFlipClick, this)); this.lockedControls.push(this.btnFlipH); diff --git a/apps/spreadsheeteditor/main/app/view/ParagraphSettings.js b/apps/spreadsheeteditor/main/app/view/ParagraphSettings.js index 65a8fcf32..e0e708e78 100644 --- a/apps/spreadsheeteditor/main/app/view/ParagraphSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ParagraphSettings.js @@ -274,7 +274,10 @@ define([ cls: 'input-group-nr', menuStyle: 'min-width: 85px;', editable: false, - data: this._arrLineRule + data: this._arrLineRule, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.cmbLineRule.setValue(c_paragraphLinerule.LINERULE_AUTO); this.lockedControls.push(this.cmbLineRule); @@ -286,7 +289,10 @@ define([ value: '1.5', defaultUnit : "", maxValue: 132, - minValue: 0.5 + minValue: 0.5, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.lockedControls.push(this.numLineHeight); @@ -299,7 +305,10 @@ define([ maxValue: 55.88, minValue: 0, allowAuto : true, - autoText : this.txtAutoText + autoText : this.txtAutoText, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.spinners.push(this.numSpacingBefore); this.lockedControls.push(this.numSpacingBefore); @@ -313,7 +322,10 @@ define([ maxValue: 55.88, minValue: 0, allowAuto : true, - autoText : this.txtAutoText + autoText : this.txtAutoText, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.spinners.push(this.numSpacingAfter); this.lockedControls.push(this.numSpacingAfter); diff --git a/apps/spreadsheeteditor/main/app/view/SlicerSettings.js b/apps/spreadsheeteditor/main/app/view/SlicerSettings.js index 9995050c0..0cf90a5b9 100644 --- a/apps/spreadsheeteditor/main/app/view/SlicerSettings.js +++ b/apps/spreadsheeteditor/main/app/view/SlicerSettings.js @@ -142,7 +142,10 @@ define([ defaultUnit : "cm", value: '0 cm', maxValue: 5963.9, - minValue: 0 + minValue: 0, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.spinners.push(this.spnWidth); this.sizeControls.push(this.spnWidth); @@ -154,7 +157,10 @@ define([ defaultUnit : "cm", value: '0 cm', maxValue: 5963.9, - minValue: 0 + minValue: 0, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.spinners.push(this.spnHeight); this.sizeControls.push(this.spnHeight); @@ -165,7 +171,10 @@ define([ iconCls: 'toolbar__icon advanced-btn-ratio', style: 'margin-bottom: 1px;', enableToggle: true, - hint: this.textKeepRatio + hint: this.textKeepRatio, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.sizeControls.push(this.btnRatio); @@ -194,7 +203,10 @@ define([ defaultUnit : "cm", value: '0 cm', maxValue: 5963.9, - minValue: 0 + minValue: 0, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.spinners.push(this.spnHor); this.sizeControls.push(this.spnHor); @@ -206,7 +218,10 @@ define([ defaultUnit : "cm", value: '0 cm', maxValue: 5963.9, - minValue: 0 + minValue: 0, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.spinners.push(this.spnVert); this.sizeControls.push(this.spnVert); @@ -219,7 +234,10 @@ define([ this.chLock = new Common.UI.CheckBox({ el: $('#slicer-checkbox-disable-resize'), labelText: this.textLock, - disabled: this._locked + disabled: this._locked, + dataHint: '1', + dataHintDirection: 'left', + dataHintOffset: 'small' }); this.lockedControls.push(this.chLock); this.chLock.on('change', this.onLockSlicerChange.bind(this)); @@ -231,7 +249,10 @@ define([ defaultUnit : "cm", value: '0 cm', maxValue: 5963.9, - minValue: 0 + minValue: 0, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.spinners.push(this.spnColWidth); this.sizeControls.push(this.spnColWidth); @@ -243,7 +264,10 @@ define([ defaultUnit : "cm", value: '0 cm', maxValue: 5963.9, - minValue: 0 + minValue: 0, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.spinners.push(this.spnColHeight); this.sizeControls.push(this.spnColHeight); @@ -257,7 +281,10 @@ define([ value: '1', allowDecimal: false, maxValue: 20000, - minValue: 1 + minValue: 1, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.sizeControls.push(this.numCols); @@ -274,7 +301,10 @@ define([ el: $('#slicer-radio-asc'), name: 'asc-radio-slicer-sort', labelText: this.textAsc + ' (' + this.textAZ + ')', - checked: true + checked: true, + dataHint: '1', + dataHintDirection: 'left', + dataHintOffset: 'small' }); this.radioAsc.on('change', _.bind(function(field, newValue, eOpts) { if (newValue && this.api) { @@ -291,7 +321,10 @@ define([ el: $('#slicer-radio-desc'), name: 'asc-radio-slicer-sort', labelText: this.textDesc + ' (' + this.textZA + ')', - checked: false + checked: false, + dataHint: '1', + dataHintDirection: 'left', + dataHintOffset: 'small' }); this.radioDesc.on('change', _.bind(function(field, newValue, eOpts) { if (newValue && this.api) { @@ -306,7 +339,10 @@ define([ this.chHideNoData = new Common.UI.CheckBox({ el: $('#slicer-check-hide-nodata'), - labelText: this.strHideNoData + labelText: this.strHideNoData, + dataHint: '1', + dataHintDirection: 'left', + dataHintOffset: 'small' }); this.chHideNoData.on('change', _.bind(function(field, newValue, oldValue, eOpts){ var checked = (field.getValue()=='checked'); @@ -320,7 +356,10 @@ define([ this.chIndNoData = new Common.UI.CheckBox({ el: $('#slicer-check-indicate-nodata'), - labelText: this.strIndNoData + labelText: this.strIndNoData, + dataHint: '1', + dataHintDirection: 'left', + dataHintOffset: 'small' }); this.chIndNoData.on('change', _.bind(function(field, newValue, oldValue, eOpts){ var checked = (field.getValue()=='checked'); @@ -335,7 +374,10 @@ define([ this.chShowNoData = new Common.UI.CheckBox({ el: $('#slicer-check-show-nodata-last'), disabled: true, - labelText: this.strShowNoData + labelText: this.strShowNoData, + dataHint: '1', + dataHintDirection: 'left', + dataHintOffset: 'small' }); this.chShowNoData.on('change', _.bind(function(field, newValue, oldValue, eOpts){ if (this._originalProps && this.api) { @@ -348,7 +390,10 @@ define([ this.chShowDel = new Common.UI.CheckBox({ el: $('#slicer-check-show-deleted'), - labelText: this.strShowDel + labelText: this.strShowDel, + dataHint: '1', + dataHintDirection: 'left', + dataHintOffset: 'small' }); this.chShowDel.on('change', _.bind(function(field, newValue, oldValue, eOpts){ // if (this._originalProps && this.api) { @@ -650,7 +695,10 @@ define([ itemHeight: 49, menuMaxHeight: 235, enableKeyEvents: true, - cls: 'combo-slicer-style' + cls: 'combo-slicer-style', + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.btnSlicerStyle.render($('#slicer-btn-style')); this.btnSlicerStyle.openButton.menu.cmpEl.css({ diff --git a/apps/spreadsheeteditor/main/app/view/TextArtSettings.js b/apps/spreadsheeteditor/main/app/view/TextArtSettings.js index b0b4b315c..405fef951 100644 --- a/apps/spreadsheeteditor/main/app/view/TextArtSettings.js +++ b/apps/spreadsheeteditor/main/app/view/TextArtSettings.js @@ -1086,7 +1086,10 @@ define([ style: 'width: 100%;', menuStyle: 'min-width: 100%;', editable: false, - data: this._arrFillSrc + data: this._arrFillSrc, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.cmbFillSrc.setValue(this._arrFillSrc[0].value); this.cmbFillSrc.on('selected', _.bind(this.onFillSrcSelect, this)); @@ -1097,7 +1100,10 @@ define([ itemHeight: 28, menuMaxHeight: 300, enableKeyEvents: true, - cls: 'combo-pattern' + cls: 'combo-pattern', + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.cmbPattern.menuPicker.itemTemplate = this.cmbPattern.fieldPicker.itemTemplate = _.template([ '
', @@ -1144,7 +1150,10 @@ define([ cls: 'input-group-nr', menuStyle: 'min-width: 90px;', editable: false, - data: this._arrFillType + data: this._arrFillType, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.cmbFillType.setValue(this._arrFillType[0].value); this.cmbFillType.on('selected', _.bind(this.onFillTypeSelect, this)); @@ -1157,7 +1166,10 @@ define([ value: '100 %', defaultUnit : "%", maxValue: 100, - minValue: 0 + minValue: 0, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.numTransparency.on('change', _.bind(this.onNumTransparencyChange, this)); this.numTransparency.on('inputleave', function(){ Common.NotificationCenter.trigger('edit:complete', me);}); @@ -1187,7 +1199,10 @@ define([ cls: 'input-group-nr', menuStyle: 'min-width: 90px;', editable: false, - data: this._arrGradType + data: this._arrGradType, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.cmbGradType.setValue(this._arrGradType[0].value); this.cmbGradType.on('selected', _.bind(this.onGradTypeSelect, this)); @@ -1217,7 +1232,10 @@ define([ items: [ { template: _.template('
') } ] - }) + }), + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.btnDirection.on('render:after', function(btn) { me.mnuDirectionPicker = new Common.UI.DataView({ @@ -1292,7 +1310,10 @@ define([ allowDecimal: false, maxValue: 100, minValue: 0, - disabled: this._locked + disabled: this._locked, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.lockedControls.push(this.spnGradPosition); this.spnGradPosition.on('change', _.bind(this.onPositionChange, this)); @@ -1303,7 +1324,9 @@ define([ cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-add-breakpoint', disabled: this._locked, - hint: this.tipAddGradientPoint + hint: this.tipAddGradientPoint, + dataHint: '1', + dataHintDirection: 'bottom' }); this.btnAddGradientStep.on('click', _.bind(this.onAddGradientStep, this)); this.lockedControls.push(this.btnAddGradientStep); @@ -1313,7 +1336,9 @@ define([ cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-remove-breakpoint', disabled: this._locked, - hint: this.tipRemoveGradientPoint + hint: this.tipRemoveGradientPoint, + dataHint: '1', + dataHintDirection: 'bottom' }); this.btnRemoveGradientStep.on('click', _.bind(this.onRemoveGradientStep, this)); this.lockedControls.push(this.btnRemoveGradientStep); @@ -1327,7 +1352,10 @@ define([ allowDecimal: true, maxValue: 359.9, minValue: 0, - disabled: this._locked + disabled: this._locked, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.lockedControls.push(this.numGradientAngle); this.numGradientAngle.on('change', _.bind(this.onGradientAngleChange, this)); @@ -1336,7 +1364,10 @@ define([ this.cmbBorderSize = new Common.UI.ComboBorderSizeEditable({ el: $('#textart-combo-border-size'), style: "width: 93px;", - txtNoBorders: this.txtNoBorders + txtNoBorders: this.txtNoBorders, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }) .on('selected', _.bind(this.onBorderSizeSelect, this)) .on('changed:before',_.bind(this.onBorderSizeChanged, this, true)) @@ -1349,7 +1380,10 @@ define([ this.cmbBorderType = new Common.UI.ComboBorderType({ el: $('#textart-combo-border-type'), style: "width: 93px;", - menuStyle: 'min-width: 93px;' + menuStyle: 'min-width: 93px;', + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }).on('selected', _.bind(this.onBorderTypeSelect, this)) .on('combo:blur', _.bind(this.onComboBlur, this, false)); this.BorderType = Asc.c_oDashType.solid; @@ -1361,7 +1395,10 @@ define([ itemHeight: 50, menuMaxHeight: 300, enableKeyEvents: true, - cls: 'combo-textart' + cls: 'combo-textart', + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.cmbTransform.render($('#textart-combo-transform')); this.cmbTransform.openButton.menu.cmpEl.css({ @@ -1438,7 +1475,7 @@ define([ el: $('#textart-combo-fill-texture'), template: _.template([ '
', - '
' + this.textSelectTexture + '
', + '
' + this.textSelectTexture + '
', '
', '
- + - +
', + '
', '', '