-
+
diff --git a/apps/presentationeditor/main/app/view/ChartSettings.js b/apps/presentationeditor/main/app/view/ChartSettings.js
index 798578eac..bdca4d29f 100644
--- a/apps/presentationeditor/main/app/view/ChartSettings.js
+++ b/apps/presentationeditor/main/app/view/ChartSettings.js
@@ -214,7 +214,10 @@ define([
items: [
{ template: _.template('') }
]
- })
+ }),
+ dataHint: '1',
+ dataHintDirection: 'bottom',
+ dataHintOffset: 'big'
});
this.btnChartType.on('render:after', function(btn) {
me.mnuChartTypePicker = new Common.UI.DataView({
@@ -243,7 +246,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);
@@ -255,7 +261,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);
@@ -373,7 +382,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/presentationeditor/main/app/view/ImageSettings.js b/apps/presentationeditor/main/app/view/ImageSettings.js
index 343e8e852..f943ffb26 100644
--- a/apps/presentationeditor/main/app/view/ImageSettings.js
+++ b/apps/presentationeditor/main/app/view/ImageSettings.js
@@ -132,7 +132,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));
@@ -187,7 +190,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));
@@ -198,7 +204,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);
@@ -208,7 +217,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);
@@ -218,7 +230,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);
@@ -228,7 +243,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/presentationeditor/main/app/view/ParagraphSettings.js b/apps/presentationeditor/main/app/view/ParagraphSettings.js
index b425e11ee..aa9ff70b9 100644
--- a/apps/presentationeditor/main/app/view/ParagraphSettings.js
+++ b/apps/presentationeditor/main/app/view/ParagraphSettings.js
@@ -270,7 +270,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);
@@ -282,7 +285,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);
@@ -295,7 +301,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);
@@ -309,7 +318,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/presentationeditor/main/app/view/ShapeSettings.js b/apps/presentationeditor/main/app/view/ShapeSettings.js
index 9a7270677..0aba1a542 100644
--- a/apps/presentationeditor/main/app/view/ShapeSettings.js
+++ b/apps/presentationeditor/main/app/view/ShapeSettings.js
@@ -1120,7 +1120,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));
@@ -1131,7 +1134,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([
'
',
@@ -1164,7 +1170,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));
@@ -1180,7 +1189,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));
@@ -1193,7 +1205,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);});
@@ -1223,7 +1238,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));
@@ -1253,7 +1271,10 @@ define([
items: [
{ template: _.template('') }
]
- })
+ }),
+ dataHint: '1',
+ dataHintDirection: 'bottom',
+ dataHintOffset: 'big'
});
this.btnDirection.on('render:after', function(btn) {
me.mnuDirectionPicker = new Common.UI.DataView({
@@ -1328,7 +1349,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));
@@ -1339,7 +1363,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);
@@ -1349,7 +1375,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);
@@ -1363,7 +1391,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));
@@ -1372,7 +1403,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))
@@ -1385,7 +1419,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;
@@ -1400,7 +1437,10 @@ define([
menuAlign: 'tr-br',
cls: 'menu-shapes',
items: []
- })
+ }),
+ dataHint: '1',
+ dataHintDirection: 'bottom',
+ dataHintOffset: 'big'
});
this.lockedControls.push(this.btnChangeShape);
@@ -1409,7 +1449,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);
@@ -1419,7 +1461,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);
@@ -1429,7 +1473,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);
@@ -1439,14 +1485,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);
@@ -1516,7 +1567,7 @@ define([
el: $('#shape-combo-fill-texture'),
template: _.template([
'