diff --git a/apps/spreadsheeteditor/main/app/template/LeftMenu.template b/apps/spreadsheeteditor/main/app/template/LeftMenu.template index e39aeb9a5..c11a45dac 100644 --- a/apps/spreadsheeteditor/main/app/template/LeftMenu.template +++ b/apps/spreadsheeteditor/main/app/template/LeftMenu.template @@ -1,14 +1,14 @@
- + - - + + - - - - + + + +
diff --git a/apps/spreadsheeteditor/main/app/template/RightMenu.template b/apps/spreadsheeteditor/main/app/template/RightMenu.template index 1a6b96c13..84424cbc4 100644 --- a/apps/spreadsheeteditor/main/app/template/RightMenu.template +++ b/apps/spreadsheeteditor/main/app/template/RightMenu.template @@ -23,15 +23,15 @@
- - - - - - - - - - + + + + + + + + + +
\ No newline at end of file diff --git a/apps/spreadsheeteditor/main/app/template/ShapeSettings.template b/apps/spreadsheeteditor/main/app/template/ShapeSettings.template index 30cbd4f8b..1d24763b0 100644 --- a/apps/spreadsheeteditor/main/app/template/ShapeSettings.template +++ b/apps/spreadsheeteditor/main/app/template/ShapeSettings.template @@ -202,7 +202,7 @@ - + diff --git a/apps/spreadsheeteditor/main/app/template/StatusBar.template b/apps/spreadsheeteditor/main/app/template/StatusBar.template index 0988bde4b..001aa7bdb 100644 --- a/apps/spreadsheeteditor/main/app/template/StatusBar.template +++ b/apps/spreadsheeteditor/main/app/template/StatusBar.template @@ -2,18 +2,18 @@
- - + +
- +
-
+
diff --git a/apps/spreadsheeteditor/main/app/template/TableSettings.template b/apps/spreadsheeteditor/main/app/template/TableSettings.template index 47f03cc6d..03dd5bd64 100644 --- a/apps/spreadsheeteditor/main/app/template/TableSettings.template +++ b/apps/spreadsheeteditor/main/app/template/TableSettings.template @@ -64,7 +64,7 @@ - + @@ -112,7 +112,7 @@ - + diff --git a/apps/spreadsheeteditor/main/app/view/CellSettings.js b/apps/spreadsheeteditor/main/app/view/CellSettings.js index c27d5c738..3964e3a74 100644 --- a/apps/spreadsheeteditor/main/app/view/CellSettings.js +++ b/apps/spreadsheeteditor/main/app/view/CellSettings.js @@ -186,7 +186,10 @@ define([ menuStyle: 'min-width: 100%;', editable: false, data: this._arrFillSrc, - disabled: this._locked + disabled: this._locked, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.cmbFillSrc.setValue(Asc.c_oAscFill.FILL_TYPE_NOFILL); this.fillControls.push(this.cmbFillSrc); @@ -201,7 +204,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)); @@ -243,7 +249,10 @@ define([ items: [ { template: _.template('
') } ] - }) + }), + dataHint : '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.btnDirection.on('render:after', function(btn) { me.mnuDirectionPicker = new Common.UI.DataView({ @@ -313,7 +322,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([ '
', @@ -366,18 +378,18 @@ define([ } var _arrBorderPosition = [ - [Asc.c_oAscBorderOptions.Left, 'toolbar__icon btn-border-left', 'cell-button-border-left', this.tipLeft], - [Asc.c_oAscBorderOptions.InnerV,'toolbar__icon btn-border-insidevert', 'cell-button-border-inner-vert',this.tipInnerVert], - [Asc.c_oAscBorderOptions.Right, 'toolbar__icon btn-border-right', 'cell-button-border-right', this.tipRight], - [Asc.c_oAscBorderOptions.Top, 'toolbar__icon btn-border-top', 'cell-button-border-top', this.tipTop], - [Asc.c_oAscBorderOptions.InnerH,'toolbar__icon btn-border-insidehor', 'cell-button-border-inner-hor', this.tipInnerHor], - [Asc.c_oAscBorderOptions.Bottom,'toolbar__icon btn-border-bottom', 'cell-button-border-bottom', this.tipBottom], - [Asc.c_oAscBorderOptions.DiagU, 'toolbar__icon btn-border-diagup', 'cell-button-border-diagu', this.tipDiagU], - [Asc.c_oAscBorderOptions.DiagD, 'toolbar__icon btn-border-diagdown', 'cell-button-border-diagd', this.tipDiagD], - ['inner', 'toolbar__icon btn-border-inside', 'cell-button-border-inner', this.tipInner], - ['outer', 'toolbar__icon btn-border-out', 'cell-button-border-outer', this.tipOuter], - ['all', 'toolbar__icon btn-border-all', 'cell-button-border-all', this.tipAll], - ['none', 'toolbar__icon btn-border-no', 'cell-button-border-none', this.tipNone] + [Asc.c_oAscBorderOptions.Left, 'toolbar__icon btn-border-left', 'cell-button-border-left', this.tipLeft, 'bottom'], + [Asc.c_oAscBorderOptions.InnerV,'toolbar__icon btn-border-insidevert', 'cell-button-border-inner-vert',this.tipInnerVert, 'bottom'], + [Asc.c_oAscBorderOptions.Right, 'toolbar__icon btn-border-right', 'cell-button-border-right', this.tipRight, 'bottom'], + [Asc.c_oAscBorderOptions.Top, 'toolbar__icon btn-border-top', 'cell-button-border-top', this.tipTop, 'bottom'], + [Asc.c_oAscBorderOptions.InnerH,'toolbar__icon btn-border-insidehor', 'cell-button-border-inner-hor', this.tipInnerHor, 'bottom'], + [Asc.c_oAscBorderOptions.Bottom,'toolbar__icon btn-border-bottom', 'cell-button-border-bottom', this.tipBottom, 'bottom'], + [Asc.c_oAscBorderOptions.DiagU, 'toolbar__icon btn-border-diagup', 'cell-button-border-diagu', this.tipDiagU, 'top'], + [Asc.c_oAscBorderOptions.DiagD, 'toolbar__icon btn-border-diagdown', 'cell-button-border-diagd', this.tipDiagD, 'top'], + ['inner', 'toolbar__icon btn-border-inside', 'cell-button-border-inner', this.tipInner, 'top'], + ['outer', 'toolbar__icon btn-border-out', 'cell-button-border-outer', this.tipOuter, 'top'], + ['all', 'toolbar__icon btn-border-all', 'cell-button-border-all', this.tipAll, 'top'], + ['none', 'toolbar__icon btn-border-no', 'cell-button-border-none', this.tipNone, 'top'] ]; _.each(_arrBorderPosition, function(item, index, list){ @@ -387,7 +399,10 @@ define([ iconCls: item[1], borderId:item[0], hint: item[3], - disabled: this._locked + disabled: this._locked, + dataHint: '1', + dataHintDirection: item[4], + dataHintOffset: 'small' }); _btn.on('click', _.bind(this.onBtnBordersClick, this)); this.lockedControls.push(_btn); @@ -411,7 +426,10 @@ define([ { value: Asc.c_oAscBorderStyles.MediumDashDot, offsety: 160}, { value: Asc.c_oAscBorderStyles.MediumDashDotDot, offsety: 180}, { value: Asc.c_oAscBorderStyles.Thick, offsety: 200} - ] + ], + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }).on('selected', _.bind(this.onBorderTypeSelect, this)); this.BorderType = Asc.c_oAscBorderStyles.Thin; this.cmbBorderType.setValue(this.BorderType); @@ -422,7 +440,10 @@ define([ disabled: this._locked, menu : true, color: 'auto', - auto: true + auto: true, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'medium' }); this.lockedControls.push(this.btnBorderColor); @@ -431,7 +452,10 @@ define([ disabled: this._locked, menu : true, transparent : true, - color: 'transparent' + color: 'transparent', + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'medium' }); this.lockedControls.push(this.btnBackColor); @@ -444,7 +468,10 @@ define([ allowDecimal: false, maxValue: 250, minValue: 0, - disabled: this._locked + disabled: this._locked, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.lockedControls.push(this.spnIndent); this.spnIndent.on('change', _.bind(this.onIndentChange, this)); @@ -459,7 +486,10 @@ define([ allowDecimal: false, maxValue: 90, minValue: -90, - disabled: this._locked + disabled: this._locked, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.lockedControls.push(this.spnAngle); this.spnAngle.on('change', _.bind(this.onAngleChange, this)); @@ -474,7 +504,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)); @@ -485,7 +518,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); @@ -495,7 +530,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); @@ -503,7 +540,10 @@ define([ this.chWrap = new Common.UI.CheckBox({ el: $('#cell-checkbox-wrap'), labelText: this.strWrap, - disabled: this._locked + disabled: this._locked, + dataHint: '1', + dataHintDirection: 'left', + dataHintOffset: 'small' }); this.lockedControls.push(this.chWrap); this.chWrap.on('change', this.onWrapChange.bind(this)); @@ -511,7 +551,10 @@ define([ this.chShrink = new Common.UI.CheckBox({ el: $('#cell-checkbox-shrink'), labelText: this.strShrink, - disabled: this._locked + disabled: this._locked, + dataHint: '1', + dataHintDirection: 'left', + dataHintOffset: 'small' }); this.lockedControls.push(this.chShrink); this.chShrink.on('change', this.onShrinkChange.bind(this)); @@ -523,7 +566,10 @@ define([ caption : this.textCondFormat, style : 'width: 100%;text-align: left;', menu: true, - disabled: this._locked + disabled: this._locked, + dataHint : '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.lockedControls.push(this.btnCondFormat); }, @@ -1036,7 +1082,10 @@ define([ this.btnGradColor = new Common.UI.ColorButton({ parentEl: $('#cell-gradient-color-btn'), - color: '000000' + color: '000000', + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.fillControls.push(this.btnGradColor); this.colorsGrad = this.btnGradColor.getPicker(); @@ -1044,7 +1093,10 @@ define([ this.btnFGColor = new Common.UI.ColorButton({ parentEl: $('#cell-foreground-color-btn'), - color: '000000' + color: '000000', + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'medium' }); this.fillControls.push(this.btnFGColor); this.colorsFG = this.btnFGColor.getPicker(); @@ -1052,7 +1104,10 @@ define([ this.btnBGColor = new Common.UI.ColorButton({ parentEl: $('#cell-background-color-btn'), - color: 'ffffff' + color: 'ffffff', + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'medium' }); this.fillControls.push(this.btnBGColor); this.colorsBG = this.btnBGColor.getPicker(); diff --git a/apps/spreadsheeteditor/main/app/view/DataTab.js b/apps/spreadsheeteditor/main/app/view/DataTab.js index 5fcd82eb0..f14eca070 100644 --- a/apps/spreadsheeteditor/main/app/view/DataTab.js +++ b/apps/spreadsheeteditor/main/app/view/DataTab.js @@ -130,7 +130,10 @@ define([ caption: this.capDataFromText, menu: !this.toolbar.mode.isDesktopApp, disabled: true, - lock: [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.sheetLock, _set.lostConnect, _set.coAuth] + lock: [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.sheetLock, _set.lostConnect, _set.coAuth], + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); this.lockedControls.push(this.btnDataFromText); @@ -142,7 +145,10 @@ define([ split: true, menu: true, disabled: true, - lock: [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.sheetLock, _set.lostConnect, _set.coAuth] + lock: [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.sheetLock, _set.lostConnect, _set.coAuth], + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); this.lockedControls.push(this.btnGroup); @@ -154,7 +160,10 @@ define([ split: true, menu: true, disabled: true, - lock: [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.sheetLock, _set.lostConnect, _set.coAuth] + lock: [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.sheetLock, _set.lostConnect, _set.coAuth], + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); this.lockedControls.push(this.btnUngroup); @@ -165,7 +174,10 @@ define([ caption: this.capBtnTextToCol, split: false, disabled: true, - lock: [_set.multiselect, _set.multiselectCols, _set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.lostConnect, _set.coAuth] + lock: [_set.multiselect, _set.multiselectCols, _set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.lostConnect, _set.coAuth], + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); this.lockedControls.push(this.btnTextToColumns); @@ -195,7 +207,10 @@ define([ iconCls: 'toolbar__icon btn-remove-duplicates', caption: this.capBtnTextRemDuplicates, disabled: true, - lock: [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.editPivot, _set.cantModifyFilter, _set.sheetLock] + lock: [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.editPivot, _set.cantModifyFilter, _set.sheetLock], + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); this.lockedControls.push(this.btnRemoveDuplicates); @@ -205,7 +220,10 @@ define([ iconCls: 'toolbar__icon btn-data-validation', caption: this.capBtnTextDataValidation, disabled: true, - lock: [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.editPivot, _set.cantModifyFilter, _set.sheetLock] + lock: [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.editPivot, _set.cantModifyFilter, _set.sheetLock], + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); this.lockedControls.push(this.btnDataValidation); @@ -215,7 +233,10 @@ define([ iconCls: 'toolbar__icon btn-custom-sort', caption: this.capBtnTextCustomSort, disabled: true, - lock: [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.editPivot, _set.cantModifyFilter, _set.sheetLock] + lock: [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.editPivot, _set.cantModifyFilter, _set.sheetLock], + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); this.lockedControls.push(this.btnCustomSort); diff --git a/apps/spreadsheeteditor/main/app/view/PivotTable.js b/apps/spreadsheeteditor/main/app/view/PivotTable.js index 0bed837e5..c07e64f58 100644 --- a/apps/spreadsheeteditor/main/app/view/PivotTable.js +++ b/apps/spreadsheeteditor/main/app/view/PivotTable.js @@ -161,25 +161,37 @@ define([ this.chRowHeader = new Common.UI.CheckBox({ labelText: this.textRowHeader, - lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock] + lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock], + dataHint : '1', + dataHintDirection: 'left', + dataHintOffset: 'small' }); this.lockedControls.push(this.chRowHeader); this.chColHeader = new Common.UI.CheckBox({ labelText: this.textColHeader, - lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock] + lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock], + dataHint : '1', + dataHintDirection: 'left', + dataHintOffset: 'small' }); this.lockedControls.push(this.chColHeader); this.chRowBanded = new Common.UI.CheckBox({ labelText: this.textRowBanded, - lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock] + lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock], + dataHint : '1', + dataHintDirection: 'left', + dataHintOffset: 'small' }); this.lockedControls.push(this.chRowBanded); this.chColBanded = new Common.UI.CheckBox({ labelText: this.textColBanded, - lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock] + lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock], + dataHint : '1', + dataHintDirection: 'left', + dataHintOffset: 'small' }); this.lockedControls.push(this.chColBanded); @@ -189,7 +201,10 @@ define([ caption : this.capLayout, disabled : true, lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock], - menu : true + menu : true, + dataHint : '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); this.lockedControls.push(this.btnPivotLayout); @@ -199,7 +214,10 @@ define([ caption : this.capBlankRows, disabled : true, lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock], - menu : true + menu : true, + dataHint : '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); this.lockedControls.push(this.btnPivotBlankRows); @@ -209,7 +227,10 @@ define([ caption : this.capSubtotals, disabled : true, lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock], - menu : true + menu : true, + dataHint : '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); this.lockedControls.push(this.btnPivotSubtotals); @@ -219,7 +240,10 @@ define([ caption : this.capGrandTotals, disabled : true, lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock], - menu : true + menu : true, + dataHint : '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); this.lockedControls.push(this.btnPivotGrandTotals); @@ -228,7 +252,10 @@ define([ iconCls: 'toolbar__icon btn-update', caption: this.txtRefresh, disabled : true, - lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock] + lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock], + dataHint : '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); this.lockedControls.push(this.btnRefreshPivot); @@ -236,7 +263,10 @@ define([ cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-select-pivot', caption: this.txtSelect, - lock: [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit] + lock: [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit], + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); this.lockedControls.push(this.btnSelectPivot); @@ -254,7 +284,10 @@ define([ var offset = cmp.cmpEl.width() - cmp.openButton.$el.width() - menu.cmpEl.outerWidth() - 1; menu.setOffset(Math.min(offset, 0)); } - } + }, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: '-16, 0' }); this.lockedControls.push(this.pivotStyles); @@ -326,7 +359,7 @@ define([ var _set = SSE.enumLock; this.btnsAddPivot = this.btnsAddPivot.concat(Common.Utils.injectButtons(this.$el.find('.btn-slot.slot-add-pivot'), '', 'toolbar__icon btn-pivot-sum', this.txtCreate, - [_set.lostConnect, _set.coAuth, _set.editPivot, _set.selRangeEdit, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.editCell])); + [_set.lostConnect, _set.coAuth, _set.editPivot, _set.selRangeEdit, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.editCell], undefined, undefined, undefined, '1', 'bottom', 'small')); this.chRowHeader.render(this.$el.find('#slot-chk-header-row')); this.chColHeader.render(this.$el.find('#slot-chk-header-column')); diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js index 6fb27fc46..d7ba8cdd3 100644 --- a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js @@ -1146,7 +1146,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)); @@ -1157,7 +1160,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([ '
', @@ -1190,7 +1196,10 @@ define([ {caption: this.textFromUrl, value: 1}, {caption: this.textFromStorage, value: 2} ] - }) + }), + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.fillControls.push(this.btnSelectImage); this.btnSelectImage.menu.on('item:click', _.bind(this.onImageSelect, this)); @@ -1206,7 +1215,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)); @@ -1219,7 +1231,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);}); @@ -1249,7 +1264,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)); @@ -1279,7 +1297,10 @@ define([ items: [ { template: _.template('
') } ] - }) + }), + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.btnDirection.on('render:after', function(btn) { me.mnuDirectionPicker = new Common.UI.DataView({ @@ -1354,7 +1375,10 @@ define([ allowDecimal: false, maxValue: 100, minValue: 0, - disabled: this._locked + disabled: this._locked, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.fillControls.push(this.spnGradPosition); this.spnGradPosition.on('change', _.bind(this.onPositionChange, this)); @@ -1365,7 +1389,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.fillControls.push(this.btnAddGradientStep); @@ -1375,7 +1401,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.fillControls.push(this.btnRemoveGradientStep); @@ -1389,7 +1417,10 @@ define([ allowDecimal: true, maxValue: 359.9, minValue: 0, - disabled: this._locked + disabled: this._locked, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.fillControls.push(this.numGradientAngle); this.numGradientAngle.on('change', _.bind(this.onGradientAngleChange, this)); @@ -1398,7 +1429,10 @@ define([ this.cmbBorderSize = new Common.UI.ComboBorderSizeEditable({ el: $('#shape-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)) @@ -1411,7 +1445,10 @@ define([ this.cmbBorderType = new Common.UI.ComboBorderType({ el: $('#shape-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; @@ -1426,7 +1463,10 @@ define([ menuAlign: 'tr-br', cls: 'menu-shapes', items: [] - }) + }), + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.lockedControls.push(this.btnChangeShape); @@ -1435,7 +1475,9 @@ define([ cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-rotate-270', value: 0, - hint: this.textHint270 + hint: this.textHint270, + dataHint: '1', + dataHintDirection: 'bottom' }); this.btnRotate270.on('click', _.bind(this.onBtnRotateClick, this)); this.lockedControls.push(this.btnRotate270); @@ -1445,7 +1487,9 @@ define([ cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-rotate-90', value: 1, - hint: this.textHint90 + hint: this.textHint90, + dataHint: '1', + dataHintDirection: 'bottom' }); this.btnRotate90.on('click', _.bind(this.onBtnRotateClick, this)); this.lockedControls.push(this.btnRotate90); @@ -1455,7 +1499,9 @@ define([ cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-flip-vert', value: 0, - hint: this.textHintFlipV + hint: this.textHintFlipV, + dataHint: '1', + dataHintDirection: 'bottom' }); this.btnFlipV.on('click', _.bind(this.onBtnFlipClick, this)); this.lockedControls.push(this.btnFlipV); @@ -1465,14 +1511,19 @@ define([ cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-flip-hor', value: 1, - hint: this.textHintFlipH + hint: this.textHintFlipH, + dataHint: '1', + dataHintDirection: 'bottom' }); this.btnFlipH.on('click', _.bind(this.onBtnFlipClick, this)); this.lockedControls.push(this.btnFlipH); this.chShadow = new Common.UI.CheckBox({ el: $('#shape-checkbox-shadow'), - labelText: this.strShadow + labelText: this.strShadow, + dataHint: '1', + dataHintDirection: 'left', + dataHintOffset: 'small' }); this.chShadow.on('change', _.bind(this.onCheckShadow, this)); this.lockedControls.push(this.chShadow); @@ -1542,7 +1593,7 @@ define([ el: $('#shape-combo-fill-texture'), template: _.template([ '
', - '
' + this.textSelectTexture + '
', + '
' + this.textSelectTexture + '
', '
', '