From 0295612ce1d24625799b46c075298285b7c25480 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 10 Jan 2018 16:08:42 +0300 Subject: [PATCH] [SSE] Change order for super/subscript buttons. --- .../main/app/controller/Toolbar.js | 4 ++-- .../spreadsheeteditor/main/app/view/Toolbar.js | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 947e2db9d..fc143939c 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -1767,7 +1767,7 @@ define([ supersc = fontobj.asc_getSuperscript(); if (this._state.subscript !== subsc || this._state.superscript !== supersc) { - var index = (subsc) ? 0 : (supersc ? 1 : -1), + var index = (supersc) ? 0 : (subsc ? 1 : -1), btnSubscript = toolbar.btnSubscript; btnSubscript.toggle(index>-1, true); @@ -1908,7 +1908,7 @@ define([ supersc = fontobj.asc_getSuperscript(); if (this._state.subscript !== subsc || this._state.superscript !== supersc) { - var index = (subsc) ? 0 : (supersc ? 1 : -1), + var index = (supersc) ? 0 : (subsc ? 1 : -1), btnSubscript = toolbar.btnSubscript; btnSubscript.toggle(index>-1, true); diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index ee92da09a..1465ab2d1 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -429,15 +429,6 @@ define([ lock : [_set.selImage, _set.editFormula, _set.selRange, _set.coAuth, _set.coAuthText, _set.lostConnect], menu : new Common.UI.Menu({ items: [ - { - caption : me.textSubscript, - iconCls : 'mnu-text-subscript', - icls : 'btn-subscript', - checkable : true, - allowDepress: true, - toggleGroup : 'textsubscriptgroup', - value : 'sub' - }, { caption : me.textSuperscript, iconCls : 'mnu-text-superscript', @@ -446,6 +437,15 @@ define([ allowDepress: true, toggleGroup : 'textsubscriptgroup', value : 'super' + }, + { + caption : me.textSubscript, + iconCls : 'mnu-text-subscript', + icls : 'btn-subscript', + checkable : true, + allowDepress: true, + toggleGroup : 'textsubscriptgroup', + value : 'sub' } ] })