diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 7c40e248d..7ad5c52b2 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -495,8 +495,8 @@ define([ onApiVerticalAlign: function(typeBaseline) { if (this._state.valign !== typeBaseline) { - this.toolbar.btnSuperscript.toggle(typeBaseline==1, true); - this.toolbar.btnSubscript.toggle(typeBaseline==2, true); + this.toolbar.btnSuperscript.toggle(typeBaseline==Asc.vertalign_SuperScript, true); + this.toolbar.btnSubscript.toggle(typeBaseline==Asc.vertalign_SubScript, true); this._state.valign = typeBaseline; } }, @@ -1186,7 +1186,7 @@ define([ if (!this.toolbar.btnSubscript.pressed) { this._state.valign = undefined; if (this.api) - this.api.put_TextPrBaseline(btn.pressed ? 1 : 0); + this.api.put_TextPrBaseline(btn.pressed ? Asc.vertalign_SuperScript : Asc.vertalign_Baseline); Common.NotificationCenter.trigger('edit:complete', this.toolbar); Common.component.Analytics.trackEvent('ToolBar', 'Superscript'); @@ -1197,7 +1197,7 @@ define([ if (!this.toolbar.btnSuperscript.pressed) { this._state.valign = undefined; if (this.api) - this.api.put_TextPrBaseline(btn.pressed ? 2 : 0); + this.api.put_TextPrBaseline(btn.pressed ? Asc.vertalign_SubScript : Asc.vertalign_Baseline); Common.NotificationCenter.trigger('edit:complete', this.toolbar); Common.component.Analytics.trackEvent('ToolBar', 'Subscript'); diff --git a/apps/documenteditor/mobile/src/controller/edit/EditText.jsx b/apps/documenteditor/mobile/src/controller/edit/EditText.jsx index ea74e99dd..b1c2eb630 100644 --- a/apps/documenteditor/mobile/src/controller/edit/EditText.jsx +++ b/apps/documenteditor/mobile/src/controller/edit/EditText.jsx @@ -119,9 +119,9 @@ class EditTextController extends Component { const api = Common.EditorApi.get(); if (api) { if ('superscript' === type) { - api.put_TextPrBaseline(value ? 1 : 0); + api.put_TextPrBaseline(value ? Asc.vertalign_SuperScript : Asc.vertalign_Baseline); } else { - api.put_TextPrBaseline(value ? 2 : 0); + api.put_TextPrBaseline(value ? Asc.vertalign_SubScript : Asc.vertalign_Baseline); } } } diff --git a/apps/documenteditor/mobile/src/store/textSettings.js b/apps/documenteditor/mobile/src/store/textSettings.js index ad9a0972d..2cf6bdf09 100644 --- a/apps/documenteditor/mobile/src/store/textSettings.js +++ b/apps/documenteditor/mobile/src/store/textSettings.js @@ -171,10 +171,10 @@ export class storeTextSettings { this.typeBaseline = typeBaseline; } get isSuperscript() { - return (this.typeBaseline === 1); + return (this.typeBaseline === Asc.vertalign_SuperScript); } get isSubscript() { - return (this.typeBaseline === 2); + return (this.typeBaseline === Asc.vertalign_SubScript); } // bullets diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index da43d5d7b..a666f5e01 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -471,8 +471,8 @@ define([ onApiVerticalAlign: function(typeBaseline) { if (this._state.valign !== typeBaseline) { - this.toolbar.btnSuperscript.toggle(typeBaseline==1, true); - this.toolbar.btnSubscript.toggle(typeBaseline==2, true); + this.toolbar.btnSuperscript.toggle(typeBaseline==Asc.vertalign_SuperScript, true); + this.toolbar.btnSubscript.toggle(typeBaseline==Asc.vertalign_SubScript, true); this._state.valign = typeBaseline; } }, @@ -1194,7 +1194,7 @@ define([ if (!this.toolbar.btnSubscript.pressed) { this._state.valign = undefined; if (this.api) - this.api.put_TextPrBaseline(btn.pressed ? 1 : 0); + this.api.put_TextPrBaseline(btn.pressed ? Asc.vertalign_SuperScript : Asc.vertalign_Baseline); Common.NotificationCenter.trigger('edit:complete', this.toolbar); Common.component.Analytics.trackEvent('ToolBar', 'Superscript'); @@ -1205,7 +1205,7 @@ define([ if (!this.toolbar.btnSuperscript.pressed) { this._state.valign = undefined; if (this.api) - this.api.put_TextPrBaseline(btn.pressed ? 2 : 0); + this.api.put_TextPrBaseline(btn.pressed ? Asc.vertalign_SubScript : Asc.vertalign_Baseline); Common.NotificationCenter.trigger('edit:complete', this.toolbar); Common.component.Analytics.trackEvent('ToolBar', 'Subscript'); diff --git a/apps/presentationeditor/mobile/src/controller/edit/EditText.jsx b/apps/presentationeditor/mobile/src/controller/edit/EditText.jsx index 7d96bf4eb..6e1ed49d0 100644 --- a/apps/presentationeditor/mobile/src/controller/edit/EditText.jsx +++ b/apps/presentationeditor/mobile/src/controller/edit/EditText.jsx @@ -204,9 +204,9 @@ class EditTextController extends Component { const api = Common.EditorApi.get(); if ('superscript' === type) { - api.put_TextPrBaseline(value ? 1 : 0); + api.put_TextPrBaseline(value ? Asc.vertalign_SuperScript : Asc.vertalign_Baseline); } else { - api.put_TextPrBaseline(value ? 2 : 0); + api.put_TextPrBaseline(value ? Asc.vertalign_SubScript : Asc.vertalign_Baseline); } } diff --git a/apps/presentationeditor/mobile/src/store/textSettings.js b/apps/presentationeditor/mobile/src/store/textSettings.js index c5ba1ba49..28901a2c4 100644 --- a/apps/presentationeditor/mobile/src/store/textSettings.js +++ b/apps/presentationeditor/mobile/src/store/textSettings.js @@ -191,11 +191,11 @@ export class storeTextSettings { } get isSuperscript() { - return (this.typeBaseline === 1); + return (this.typeBaseline === Asc.vertalign_SuperScript); } get isSubscript() { - return (this.typeBaseline === 2); + return (this.typeBaseline === Asc.vertalign_SubScript); } // bullets