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

Fix bug: setEndPointHistory without setStartPointHistory

Browse source
This commit is contained in:
Julia Radzhabova 2018-11-08 10:58:53 +03:00
parent 44e8976021
commit dd40a46fe3
8 changed files with 55 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -376,8 +376,10 @@ define([
onTransparencyChangeComplete: function(field, newValue, oldValue){ onTransparencyChangeComplete: function(field, newValue, oldValue){
clearInterval(this.updateslider); clearInterval(this.updateslider);
this._sliderChanged = newValue; this._sliderChanged = newValue;
this.api.setEndPointHistory(); if (!this._sendUndoPoint) { // start point was added
this._transparencyApplyFunc(); this.api.setEndPointHistory();
this._transparencyApplyFunc();
}
this._sendUndoPoint = true; this._sendUndoPoint = true;
}, },
@ -515,8 +517,10 @@ define([
onGradientChangeComplete: function(slider, newValue, oldValue){ onGradientChangeComplete: function(slider, newValue, oldValue){
clearInterval(this.updateslider); clearInterval(this.updateslider);
this._sliderChanged = true; this._sliderChanged = true;
this.api.setEndPointHistory(); if (!this._sendUndoPoint) { // start point was added
this._gradientApplyFunc(); this.api.setEndPointHistory();
this._gradientApplyFunc();
}
this._sendUndoPoint = true; this._sendUndoPoint = true;
}, },

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

@ -242,8 +242,10 @@ define([
onTransparencyChangeComplete: function(field, newValue, oldValue){ onTransparencyChangeComplete: function(field, newValue, oldValue){
clearInterval(this.updateslider); clearInterval(this.updateslider);
this._sliderChanged = newValue; this._sliderChanged = newValue;
this.api.setEndPointHistory(); if (!this._sendUndoPoint) { // start point was added
this._transparencyApplyFunc(); this.api.setEndPointHistory();
this._transparencyApplyFunc();
}
this._sendUndoPoint = true; this._sendUndoPoint = true;
}, },
@ -381,8 +383,10 @@ define([
onGradientChangeComplete: function(slider, newValue, oldValue){ onGradientChangeComplete: function(slider, newValue, oldValue){
clearInterval(this.updateslider); clearInterval(this.updateslider);
this._sliderChanged = true; this._sliderChanged = true;
this.api.setEndPointHistory(); if (!this._sendUndoPoint) { // start point was added
this._gradientApplyFunc(); this.api.setEndPointHistory();
this._gradientApplyFunc();
}
this._sendUndoPoint = true; this._sendUndoPoint = true;
}, },

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

@ -361,8 +361,10 @@ define([
onTransparencyChangeComplete: function(field, newValue, oldValue){ onTransparencyChangeComplete: function(field, newValue, oldValue){
clearInterval(this.updateslider); clearInterval(this.updateslider);
this._sliderChanged = newValue; this._sliderChanged = newValue;
this.api.setEndPointHistory(); if (!this._sendUndoPoint) { // start point was added
this._transparencyApplyFunc(); this.api.setEndPointHistory();
this._transparencyApplyFunc();
}
this._sendUndoPoint = true; this._sendUndoPoint = true;
}, },
@ -496,8 +498,10 @@ define([
onGradientChangeComplete: function(slider, newValue, oldValue){ onGradientChangeComplete: function(slider, newValue, oldValue){
clearInterval(this.updateslider); clearInterval(this.updateslider);
this._sliderChanged = true; this._sliderChanged = true;
this.api.setEndPointHistory(); if (!this._sendUndoPoint) { // start point was added
this._gradientApplyFunc(); this.api.setEndPointHistory();
this._gradientApplyFunc();
}
this._sendUndoPoint = true; this._sendUndoPoint = true;
}, },

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

@ -572,8 +572,10 @@ define([
onGradientChangeComplete: function(slider, newValue, oldValue){ onGradientChangeComplete: function(slider, newValue, oldValue){
clearInterval(this.updateslider); clearInterval(this.updateslider);
this._sliderChanged = true; this._sliderChanged = true;
this.api.setEndPointHistory(); if (!this._sendUndoPoint) { // start point was added
this._gradientApplyFunc(); this.api.setEndPointHistory();
this._gradientApplyFunc();
}
this._sendUndoPoint = true; this._sendUndoPoint = true;
}, },

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

@ -363,8 +363,10 @@ define([
onTransparencyChangeComplete: function(field, newValue, oldValue){ onTransparencyChangeComplete: function(field, newValue, oldValue){
clearInterval(this.updateslider); clearInterval(this.updateslider);
this._sliderChanged = newValue; this._sliderChanged = newValue;
this.api.setEndPointHistory(); if (!this._sendUndoPoint) { // start point was added
this._transparencyApplyFunc(); this.api.setEndPointHistory();
this._transparencyApplyFunc();
}
this._sendUndoPoint = true; this._sendUndoPoint = true;
}, },
@ -502,8 +504,10 @@ define([
onGradientChangeComplete: function(slider, newValue, oldValue){ onGradientChangeComplete: function(slider, newValue, oldValue){
clearInterval(this.updateslider); clearInterval(this.updateslider);
this._sliderChanged = true; this._sliderChanged = true;
this.api.setEndPointHistory(); if (!this._sendUndoPoint) { // start point was added
this._gradientApplyFunc(); this.api.setEndPointHistory();
this._gradientApplyFunc();
}
this._sendUndoPoint = true; this._sendUndoPoint = true;
}, },

6
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -3086,7 +3086,7 @@ define([
tab = {action: 'pivot', caption: me.textPivot}; tab = {action: 'pivot', caption: me.textPivot};
$panel = me.getApplication().getController('PivotTable').createToolbarPanel(); $panel = me.getApplication().getController('PivotTable').createToolbarPanel();
if ($panel) { if ($panel) {
me.toolbar.addTab(tab, $panel, 4); me.toolbar.addTab(tab, $panel, 3);
me.toolbar.setVisible('pivot', true); me.toolbar.setVisible('pivot', true);
} }
} }
@ -3094,7 +3094,7 @@ define([
var tab = {action: 'review', caption: me.toolbar.textTabCollaboration}; var tab = {action: 'review', caption: me.toolbar.textTabCollaboration};
var $panel = me.getApplication().getController('Common.Controllers.ReviewChanges').createToolbarPanel(); var $panel = me.getApplication().getController('Common.Controllers.ReviewChanges').createToolbarPanel();
if ( $panel ) if ( $panel )
me.toolbar.addTab(tab, $panel, 5); me.toolbar.addTab(tab, $panel, 4);
if ( config.isDesktopApp ) { if ( config.isDesktopApp ) {
// hide 'print' and 'save' buttons group and next separator // hide 'print' and 'save' buttons group and next separator
@ -3111,7 +3111,7 @@ define([
tab = {action: 'protect', caption: me.toolbar.textTabProtect}; tab = {action: 'protect', caption: me.toolbar.textTabProtect};
$panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel(); $panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel();
if ($panel) if ($panel)
me.toolbar.addTab(tab, $panel, 6); me.toolbar.addTab(tab, $panel, 5);
} }
} }
} }

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

@ -372,8 +372,10 @@ define([
onTransparencyChangeComplete: function(field, newValue, oldValue){ onTransparencyChangeComplete: function(field, newValue, oldValue){
clearInterval(this.updateslider); clearInterval(this.updateslider);
this._sliderChanged = newValue; this._sliderChanged = newValue;
this.api.setEndPointHistory(); if (!this._sendUndoPoint) { // start point was added
this._transparencyApplyFunc(); this.api.setEndPointHistory();
this._transparencyApplyFunc();
}
this._sendUndoPoint = true; this._sendUndoPoint = true;
}, },
@ -511,8 +513,10 @@ define([
onGradientChangeComplete: function(slider, newValue, oldValue){ onGradientChangeComplete: function(slider, newValue, oldValue){
clearInterval(this.updateslider); clearInterval(this.updateslider);
this._sliderChanged = true; this._sliderChanged = true;
this.api.setEndPointHistory(); if (!this._sendUndoPoint) { // start point was added
this._gradientApplyFunc(); this.api.setEndPointHistory();
this._gradientApplyFunc();
}
this._sendUndoPoint = true; this._sendUndoPoint = true;
}, },

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

@ -364,8 +364,10 @@ define([
onTransparencyChangeComplete: function(field, newValue, oldValue){ onTransparencyChangeComplete: function(field, newValue, oldValue){
clearInterval(this.updateslider); clearInterval(this.updateslider);
this._sliderChanged = newValue; this._sliderChanged = newValue;
this.api.setEndPointHistory(); if (!this._sendUndoPoint) { // start point was added
this._transparencyApplyFunc(); this.api.setEndPointHistory();
this._transparencyApplyFunc();
}
this._sendUndoPoint = true; this._sendUndoPoint = true;
}, },
@ -503,8 +505,10 @@ define([
onGradientChangeComplete: function(slider, newValue, oldValue){ onGradientChangeComplete: function(slider, newValue, oldValue){
clearInterval(this.updateslider); clearInterval(this.updateslider);
this._sliderChanged = true; this._sliderChanged = true;
this.api.setEndPointHistory(); if (!this._sendUndoPoint) { // start point was added
this._gradientApplyFunc(); this.api.setEndPointHistory();
this._gradientApplyFunc();
}
this._sendUndoPoint = true; this._sendUndoPoint = true;
}, },