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

Bug 43396: change values in spinners in the right panel by keydown

Browse source
This commit is contained in:
Julia Radzhabova 2019-12-06 11:35:17 +03:00
parent bb4a5840a8
commit d2cd1b7157
18 changed files with 40 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/common/main/lib/component/MetricSpinner.js
View file

@ -347,6 +347,7 @@ define([
var value = this.getRawValue(); var value = this.getRawValue();
if (this.value != value) { if (this.value != value) {
this.onEnterValue(); this.onEnterValue();
this.trigger('inputleave', this);
return (this.value == value); return (this.value == value);
} }
} else { } else {
@ -355,6 +356,8 @@ define([
} else { } else {
this._fromKeyDown = true; this._fromKeyDown = true;
} }
if (e.keyCode==Common.UI.Keys.RETURN || e.keyCode==Common.UI.Keys.ESC)
this.trigger('inputleave', this);
}, },
onKeyUp: function (e) { onKeyUp: function (e) {

5
apps/documenteditor/main/app/view/HeaderFooterSettings.js
View file

@ -158,7 +158,6 @@ define([
onNumPositionChange: function(field, newValue, oldValue, eOpts){ onNumPositionChange: function(field, newValue, oldValue, eOpts){
if (this.api) if (this.api)
this.api.put_HeadersAndFootersDistance(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); this.api.put_HeadersAndFootersDistance(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()));
this.fireEvent('editcomplete', this);
}, },
onDiffFirstChange: function(field, newValue, oldValue, eOpts){ onDiffFirstChange: function(field, newValue, oldValue, eOpts){
@ -206,7 +205,6 @@ define([
this.radioFrom.setValue(true, true); this.radioFrom.setValue(true, true);
this.api.asc_SetSectionStartPage(field.getNumberValue()); this.api.asc_SetSectionStartPage(field.getNumberValue());
} }
this.fireEvent('editcomplete', this);
}, },
updateMetricUnit: function() { updateMetricUnit: function() {
@ -220,6 +218,7 @@ define([
}, },
createDelayedControls: function() { createDelayedControls: function() {
var me = this;
var _arrPosition = [ var _arrPosition = [
[c_pageNumPosition.PAGE_NUM_POSITION_TOP, c_pageNumPosition.PAGE_NUM_POSITION_LEFT, 'icon-right-panel btn-colontitul-tl', 'headerfooter-button-top-left', this.textTopLeft], [c_pageNumPosition.PAGE_NUM_POSITION_TOP, c_pageNumPosition.PAGE_NUM_POSITION_LEFT, 'icon-right-panel btn-colontitul-tl', 'headerfooter-button-top-left', this.textTopLeft],
[c_pageNumPosition.PAGE_NUM_POSITION_TOP, c_pageNumPosition.PAGE_NUM_POSITION_CENTER, 'icon-right-panel btn-colontitul-tc', 'headerfooter-button-top-center', this.textTopCenter], [c_pageNumPosition.PAGE_NUM_POSITION_TOP, c_pageNumPosition.PAGE_NUM_POSITION_CENTER, 'icon-right-panel btn-colontitul-tc', 'headerfooter-button-top-center', this.textTopCenter],
@ -276,6 +275,7 @@ define([
}); });
this.numPosition.on('change', _.bind(this.onNumPositionChange, this)); this.numPosition.on('change', _.bind(this.onNumPositionChange, this));
this.numPosition.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
this.chDiffFirst.on('change', _.bind(this.onDiffFirstChange, this)); this.chDiffFirst.on('change', _.bind(this.onDiffFirstChange, this));
this.chDiffOdd.on('change', _.bind(this.onDiffOddChange, this)); this.chDiffOdd.on('change', _.bind(this.onDiffOddChange, this));
this.chSameAs.on('change', _.bind(this.onSameAsChange, this)); this.chSameAs.on('change', _.bind(this.onSameAsChange, this));
@ -313,6 +313,7 @@ define([
}); });
this.lockedControls.push(this.numFrom); this.lockedControls.push(this.numFrom);
this.numFrom.on('change', _.bind(this.onNumFromChange, this)); this.numFrom.on('change', _.bind(this.onNumFromChange, this));
this.numFrom.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
}, },
createDelayedElements: function() { createDelayedElements: function() {

9
apps/documenteditor/main/app/view/ParagraphSettings.js
View file

@ -98,6 +98,8 @@ define([
scope: this scope: this
})); }));
var me = this;
// Short Size // Short Size
this.cmbLineRule = new Common.UI.ComboBox({ this.cmbLineRule = new Common.UI.ComboBox({
el: $markup.findById('#paragraph-combo-line-rule'), el: $markup.findById('#paragraph-combo-line-rule'),
@ -170,6 +172,9 @@ define([
this.numLineHeight.on('change', this.onNumLineHeightChange.bind(this)); this.numLineHeight.on('change', this.onNumLineHeightChange.bind(this));
this.numSpacingBefore.on('change', this.onNumSpacingBeforeChange.bind(this)); this.numSpacingBefore.on('change', this.onNumSpacingBeforeChange.bind(this));
this.numSpacingAfter.on('change', this.onNumSpacingAfterChange.bind(this)); this.numSpacingAfter.on('change', this.onNumSpacingAfterChange.bind(this));
this.numLineHeight.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
this.numSpacingBefore.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
this.numSpacingAfter.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
this.chAddInterval.on('change', this.onAddIntervalChange.bind(this)); this.chAddInterval.on('change', this.onAddIntervalChange.bind(this));
this.cmbLineRule.on('selected', this.onLineRuleSelect.bind(this)); this.cmbLineRule.on('selected', this.onLineRuleSelect.bind(this));
this.cmbLineRule.on('hide:after', this.onHideMenus.bind(this)); this.cmbLineRule.on('hide:after', this.onHideMenus.bind(this));
@ -199,7 +204,6 @@ define([
var type = c_paragraphLinerule.LINERULE_AUTO; var type = c_paragraphLinerule.LINERULE_AUTO;
if (this.api) if (this.api)
this.api.put_PrLineSpacing(this.cmbLineRule.getValue(), (this.cmbLineRule.getValue()==c_paragraphLinerule.LINERULE_AUTO) ? field.getNumberValue() : Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); this.api.put_PrLineSpacing(this.cmbLineRule.getValue(), (this.cmbLineRule.getValue()==c_paragraphLinerule.LINERULE_AUTO) ? field.getNumberValue() : Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()));
this.fireEvent('editcomplete', this);
}, },
onNumSpacingBeforeChange: function(field, newValue, oldValue, eOpts){ onNumSpacingBeforeChange: function(field, newValue, oldValue, eOpts){
@ -208,8 +212,6 @@ define([
this._state.LineSpacingBefore = (num<0) ? -1 : Common.Utils.Metric.fnRecalcToMM(num); this._state.LineSpacingBefore = (num<0) ? -1 : Common.Utils.Metric.fnRecalcToMM(num);
this.api.put_LineSpacingBeforeAfter(0, this._state.LineSpacingBefore); this.api.put_LineSpacingBeforeAfter(0, this._state.LineSpacingBefore);
} }
this.fireEvent('editcomplete', this);
}, },
onNumSpacingAfterChange: function(field, newValue, oldValue, eOpts){ onNumSpacingAfterChange: function(field, newValue, oldValue, eOpts){
@ -218,7 +220,6 @@ define([
this._state.LineSpacingAfter = (num<0) ? -1 : Common.Utils.Metric.fnRecalcToMM(num); this._state.LineSpacingAfter = (num<0) ? -1 : Common.Utils.Metric.fnRecalcToMM(num);
this.api.put_LineSpacingBeforeAfter(1, this._state.LineSpacingAfter); this.api.put_LineSpacingBeforeAfter(1, this._state.LineSpacingAfter);
} }
this.fireEvent('editcomplete', this);
}, },
onAddIntervalChange: function(field, newValue, oldValue, eOpts){ onAddIntervalChange: function(field, newValue, oldValue, eOpts){

2
apps/documenteditor/main/app/view/ShapeSettings.js
View file

@ -364,7 +364,6 @@ define([
this.imgprops.put_ShapeProperties(props); this.imgprops.put_ShapeProperties(props);
this.api.ImgApply(this.imgprops); this.api.ImgApply(this.imgprops);
} }
this.fireEvent('editcomplete', this);
}, },
onTransparencyChange: function(field, newValue, oldValue){ onTransparencyChange: function(field, newValue, oldValue){
@ -1258,6 +1257,7 @@ define([
minValue: 0 minValue: 0
}); });
this.numTransparency.on('change', _.bind(this.onNumTransparencyChange, this)); this.numTransparency.on('change', _.bind(this.onNumTransparencyChange, this));
this.numTransparency.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
this.fillControls.push(this.numTransparency); this.fillControls.push(this.numTransparency);
this.sldrTransparency = new Common.UI.SingleSlider({ this.sldrTransparency = new Common.UI.SingleSlider({

4
apps/documenteditor/main/app/view/TableSettings.js
View file

@ -246,6 +246,8 @@ define([
}, },
createDelayedControls: function() { createDelayedControls: function() {
var me = this;
this.chHeader = new Common.UI.CheckBox({ this.chHeader = new Common.UI.CheckBox({
el: $('#table-checkbox-header'), el: $('#table-checkbox-header'),
labelText: this.textHeader labelText: this.textHeader
@ -384,6 +386,7 @@ define([
_props.put_RowHeight(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); _props.put_RowHeight(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()));
this.api.tblApply(_props); this.api.tblApply(_props);
}, this)); }, this));
this.numHeight.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
this.lockedControls.push(this.numHeight); this.lockedControls.push(this.numHeight);
this.spinners.push(this.numHeight); this.spinners.push(this.numHeight);
@ -401,6 +404,7 @@ define([
_props.put_ColumnWidth(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); _props.put_ColumnWidth(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()));
this.api.tblApply(_props); this.api.tblApply(_props);
}, this)); }, this));
this.numWidth.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
this.lockedControls.push(this.numWidth); this.lockedControls.push(this.numWidth);
this.spinners.push(this.numWidth); this.spinners.push(this.numWidth);

2
apps/documenteditor/main/app/view/TextArtSettings.js
View file

@ -232,7 +232,6 @@ define([
this.shapeprops.put_TextArtProperties(props); this.shapeprops.put_TextArtProperties(props);
this.api.ImgApply(this.imgprops); this.api.ImgApply(this.imgprops);
} }
this.fireEvent('editcomplete', this);
}, },
onTransparencyChange: function(field, newValue, oldValue){ onTransparencyChange: function(field, newValue, oldValue){
@ -847,6 +846,7 @@ define([
minValue: 0 minValue: 0
}); });
this.numTransparency.on('change', _.bind(this.onNumTransparencyChange, this)); this.numTransparency.on('change', _.bind(this.onNumTransparencyChange, this));
this.numTransparency.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
this.lockedControls.push(this.numTransparency); this.lockedControls.push(this.numTransparency);
this.sldrTransparency = new Common.UI.SingleSlider({ this.sldrTransparency = new Common.UI.SingleSlider({

6
apps/presentationeditor/main/app/view/ChartSettings.js
View file

@ -254,6 +254,8 @@ define([
this.spnWidth.on('change', _.bind(this.onWidthChange, this)); this.spnWidth.on('change', _.bind(this.onWidthChange, this));
this.spnHeight.on('change', _.bind(this.onHeightChange, this)); this.spnHeight.on('change', _.bind(this.onHeightChange, this));
this.spnWidth.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
this.spnHeight.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
this.btnRatio = new Common.UI.Button({ this.btnRatio = new Common.UI.Button({
cls: 'btn-toolbar', cls: 'btn-toolbar',
@ -416,8 +418,6 @@ define([
props.put_Height(Common.Utils.Metric.fnRecalcToMM(h)); props.put_Height(Common.Utils.Metric.fnRecalcToMM(h));
this.api.ChartApply(props); this.api.ChartApply(props);
} }
this.fireEvent('editcomplete', this);
}, },
onHeightChange: function(field, newValue, oldValue, eOpts){ onHeightChange: function(field, newValue, oldValue, eOpts){
@ -437,8 +437,6 @@ define([
props.put_Height(Common.Utils.Metric.fnRecalcToMM(h)); props.put_Height(Common.Utils.Metric.fnRecalcToMM(h));
this.api.ChartApply(props); this.api.ChartApply(props);
} }
this.fireEvent('editcomplete', this);
}, },
openAdvancedSettings: function(e) { openAdvancedSettings: function(e) {

7
apps/presentationeditor/main/app/view/ParagraphSettings.js
View file

@ -101,7 +101,6 @@ define([
return; return;
if (this.api) if (this.api)
this.api.put_PrLineSpacing(this.cmbLineRule.getValue(), (this.cmbLineRule.getValue()==c_paragraphLinerule.LINERULE_AUTO) ? field.getNumberValue() : Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); this.api.put_PrLineSpacing(this.cmbLineRule.getValue(), (this.cmbLineRule.getValue()==c_paragraphLinerule.LINERULE_AUTO) ? field.getNumberValue() : Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()));
this.fireEvent('editcomplete', this);
}, },
onNumSpacingBeforeChange: function(field, newValue, oldValue, eOpts){ onNumSpacingBeforeChange: function(field, newValue, oldValue, eOpts){
@ -112,8 +111,6 @@ define([
else else
this.api.put_LineSpacingBeforeAfter(0, Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); this.api.put_LineSpacingBeforeAfter(0, Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()));
} }
this.fireEvent('editcomplete', this);
}, },
onNumSpacingAfterChange: function(field, newValue, oldValue, eOpts){ onNumSpacingAfterChange: function(field, newValue, oldValue, eOpts){
@ -124,7 +121,6 @@ define([
else else
this.api.put_LineSpacingBeforeAfter(1, Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); this.api.put_LineSpacingBeforeAfter(1, Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()));
} }
this.fireEvent('editcomplete', this);
}, },
onLineRuleSelect: function(combo, record) { onLineRuleSelect: function(combo, record) {
@ -310,6 +306,9 @@ define([
this.numLineHeight.on('change', _.bind(this.onNumLineHeightChange, this)); this.numLineHeight.on('change', _.bind(this.onNumLineHeightChange, this));
this.numSpacingBefore.on('change', _.bind(this.onNumSpacingBeforeChange, this)); this.numSpacingBefore.on('change', _.bind(this.onNumSpacingBeforeChange, this));
this.numSpacingAfter.on('change', _.bind(this.onNumSpacingAfterChange, this)); this.numSpacingAfter.on('change', _.bind(this.onNumSpacingAfterChange, this));
this.numLineHeight.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
this.numSpacingBefore.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
this.numSpacingAfter.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
this.cmbLineRule.on('selected', _.bind(this.onLineRuleSelect, this)); this.cmbLineRule.on('selected', _.bind(this.onLineRuleSelect, this));
this.cmbLineRule.on('hide:after', _.bind(this.onHideMenus, this)); this.cmbLineRule.on('hide:after', _.bind(this.onHideMenus, this));
$(this.el).on('click', '#paragraph-advanced-link', _.bind(this.openAdvancedSettings, this)); $(this.el).on('click', '#paragraph-advanced-link', _.bind(this.openAdvancedSettings, this));

2
apps/presentationeditor/main/app/view/ShapeSettings.js
View file

@ -349,7 +349,6 @@ define([
props.put_fill(fill); props.put_fill(fill);
this.api.ShapeApply(props); this.api.ShapeApply(props);
} }
this.fireEvent('editcomplete', this);
}, },
onTransparencyChange: function(field, newValue, oldValue){ onTransparencyChange: function(field, newValue, oldValue){
@ -1171,6 +1170,7 @@ define([
minValue: 0 minValue: 0
}); });
this.numTransparency.on('change', _.bind(this.onNumTransparencyChange, this)); this.numTransparency.on('change', _.bind(this.onNumTransparencyChange, this));
this.numTransparency.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
this.fillControls.push(this.numTransparency); this.fillControls.push(this.numTransparency);
this.sldrTransparency = new Common.UI.SingleSlider({ this.sldrTransparency = new Common.UI.SingleSlider({

5
apps/presentationeditor/main/app/view/SlideSettings.js
View file

@ -112,6 +112,7 @@ define([
this.render(); this.render();
var me = this;
this._arrFillSrc = [ this._arrFillSrc = [
{displayValue: this.textColor, value: Asc.c_oAscFill.FILL_TYPE_SOLID}, {displayValue: this.textColor, value: Asc.c_oAscFill.FILL_TYPE_SOLID},
{displayValue: this.textGradientFill, value: Asc.c_oAscFill.FILL_TYPE_GRAD}, {displayValue: this.textGradientFill, value: Asc.c_oAscFill.FILL_TYPE_GRAD},
@ -221,6 +222,7 @@ define([
disabled: true disabled: true
}); });
this.numDuration.on('change', _.bind(this.onDurationChange, this)); this.numDuration.on('change', _.bind(this.onDurationChange, this));
this.numDuration.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
this.numDelay = new Common.UI.MetricSpinner({ this.numDelay = new Common.UI.MetricSpinner({
el: $('#slide-spin-delay'), el: $('#slide-spin-delay'),
@ -233,6 +235,7 @@ define([
disabled: true disabled: true
}); });
this.numDelay.on('change', _.bind(this.onDelayChange, this)); this.numDelay.on('change', _.bind(this.onDelayChange, this));
this.numDelay.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
this.chStartOnClick = new Common.UI.CheckBox({ this.chStartOnClick = new Common.UI.CheckBox({
el: $('#slide-checkbox-start-click'), el: $('#slide-checkbox-start-click'),
@ -1022,7 +1025,6 @@ define([
props.put_timing(timing); props.put_timing(timing);
this.api.SetSlideProps(props); this.api.SetSlideProps(props);
} }
this.fireEvent('editcomplete', this);
}, },
onDelayChange: function(field, newValue, oldValue, eOpts){ onDelayChange: function(field, newValue, oldValue, eOpts){
@ -1033,7 +1035,6 @@ define([
props.put_timing(timing); props.put_timing(timing);
this.api.SetSlideProps(props); this.api.SetSlideProps(props);
} }
this.fireEvent('editcomplete', this);
}, },
onStartOnClickChange: function(field, newValue, oldValue, eOpts){ onStartOnClickChange: function(field, newValue, oldValue, eOpts){

2
apps/presentationeditor/main/app/view/TableSettings.js
View file

@ -367,6 +367,7 @@ define([
_props.put_RowHeight(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); _props.put_RowHeight(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()));
this.api.tblApply(_props); this.api.tblApply(_props);
}, this)); }, this));
this.numHeight.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
this.lockedControls.push(this.numHeight); this.lockedControls.push(this.numHeight);
this.spinners.push(this.numHeight); this.spinners.push(this.numHeight);
@ -384,6 +385,7 @@ define([
_props.put_ColumnWidth(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); _props.put_ColumnWidth(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()));
this.api.tblApply(_props); this.api.tblApply(_props);
}, this)); }, this));
this.numWidth.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
this.lockedControls.push(this.numWidth); this.lockedControls.push(this.numWidth);
this.spinners.push(this.numWidth); this.spinners.push(this.numWidth);

2
apps/presentationeditor/main/app/view/TextArtSettings.js
View file

@ -354,7 +354,6 @@ define([
this.shapeprops.put_TextArtProperties(props); this.shapeprops.put_TextArtProperties(props);
this.api.ShapeApply(this.shapeprops); this.api.ShapeApply(this.shapeprops);
} }
this.fireEvent('editcomplete', this);
}, },
onTransparencyChange: function(field, newValue, oldValue){ onTransparencyChange: function(field, newValue, oldValue){
@ -1156,6 +1155,7 @@ define([
minValue: 0 minValue: 0
}); });
this.numTransparency.on('change', _.bind(this.onNumTransparencyChange, this)); this.numTransparency.on('change', _.bind(this.onNumTransparencyChange, this));
this.numTransparency.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
this.lockedControls.push(this.numTransparency); this.lockedControls.push(this.numTransparency);
this.sldrTransparency = new Common.UI.SingleSlider({ this.sldrTransparency = new Common.UI.SingleSlider({

2
apps/spreadsheeteditor/main/app/view/CellSettings.js
View file

@ -204,6 +204,7 @@ define([
}); });
this.lockedControls.push(this.numGradientAngle); this.lockedControls.push(this.numGradientAngle);
this.numGradientAngle.on('change', _.bind(this.onGradientAngleChange, this)); this.numGradientAngle.on('change', _.bind(this.onGradientAngleChange, this));
this.numGradientAngle.on('inputleave', function(){ Common.NotificationCenter.trigger('edit:complete', me);});
/*this._arrGradType = [ /*this._arrGradType = [
{displayValue: this.textLinear, value: Asc.c_oAscFillGradType.GRAD_LINEAR}, {displayValue: this.textLinear, value: Asc.c_oAscFillGradType.GRAD_LINEAR},
@ -438,6 +439,7 @@ define([
}); });
this.lockedControls.push(this.spnAngle); this.lockedControls.push(this.spnAngle);
this.spnAngle.on('change', _.bind(this.onAngleChange, this)); this.spnAngle.on('change', _.bind(this.onAngleChange, this));
this.spnAngle.on('inputleave', function(){ Common.NotificationCenter.trigger('edit:complete', me);});
}, },
createDelayedElements: function() { createDelayedElements: function() {

6
apps/spreadsheeteditor/main/app/view/ChartSettings.js
View file

@ -703,6 +703,8 @@ define([
this.spnWidth.on('change', _.bind(this.onWidthChange, this)); this.spnWidth.on('change', _.bind(this.onWidthChange, this));
this.spnHeight.on('change', _.bind(this.onHeightChange, this)); this.spnHeight.on('change', _.bind(this.onHeightChange, this));
this.spnWidth.on('inputleave', function(){ Common.NotificationCenter.trigger('edit:complete', me);});
this.spnHeight.on('inputleave', function(){ Common.NotificationCenter.trigger('edit:complete', me);});
this.btnRatio = new Common.UI.Button({ this.btnRatio = new Common.UI.Button({
cls: 'btn-toolbar', cls: 'btn-toolbar',
@ -848,8 +850,6 @@ define([
props.asc_putHeight(Common.Utils.Metric.fnRecalcToMM(h)); props.asc_putHeight(Common.Utils.Metric.fnRecalcToMM(h));
this.api.asc_setGraphicObjectProps(props); this.api.asc_setGraphicObjectProps(props);
} }
Common.NotificationCenter.trigger('edit:complete', this);
}, },
onHeightChange: function(field, newValue, oldValue, eOpts){ onHeightChange: function(field, newValue, oldValue, eOpts){
@ -869,8 +869,6 @@ define([
props.asc_putHeight(Common.Utils.Metric.fnRecalcToMM(h)); props.asc_putHeight(Common.Utils.Metric.fnRecalcToMM(h));
this.api.asc_setGraphicObjectProps(props); this.api.asc_setGraphicObjectProps(props);
} }
Common.NotificationCenter.trigger('edit:complete', this);
}, },
openAdvancedSettings: function() { openAdvancedSettings: function() {

4
apps/spreadsheeteditor/main/app/view/ImageSettings.js
View file

@ -183,6 +183,8 @@ define([
this.spnWidth.on('change', _.bind(this.onWidthChange, this)); this.spnWidth.on('change', _.bind(this.onWidthChange, this));
this.spnHeight.on('change', _.bind(this.onHeightChange, this)); this.spnHeight.on('change', _.bind(this.onHeightChange, this));
this.spnWidth.on('inputleave', function(){ Common.NotificationCenter.trigger('edit:complete', me);});
this.spnHeight.on('inputleave', function(){ Common.NotificationCenter.trigger('edit:complete', me);});
this.btnOriginalSize.on('click', _.bind(this.setOriginalSize, this)); this.btnOriginalSize.on('click', _.bind(this.setOriginalSize, this));
this.btnInsertFromFile.on('click', _.bind(function(btn){ this.btnInsertFromFile.on('click', _.bind(function(btn){
if (this._isFromFile) return; if (this._isFromFile) return;
@ -392,7 +394,6 @@ define([
props.asc_putHeight(Common.Utils.Metric.fnRecalcToMM(h)); props.asc_putHeight(Common.Utils.Metric.fnRecalcToMM(h));
this.api.asc_setGraphicObjectProps(props); this.api.asc_setGraphicObjectProps(props);
} }
Common.NotificationCenter.trigger('edit:complete', this);
}, },
onHeightChange: function(field, newValue, oldValue, eOpts){ onHeightChange: function(field, newValue, oldValue, eOpts){
@ -412,7 +413,6 @@ define([
props.asc_putHeight(Common.Utils.Metric.fnRecalcToMM(h)); props.asc_putHeight(Common.Utils.Metric.fnRecalcToMM(h));
this.api.asc_setGraphicObjectProps(props); this.api.asc_setGraphicObjectProps(props);
} }
Common.NotificationCenter.trigger('edit:complete', this);
}, },
setOriginalSize: function() { setOriginalSize: function() {

9
apps/spreadsheeteditor/main/app/view/ParagraphSettings.js
View file

@ -107,8 +107,6 @@ define([
return; return;
if (this.api) if (this.api)
this.api.asc_putPrLineSpacing(this.cmbLineRule.getValue(), (this.cmbLineRule.getValue()==c_paragraphLinerule.LINERULE_AUTO) ? field.getNumberValue() : Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); this.api.asc_putPrLineSpacing(this.cmbLineRule.getValue(), (this.cmbLineRule.getValue()==c_paragraphLinerule.LINERULE_AUTO) ? field.getNumberValue() : Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()));
Common.NotificationCenter.trigger('edit:complete', this);
}, },
onNumSpacingBeforeChange: function(field, newValue, oldValue, eOpts){ onNumSpacingBeforeChange: function(field, newValue, oldValue, eOpts){
@ -119,8 +117,6 @@ define([
else else
this.api.asc_putLineSpacingBeforeAfter(0, Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); this.api.asc_putLineSpacingBeforeAfter(0, Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()));
} }
Common.NotificationCenter.trigger('edit:complete', this);
}, },
onNumSpacingAfterChange: function(field, newValue, oldValue, eOpts){ onNumSpacingAfterChange: function(field, newValue, oldValue, eOpts){
@ -131,8 +127,6 @@ define([
else else
this.api.asc_putLineSpacingBeforeAfter(1, Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); this.api.asc_putLineSpacingBeforeAfter(1, Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()));
} }
Common.NotificationCenter.trigger('edit:complete', this);
}, },
onLineRuleSelect: function(combo, record) { onLineRuleSelect: function(combo, record) {
@ -317,6 +311,9 @@ define([
this.numLineHeight.on('change', _.bind(this.onNumLineHeightChange, this)); this.numLineHeight.on('change', _.bind(this.onNumLineHeightChange, this));
this.numSpacingBefore.on('change', _.bind(this.onNumSpacingBeforeChange, this)); this.numSpacingBefore.on('change', _.bind(this.onNumSpacingBeforeChange, this));
this.numSpacingAfter.on('change', _.bind(this.onNumSpacingAfterChange, this)); this.numSpacingAfter.on('change', _.bind(this.onNumSpacingAfterChange, this));
this.numLineHeight.on('inputleave', function(){ Common.NotificationCenter.trigger('edit:complete', me);});
this.numSpacingBefore.on('inputleave', function(){ Common.NotificationCenter.trigger('edit:complete', me);});
this.numSpacingAfter.on('inputleave', function(){ Common.NotificationCenter.trigger('edit:complete', me);});
this.cmbLineRule.on('selected', _.bind(this.onLineRuleSelect, this)); this.cmbLineRule.on('selected', _.bind(this.onLineRuleSelect, this));
this.cmbLineRule.on('hide:after', _.bind(this.onHideMenus, this)); this.cmbLineRule.on('hide:after', _.bind(this.onHideMenus, this));
$(this.el).on('click', '#paragraph-advanced-link', _.bind(this.openAdvancedSettings, this)); $(this.el).on('click', '#paragraph-advanced-link', _.bind(this.openAdvancedSettings, this));

2
apps/spreadsheeteditor/main/app/view/ShapeSettings.js
View file

@ -360,7 +360,6 @@ define([
this.imgprops.asc_putShapeProperties(props); this.imgprops.asc_putShapeProperties(props);
this.api.asc_setGraphicObjectProps(this.imgprops); this.api.asc_setGraphicObjectProps(this.imgprops);
} }
Common.NotificationCenter.trigger('edit:complete', this);
}, },
onTransparencyChange: function(field, newValue, oldValue){ onTransparencyChange: function(field, newValue, oldValue){
@ -1195,6 +1194,7 @@ define([
minValue: 0 minValue: 0
}); });
this.numTransparency.on('change', _.bind(this.onNumTransparencyChange, this)); this.numTransparency.on('change', _.bind(this.onNumTransparencyChange, this));
this.numTransparency.on('inputleave', function(){ Common.NotificationCenter.trigger('edit:complete', me);});
this.fillControls.push(this.numTransparency); this.fillControls.push(this.numTransparency);
this.sldrTransparency = new Common.UI.SingleSlider({ this.sldrTransparency = new Common.UI.SingleSlider({

2
apps/spreadsheeteditor/main/app/view/TextArtSettings.js
View file

@ -355,7 +355,6 @@ define([
this.shapeprops.put_TextArtProperties(props); this.shapeprops.put_TextArtProperties(props);
this.api.asc_setGraphicObjectProps(this.imgprops); this.api.asc_setGraphicObjectProps(this.imgprops);
} }
Common.NotificationCenter.trigger('edit:complete', this);
}, },
onTransparencyChange: function(field, newValue, oldValue){ onTransparencyChange: function(field, newValue, oldValue){
@ -1160,6 +1159,7 @@ define([
minValue: 0 minValue: 0
}); });
this.numTransparency.on('change', _.bind(this.onNumTransparencyChange, this)); this.numTransparency.on('change', _.bind(this.onNumTransparencyChange, this));
this.numTransparency.on('inputleave', function(){ Common.NotificationCenter.trigger('edit:complete', me);});
this.lockedControls.push(this.numTransparency); this.lockedControls.push(this.numTransparency);
this.sldrTransparency = new Common.UI.SingleSlider({ this.sldrTransparency = new Common.UI.SingleSlider({