Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[PE] Fix placement settings in advanced settings (2)

Browse source
This commit is contained in:
JuliaSvinareva 2022-02-02 00:34:38 +03:00
parent 162e223f68
commit 32f018a950
8 changed files with 61 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/presentationeditor/main/app/template/ChartSettingsAdvanced.template
View file

@ -7,14 +7,14 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td width="108px" class="padding-large"> <td width="93px" class="padding-large">
<label class="input-label"><%= scope.textWidth %></label> <label class="input-label"><%= scope.textWidth %></label>
<div id="chart-advanced-spin-width"></div> <div id="chart-advanced-spin-width"></div>
</td> </td>
<td width="28px" style="vertical-align: bottom;" class="padding-large"> <td width="28px" style="vertical-align: bottom;" class="padding-large">
<div id="chart-advanced-button-ratio"></div> <div id="chart-advanced-button-ratio"></div>
</td> </td>
<td width="108px" class="padding-large"> <td width="93px" class="padding-large">
<label class="input-label"><%= scope.textHeight %></label> <label class="input-label"><%= scope.textHeight %></label>
<div id="chart-advanced-spin-height"></div> <div id="chart-advanced-spin-height"></div>
</td> </td>
@ -29,7 +29,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="padding-small" width="115px"> <td class="padding-small" width="121px">
<label class="input-label"><%= scope.textHorizontal %></label> <label class="input-label"><%= scope.textHorizontal %></label>
<div id="chart-advanced-spin-x"></div> <div id="chart-advanced-spin-x"></div>
</td> </td>

2
apps/presentationeditor/main/app/template/ImageSettingsAdvanced.template
View file

@ -32,7 +32,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="padding-small" width="115px"> <td class="padding-small" width="106px">
<label class="input-label"><%= scope.textHorizontal %></label> <label class="input-label"><%= scope.textHorizontal %></label>
<div id="image-advanced-spin-x"></div> <div id="image-advanced-spin-x"></div>
</td> </td>

6
apps/presentationeditor/main/app/template/ShapeSettingsAdvanced.template
View file

@ -7,14 +7,14 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td width="108px"> <td width="93px">
<label class="input-label"><%= scope.textWidth %></label> <label class="input-label"><%= scope.textWidth %></label>
<div id="shape-advanced-spin-width"></div> <div id="shape-advanced-spin-width"></div>
</td> </td>
<td width="28px" style="vertical-align: bottom;"> <td width="28px" style="vertical-align: bottom;">
<div id="shape-advanced-button-ratio"></div> <div id="shape-advanced-button-ratio"></div>
</td> </td>
<td width="108px"> <td width="93px">
<label class="input-label"><%= scope.textHeight %></label> <label class="input-label"><%= scope.textHeight %></label>
<div id="shape-advanced-spin-height"></div> <div id="shape-advanced-spin-height"></div>
</td> </td>
@ -30,7 +30,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="padding-small" width="115px"> <td class="padding-small" width="121px">
<label class="input-label"><%= scope.textHorizontal %></label> <label class="input-label"><%= scope.textHorizontal %></label>
<div id="shape-advanced-spin-x"></div> <div id="shape-advanced-spin-x"></div>
</td> </td>

6
apps/presentationeditor/main/app/template/TableSettingsAdvanced.template
View file

@ -7,14 +7,14 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td width="108px"> <td width="93px">
<label class="input-label"><%= scope.textWidth %></label> <label class="input-label"><%= scope.textWidth %></label>
<div id="tableadv-spin-width"></div> <div id="tableadv-spin-width"></div>
</td> </td>
<td width="28px" style="vertical-align: bottom;"> <td width="28px" style="vertical-align: bottom;">
<div id="tableadv-button-ratio"></div> <div id="tableadv-button-ratio"></div>
</td> </td>
<td width="108px"> <td width="93px">
<label class="input-label"><%= scope.textHeight %></label> <label class="input-label"><%= scope.textHeight %></label>
<div id="tableadv-spin-height"></div> <div id="tableadv-spin-height"></div>
</td> </td>
@ -30,7 +30,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="padding-small" width="115px"> <td class="padding-small" width="121px">
<label class="input-label"><%= scope.textHorizontal %></label> <label class="input-label"><%= scope.textHorizontal %></label>
<div id="tableadv-spin-x"></div> <div id="tableadv-spin-x"></div>
</td> </td>

