diff --git a/apps/common/main/lib/component/ComboBorderSize.js b/apps/common/main/lib/component/ComboBorderSize.js index 74b504e77..9618cd68a 100644 --- a/apps/common/main/lib/component/ComboBorderSize.js +++ b/apps/common/main/lib/component/ComboBorderSize.js @@ -178,7 +178,7 @@ define([ Common.UI.ComboBorderSizeEditable = Common.UI.ComboBox.extend(_.extend({ template: _.template([ '', - '', + '', '', @@ -230,7 +230,7 @@ define([ Common.UI.ComboBorderType = Common.UI.ComboBorderSize.extend(_.extend({ template: _.template([ '
', - '
', + '
', '', '
', '
', diff --git a/apps/common/main/lib/component/HintManager.js b/apps/common/main/lib/component/HintManager.js index 96e0d62f1..d7efde955 100644 --- a/apps/common/main/lib/component/HintManager.js +++ b/apps/common/main/lib/component/HintManager.js @@ -248,7 +248,8 @@ Common.UI.HintManager = new(function() { } } if (curr) { - if (curr.prop("tagName").toLowerCase() === 'input') { + var tag = curr.prop("tagName").toLowerCase(); + if (tag === 'input' || tag === 'textarea') { curr.trigger(jQuery.Event('click', {which: 1})); curr.focus(); _hideHints(); diff --git a/apps/common/main/lib/template/Chat.template b/apps/common/main/lib/template/Chat.template index 47dec5b5b..5836bc8ab 100644 --- a/apps/common/main/lib/template/Chat.template +++ b/apps/common/main/lib/template/Chat.template @@ -7,8 +7,8 @@
- - + +
\ No newline at end of file diff --git a/apps/common/main/lib/template/CommentsPanel.template b/apps/common/main/lib/template/CommentsPanel.template index bcbe18673..52d4e7537 100644 --- a/apps/common/main/lib/template/CommentsPanel.template +++ b/apps/common/main/lib/template/CommentsPanel.template @@ -1,13 +1,13 @@
- +
diff --git a/apps/documenteditor/main/app/template/ChartSettings.template b/apps/documenteditor/main/app/template/ChartSettings.template index 880e21134..751395f99 100644 --- a/apps/documenteditor/main/app/template/ChartSettings.template +++ b/apps/documenteditor/main/app/template/ChartSettings.template @@ -54,7 +54,7 @@ - + @@ -64,7 +64,7 @@ - + diff --git a/apps/documenteditor/main/app/template/MailMerge.template b/apps/documenteditor/main/app/template/MailMerge.template index 423387587..1d7d07e5f 100644 --- a/apps/documenteditor/main/app/template/MailMerge.template +++ b/apps/documenteditor/main/app/template/MailMerge.template @@ -1,7 +1,7 @@ @@ -57,7 +57,7 @@ @@ -74,11 +74,11 @@
- +
- +
diff --git a/apps/documenteditor/main/app/template/ShapeSettings.template b/apps/documenteditor/main/app/template/ShapeSettings.template index 1c2ba2c8e..69c8f9757 100644 --- a/apps/documenteditor/main/app/template/ShapeSettings.template +++ b/apps/documenteditor/main/app/template/ShapeSettings.template @@ -220,7 +220,7 @@ diff --git a/apps/documenteditor/main/app/view/ChartSettings.js b/apps/documenteditor/main/app/view/ChartSettings.js index 1226f6cd7..04d71b17a 100644 --- a/apps/documenteditor/main/app/view/ChartSettings.js +++ b/apps/documenteditor/main/app/view/ChartSettings.js @@ -232,7 +232,10 @@ define([ menuMaxHeight: 300, enableKeyEvents: true, store: new Common.UI.DataViewStore(viewData), - cls: 'combo-chart-style' + cls: 'combo-chart-style', + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.cmbWrapType.menuPicker.itemTemplate = this.cmbWrapType.fieldPicker.itemTemplate = _.template([ '
', @@ -259,7 +262,10 @@ define([ items: [ { template: _.template('') } ] - }) + }), + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.btnChartType.on('render:after', function(btn) { me.mnuChartTypePicker = new Common.UI.DataView({ @@ -435,7 +441,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/documenteditor/main/app/view/MailMergeSettings.js b/apps/documenteditor/main/app/view/MailMergeSettings.js index 34ece804c..4ac974d9e 100644 --- a/apps/documenteditor/main/app/view/MailMergeSettings.js +++ b/apps/documenteditor/main/app/view/MailMergeSettings.js @@ -127,7 +127,10 @@ define([ style: 'min-width: 190px;max-width: 400px;', maxHeight: 200, items: [] - }) + }), + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.txtFieldNum = new Common.UI.InputField({ @@ -149,7 +152,10 @@ define([ return true; }, - lock: [_set.noRecipients, _set.lostConnect] + lock: [_set.noRecipients, _set.lostConnect], + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }).on('changed:after', function(input, newValue, oldValue, e) { var val = parseInt(me.txtFieldNum.getValue()); if (val !== parseInt(oldValue)) { @@ -170,14 +176,20 @@ define([ this.chHighlight = new Common.UI.CheckBox({ el: me.$el.find('#mmerge-switcher-highlight'), labelText: this.textHighlight, - lock: [_set.noFields, _set.lostConnect] + lock: [_set.noFields, _set.lostConnect], + dataHint: '1', + dataHintDirection: 'left', + dataHintOffset: 'small' }); this.chHighlight.on('change', _.bind(this.onCheckHighlightChange, this)); this.chPreview = new Common.UI.CheckBox({ el: me.$el.find('#mmerge-switcher-preview'), labelText: this.textPreview, - lock: [_set.noRecipients, _set.lostConnect] + lock: [_set.noRecipients, _set.lostConnect], + dataHint: '1', + dataHintDirection: 'left', + dataHintOffset: 'small' }); this.chPreview.on('change', _.bind(this.onCheckPreviewChange, this)); this.emptyDBControls.push(this.chPreview); @@ -189,7 +201,9 @@ define([ disabled: true, value: 0, hint: this.txtFirst, - lock: [_set.noRecipients, _set.lostConnect] + lock: [_set.noRecipients, _set.lostConnect], + dataHint: '1', + dataHintDirection: 'bottom' }); this.btnFirst.on('click', _.bind(this.onBtnPreviewFieldClick, this)); this.emptyDBControls.push(this.btnFirst); @@ -201,7 +215,9 @@ define([ disabled: true, value: 1, hint: this.txtPrev, - lock: [_set.noRecipients, _set.lostConnect] + lock: [_set.noRecipients, _set.lostConnect], + dataHint: '1', + dataHintDirection: 'bottom' }); this.btnPrev.on('click', _.bind(this.onBtnPreviewFieldClick, this)); this.emptyDBControls.push(this.btnPrev); @@ -212,7 +228,9 @@ define([ iconCls: 'toolbar__icon btn-nextitem', value: 2, hint: this.txtNext, - lock: [_set.noRecipients, _set.lostConnect] + lock: [_set.noRecipients, _set.lostConnect], + dataHint: '1', + dataHintDirection: 'bottom' }); this.btnNext.on('click', _.bind(this.onBtnPreviewFieldClick, this)); this.emptyDBControls.push(this.btnNext); @@ -223,7 +241,9 @@ define([ iconCls: 'toolbar__icon btn-lastitem', value: 3, hint: this.txtLast, - lock: [_set.noRecipients, _set.lostConnect] + lock: [_set.noRecipients, _set.lostConnect], + dataHint: '1', + dataHintDirection: 'bottom' }); this.btnLast.on('click', _.bind(this.onBtnPreviewFieldClick, this)); this.emptyDBControls.push(this.btnLast); @@ -240,7 +260,10 @@ define([ menuStyle: 'min-width: 190px;', editable: false, data: this._arrMergeSrc, - lock: [_set.noRecipients, _set.lostConnect] + lock: [_set.noRecipients, _set.lostConnect], + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.cmbMergeTo.setValue(this._arrMergeSrc[0].value); this.cmbMergeTo.on('selected', _.bind(this.onCmbMergeToSelect, this)); @@ -251,7 +274,10 @@ define([ labelText: this.textAll, name: 'asc-radio-merge', checked: true, - lock: [_set.noRecipients, _set.lostConnect] + lock: [_set.noRecipients, _set.lostConnect], + dataHint: '1', + dataHintDirection: 'left', + dataHintOffset: 'small' }).on('change', _.bind(this.onRadioAllCurrent, this)); this.emptyDBControls.push(this.radioAll); @@ -259,7 +285,10 @@ define([ el: $('#mmerge-radio-current', me.$el), labelText: this.textCurrent, name: 'asc-radio-merge', - lock: [_set.noRecipients, _set.lostConnect] + lock: [_set.noRecipients, _set.lostConnect], + dataHint: '1', + dataHintDirection: 'left', + dataHintOffset: 'small' }).on('change', _.bind(this.onRadioAllCurrent, this)); this.emptyDBControls.push(this.radioCurrent); @@ -267,7 +296,10 @@ define([ el: $('#mmerge-radio-from-to', me.$el), labelText: this.textFrom, name: 'asc-radio-merge', - lock: [_set.noRecipients, _set.lostConnect] + lock: [_set.noRecipients, _set.lostConnect], + dataHint: '1', + dataHintDirection: 'left', + dataHintOffset: 'small' }).on('change', _.bind(this.onRadioFromToChange, this)); this.emptyDBControls.push(this.radioFromTo); @@ -303,7 +335,10 @@ define([ } } return true; - } + }, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.emptyDBControls.push(this.txtFieldFrom); @@ -338,7 +373,10 @@ define([ } } return true; - } + }, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.txtFieldTo.on('changed:after', function() { me._isToChanged = true; diff --git a/apps/documenteditor/main/app/view/ShapeSettings.js b/apps/documenteditor/main/app/view/ShapeSettings.js index bce04d508..ebb53f584 100644 --- a/apps/documenteditor/main/app/view/ShapeSettings.js +++ b/apps/documenteditor/main/app/view/ShapeSettings.js @@ -1206,7 +1206,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)); @@ -1217,7 +1220,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([ '
', @@ -1250,7 +1256,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)); @@ -1266,7 +1275,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)); @@ -1279,7 +1291,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(){ me.fireEvent('editcomplete', me);}); @@ -1309,7 +1324,10 @@ define([ cls: 'input-group-nr', menuStyle: 'min-width: 100%;', 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)); @@ -1339,7 +1357,10 @@ define([ items: [ { template: _.template('
') } ] - }) + }), + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.btnDirection.on('render:after', function(btn) { me.mnuDirectionPicker = new Common.UI.DataView({ @@ -1415,7 +1436,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)); @@ -1426,7 +1450,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); @@ -1436,7 +1462,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); @@ -1450,7 +1478,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)); @@ -1459,7 +1490,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)) @@ -1472,7 +1506,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; @@ -1484,7 +1521,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); @@ -1494,7 +1533,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); @@ -1504,7 +1545,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); @@ -1514,7 +1557,9 @@ 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); @@ -1536,7 +1581,10 @@ define([ menuMaxHeight: 300, enableKeyEvents: true, store: new Common.UI.DataViewStore(viewData), - cls: 'combo-chart-style' + cls: 'combo-chart-style', + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.cmbWrapType.menuPicker.itemTemplate = this.cmbWrapType.fieldPicker.itemTemplate = _.template([ '
', @@ -1563,13 +1611,19 @@ define([ menuAlign: 'tr-br', cls: 'menu-shapes', items: [] - }) + }), + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.lockedControls.push(this.btnChangeShape); 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); @@ -1639,7 +1693,7 @@ define([ el: $('#shape-combo-fill-texture'), template: _.template([ '
', - '
' + this.textSelectTexture + '
', + '
' + this.textSelectTexture + '
', '
', '
- - + + - +
- +