24
apps/presentationeditor/main/app/view/ChartSettingsAdvanced.js
View file

@ -84,7 +84,7 @@ define([ 'text!presentationeditor/main/app/template/ChartSettingsAdvanced.tem
this.spnWidth = new Common.UI.MetricSpinner({ this.spnWidth = new Common.UI.MetricSpinner({
el: $('#chart-advanced-spin-width'), el: $('#chart-advanced-spin-width'),
step: .1, step: .1,
width: 100, width: 85,
defaultUnit : "cm", defaultUnit : "cm",
value: '3 cm', value: '3 cm',
maxValue: 55.88, maxValue: 55.88,
@ -111,7 +111,7 @@ define([ 'text!presentationeditor/main/app/template/ChartSettingsAdvanced.tem
this.spnHeight = new Common.UI.MetricSpinner({ this.spnHeight = new Common.UI.MetricSpinner({
el: $('#chart-advanced-spin-height'), el: $('#chart-advanced-spin-height'),
step: .1, step: .1,
width: 100, width: 85,
defaultUnit : "cm", defaultUnit : "cm",
value: '3 cm', value: '3 cm',
maxValue: 55.88, maxValue: 55.88,
@ -179,23 +179,25 @@ define([ 'text!presentationeditor/main/app/template/ChartSettingsAdvanced.tem
this.cmbFromX = new Common.UI.ComboBox({ this.cmbFromX = new Common.UI.ComboBox({
el: $('#chart-advanced-combo-from-x'), el: $('#chart-advanced-combo-from-x'),
cls: 'input-group-nr', cls: 'input-group-nr',
style: "width: 100px;", style: "width: 115px;",
menuStyle: 'min-width: 100px;', menuStyle: 'min-width: 115px;',
data: [ data: [
{ value: 'left', displayValue: this.textTopLeftCorner }, { value: 'left', displayValue: this.textTopLeftCorner },
{ value: 'center', displayValue: this.textCenter } { value: 'center', displayValue: this.textCenter }
] ],
editable: false
}); });
this.cmbFromY = new Common.UI.ComboBox({ this.cmbFromY = new Common.UI.ComboBox({
el: $('#chart-advanced-combo-from-y'), el: $('#chart-advanced-combo-from-y'),
cls: 'input-group-nr', cls: 'input-group-nr',
style: "width: 100px;", style: "width: 115px;",
menuStyle: 'min-width: 100px;', menuStyle: 'min-width: 115px;',
data: [ data: [
{ value: 'left', displayValue: this.textTopLeftCorner }, { value: 'left', displayValue: this.textTopLeftCorner },
{ value: 'center', displayValue: this.textCenter } { value: 'center', displayValue: this.textCenter }
] ],
editable: false
}); });
// Alt Text // Alt Text
@ -231,7 +233,8 @@ define([ 'text!presentationeditor/main/app/template/ChartSettingsAdvanced.tem
getFocusedComponents: function() { getFocusedComponents: function() {
return [ return [
this.inputAltTitle, this.textareaAltDescription // 0 tab this.spnWidth, this.spnHeight, this.spnX, this.cmbFromX, this.spnY, this.cmbFromY, // 0 tab
this.inputAltTitle, this.textareaAltDescription // 1 tab
]; ];
}, },
@ -242,6 +245,9 @@ define([ 'text!presentationeditor/main/app/template/ChartSettingsAdvanced.tem
setTimeout(function(){ setTimeout(function(){
switch (index) { switch (index) {
case 0: case 0:
me.spnWidth.focus();
break;
case 1:
me.inputAltTitle.focus(); me.inputAltTitle.focus();
break; break;
} }

14
apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js
View file

@ -182,23 +182,25 @@ define([ 'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem
this.cmbFromX = new Common.UI.ComboBox({ this.cmbFromX = new Common.UI.ComboBox({
el: $('#image-advanced-combo-from-x'), el: $('#image-advanced-combo-from-x'),
cls: 'input-group-nr', cls: 'input-group-nr',
style: "width: 100px;", style: "width: 115px;",
menuStyle: 'min-width: 100px;', menuStyle: 'min-width: 115px;',
data: [ data: [
{ value: 'left', displayValue: this.textTopLeftCorner }, { value: 'left', displayValue: this.textTopLeftCorner },
{ value: 'center', displayValue: this.textCenter } { value: 'center', displayValue: this.textCenter }
] ],
editable: false
}); });
this.cmbFromY = new Common.UI.ComboBox({ this.cmbFromY = new Common.UI.ComboBox({
el: $('#image-advanced-combo-from-y'), el: $('#image-advanced-combo-from-y'),
cls: 'input-group-nr', cls: 'input-group-nr',
style: "width: 100px;", style: "width: 115px;",
menuStyle: 'min-width: 100px;', menuStyle: 'min-width: 115px;',
data: [ data: [
{ value: 'left', displayValue: this.textTopLeftCorner }, { value: 'left', displayValue: this.textTopLeftCorner },
{ value: 'center', displayValue: this.textCenter } { value: 'center', displayValue: this.textCenter }
] ],
editable: false
}); });
// Rotation // Rotation

20
apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js
View file

@ -92,7 +92,7 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
this.spnWidth = new Common.UI.MetricSpinner({ this.spnWidth = new Common.UI.MetricSpinner({
el: $('#shape-advanced-spin-width'), el: $('#shape-advanced-spin-width'),
step: .1, step: .1,
width: 100, width: 85,
defaultUnit : "cm", defaultUnit : "cm",
value: '3 cm', value: '3 cm',
maxValue: 55.88, maxValue: 55.88,
@ -119,7 +119,7 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
this.spnHeight = new Common.UI.MetricSpinner({ this.spnHeight = new Common.UI.MetricSpinner({
el: $('#shape-advanced-spin-height'), el: $('#shape-advanced-spin-height'),
step: .1, step: .1,
width: 100, width: 85,
defaultUnit : "cm", defaultUnit : "cm",
value: '3 cm', value: '3 cm',
maxValue: 55.88, maxValue: 55.88,
@ -187,23 +187,25 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
this.cmbFromX = new Common.UI.ComboBox({ this.cmbFromX = new Common.UI.ComboBox({
el: $('#shape-advanced-combo-from-x'), el: $('#shape-advanced-combo-from-x'),
cls: 'input-group-nr', cls: 'input-group-nr',
style: "width: 100px;", style: "width: 115px;",
menuStyle: 'min-width: 100px;', menuStyle: 'min-width: 115px;',
data: [ data: [
{ value: 'left', displayValue: this.textTopLeftCorner }, { value: 'left', displayValue: this.textTopLeftCorner },
{ value: 'center', displayValue: this.textCenter } { value: 'center', displayValue: this.textCenter }
] ],
editable: false
}); });
this.cmbFromY = new Common.UI.ComboBox({ this.cmbFromY = new Common.UI.ComboBox({
el: $('#shape-advanced-combo-from-y'), el: $('#shape-advanced-combo-from-y'),
cls: 'input-group-nr', cls: 'input-group-nr',
style: "width: 100px;", style: "width: 115px;",
menuStyle: 'min-width: 100px;', menuStyle: 'min-width: 115px;',
data: [ data: [
{ value: 'left', displayValue: this.textTopLeftCorner }, { value: 'left', displayValue: this.textTopLeftCorner },
{ value: 'center', displayValue: this.textCenter } { value: 'center', displayValue: this.textCenter }
] ],
editable: false
}); });
// Margins // Margins
@ -568,7 +570,7 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
getFocusedComponents: function() { getFocusedComponents: function() {
return [ return [
this.spnWidth, this.spnHeight, // 0 tab this.spnWidth, this.spnHeight, this.spnX, this.cmbFromX, this.spnY, this.cmbFromY, // 0 tab
this.spnAngle, this.chFlipHor, this.chFlipVert, // 1 tab this.spnAngle, this.chFlipHor, this.chFlipVert, // 1 tab
this.cmbCapType, this.cmbJoinType, // 2 tab this.cmbCapType, this.cmbJoinType, // 2 tab
this.radioNofit, this.radioShrink, this.radioFit, this.spnMarginTop, this.spnMarginLeft, this.spnMarginBottom, this.spnMarginRight, // 3 tab this.radioNofit, this.radioShrink, this.radioFit, this.spnMarginTop, this.spnMarginLeft, this.spnMarginBottom, this.spnMarginRight, // 3 tab

28
apps/presentationeditor/main/app/view/TableSettingsAdvanced.js
View file

@ -100,7 +100,7 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem
this.spnWidth = new Common.UI.MetricSpinner({ this.spnWidth = new Common.UI.MetricSpinner({
el: $('#tableadv-spin-width'), el: $('#tableadv-spin-width'),
step: .1, step: .1,
width: 100, width: 85,
defaultUnit : "cm", defaultUnit : "cm",
value: '3 cm', value: '3 cm',
maxValue: 55.88, maxValue: 55.88,
@ -123,7 +123,7 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem
this.spnHeight = new Common.UI.MetricSpinner({ this.spnHeight = new Common.UI.MetricSpinner({
el: $('#tableadv-spin-height'), el: $('#tableadv-spin-height'),
step: .1, step: .1,
width: 100, width: 85,
defaultUnit : "cm", defaultUnit : "cm",
value: '3 cm', value: '3 cm',
maxValue: 55.88, maxValue: 55.88,
@ -184,23 +184,25 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem
this.cmbFromX = new Common.UI.ComboBox({ this.cmbFromX = new Common.UI.ComboBox({
el: $('#tableadv-combo-from-x'), el: $('#tableadv-combo-from-x'),
cls: 'input-group-nr', cls: 'input-group-nr',
style: "width: 100px;", style: "width: 115px;",
menuStyle: 'min-width: 100px;', menuStyle: 'min-width: 115px;',
data: [ data: [
{ value: 'left', displayValue: this.textTopLeftCorner }, { value: 'left', displayValue: this.textTopLeftCorner },
{ value: 'center', displayValue: this.textCenter } { value: 'center', displayValue: this.textCenter }
] ],
editable: false
}); });
this.cmbFromY = new Common.UI.ComboBox({ this.cmbFromY = new Common.UI.ComboBox({
el: $('#tableadv-combo-from-y'), el: $('#tableadv-combo-from-y'),
cls: 'input-group-nr', cls: 'input-group-nr',
style: "width: 100px;", style: "width: 115px;",
menuStyle: 'min-width: 100px;', menuStyle: 'min-width: 115px;',
data: [ data: [
{ value: 'left', displayValue: this.textTopLeftCorner }, { value: 'left', displayValue: this.textTopLeftCorner },
{ value: 'center', displayValue: this.textCenter } { value: 'center', displayValue: this.textCenter }
] ],
editable: false
}); });
this._marginsChange = function(field, newValue, oldValue, eOpts, source, property){ this._marginsChange = function(field, newValue, oldValue, eOpts, source, property){
@ -427,9 +429,10 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem
getFocusedComponents: function() { getFocusedComponents: function() {
return [ return [
this.spnWidth, this.spnHeight, this.spnX, this.cmbFromX, this.spnY, this.cmbFromY, // 0 tab
this.chCellMargins, this.spnMarginTop, this.spnMarginLeft, this.spnMarginBottom, this.spnMarginRight, this.chCellMargins, this.spnMarginTop, this.spnMarginLeft, this.spnMarginBottom, this.spnMarginRight,
this.spnTableMarginTop, this.spnTableMarginLeft, this.spnTableMarginBottom, this.spnTableMarginRight, // 0 tab this.spnTableMarginTop, this.spnTableMarginLeft, this.spnTableMarginBottom, this.spnTableMarginRight, // 1 tab
this.inputAltTitle, this.textareaAltDescription // 1 tab this.inputAltTitle, this.textareaAltDescription // 2 tab
]; ];
}, },
@ -440,12 +443,15 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem
setTimeout(function(){ setTimeout(function(){
switch (index) { switch (index) {
case 0: case 0:
me.spnWidth.focus();
break;
case 1:
if (!me.spnMarginTop.isDisabled()) if (!me.spnMarginTop.isDisabled())
me.spnMarginTop.focus(); me.spnMarginTop.focus();
else else
me.spnTableMarginTop.focus(); me.spnTableMarginTop.focus();
break; break;
case 1: case 2:
me.inputAltTitle.focus(); me.inputAltTitle.focus();
break; break;
} }