From 4e644daac10920154e169aa162c79bcaaa30dcb2 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 15 Jul 2019 17:57:46 +0300 Subject: [PATCH] [PE] Refactoring language button --- .../main/app/controller/Main.js | 1 + .../main/app/controller/Statusbar.js | 19 +++---------------- .../main/app/template/StatusBar.template | 2 +- .../main/app/view/Statusbar.js | 10 ---------- apps/presentationeditor/main/locale/en.json | 2 +- .../main/resources/less/statusbar.less | 1 - .../main/resources/less/toolbar.less | 1 + 7 files changed, 7 insertions(+), 29 deletions(-) diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index bdcd08142..00f776d5a 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -1692,6 +1692,7 @@ define([ if (this.languages && this.languages.length>0) { this.getApplication().getController('DocumentHolder').getView('DocumentHolder').setLanguages(this.languages); this.getApplication().getController('Statusbar').setLanguages(this.languages); + this.getApplication().getController('Common.Controllers.ReviewChanges').setLanguages(this.languages); } }, diff --git a/apps/presentationeditor/main/app/controller/Statusbar.js b/apps/presentationeditor/main/app/controller/Statusbar.js index 0d79ec3b9..3f9f00ecb 100644 --- a/apps/presentationeditor/main/app/controller/Statusbar.js +++ b/apps/presentationeditor/main/app/controller/Statusbar.js @@ -80,8 +80,7 @@ define([ events: function() { return { 'click #btn-zoom-down': _.bind(this.zoomDocument,this,'down'), - 'click #btn-zoom-up': _.bind(this.zoomDocument,this,'up'), - 'click #btn-doc-lang':_.bind(this.onBtnLanguage,this) + 'click #btn-zoom-up': _.bind(this.zoomDocument,this,'up') }; }, @@ -105,6 +104,8 @@ define([ var review = me.getApplication().getController('Common.Controllers.ReviewChanges').getView(); me.btnSpelling = review.getButton('spelling', 'statusbar'); me.btnSpelling.render( me.statusbar.$el.find('#btn-doc-spell') ); + me.btnDocLang = review.getButton('doclang', 'statusbar'); + me.btnDocLang.render( me.statusbar.$el.find('#btn-doc-lang') ); } else { me.statusbar.$el.find('.el-edit, .el-review').hide(); } @@ -214,20 +215,6 @@ define([ this.statusbar.$el.css('z-index', ''); }, - onBtnLanguage: function() { - var me = this; - (new Common.Views.LanguageDialog({ - languages: me.langs, - current: me.api.asc_getDefaultLanguage(), - handler: function(result, value) { - if (result=='ok') { - var record = _.findWhere(me.langs, {'value':value}); - record && me.api.asc_setDefaultLanguage(record.code); - } - } - })).show(); - }, - onLangMenu: function(obj, langid, title) { this.api.put_TextPrLang(langid); }, diff --git a/apps/presentationeditor/main/app/template/StatusBar.template b/apps/presentationeditor/main/app/template/StatusBar.template index fabe7b7cd..411948a61 100644 --- a/apps/presentationeditor/main/app/template/StatusBar.template +++ b/apps/presentationeditor/main/app/template/StatusBar.template @@ -33,7 +33,7 @@
- +
diff --git a/apps/presentationeditor/main/app/view/Statusbar.js b/apps/presentationeditor/main/app/view/Statusbar.js index 2a3194745..9dd58ce2d 100644 --- a/apps/presentationeditor/main/app/view/Statusbar.js +++ b/apps/presentationeditor/main/app/view/Statusbar.js @@ -247,13 +247,6 @@ define([ }); this.btnPreview.render($('#slot-status-btn-preview')); - this.btnDocLanguage = new Common.UI.Button({ - el: $('#btn-doc-lang',this.el), - hint: this.tipSetDocLang, - hintAnchor: 'top', - disabled: true - }); - var panelLang = $('.cnt-lang',this.el); this.langMenu = new Common.UI.Menu({ cls: 'lang-menu', @@ -349,7 +342,6 @@ define([ if (this.langMenu.items.length>0) { this.btnLanguage.setDisabled(false || this._state.no_paragraph); - this.btnDocLanguage.setDisabled(!!this.mode.isDisconnected); } }, @@ -372,7 +364,6 @@ define([ SetDisabled: function(disable) { var langs = this.langMenu.items.length>0; this.btnLanguage.setDisabled(disable || !langs || this._state.no_paragraph); - this.btnDocLanguage.setDisabled(disable || !langs); this.mode.isEdit = !disable; }, @@ -409,7 +400,6 @@ define([ tipPreview : 'Start Slideshow', tipAccessRights : 'Manage document access rights', tipSetLang : 'Set Text Language', - tipSetDocLang : 'Set Document Language', textShowBegin: 'Show from Beginning', textShowCurrent: 'Show from Current slide', textShowPresenterView: 'Show presenter view' diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index 23fcd6c49..eaa27f412 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -1538,7 +1538,7 @@ "PE.Views.Statusbar.tipFitPage": "Fit to slide", "PE.Views.Statusbar.tipFitWidth": "Fit to width", "PE.Views.Statusbar.tipPreview": "Start slideshow", - "PE.Views.Statusbar.tipSetDocLang": "Set document language", + "del_PE.Views.Statusbar.tipSetDocLang": "Set document language", "PE.Views.Statusbar.tipSetLang": "Set text language", "del_PE.Views.Statusbar.tipSetSpelling": "Spell checking", "PE.Views.Statusbar.tipZoomFactor": "Zoom", diff --git a/apps/presentationeditor/main/resources/less/statusbar.less b/apps/presentationeditor/main/resources/less/statusbar.less index 65965cf15..1932b4fcd 100644 --- a/apps/presentationeditor/main/resources/less/statusbar.less +++ b/apps/presentationeditor/main/resources/less/statusbar.less @@ -58,7 +58,6 @@ } #btn-doc-lang { - .btn-tpl(-1500px); margin-right: 9px; } diff --git a/apps/presentationeditor/main/resources/less/toolbar.less b/apps/presentationeditor/main/resources/less/toolbar.less index f4a3df50e..2ac1e08e4 100644 --- a/apps/presentationeditor/main/resources/less/toolbar.less +++ b/apps/presentationeditor/main/resources/less/toolbar.less @@ -274,6 +274,7 @@ .button-normal-icon(flip-hor, 81, @toolbar-icon-size); .button-normal-icon(flip-vert, 82, @toolbar-icon-size); +.button-normal-icon(btn-ic-doclang, 75, @toolbar-icon-size); .button-normal-icon(btn-ic-docspell, 76, @toolbar-icon-size); @menu-icon-size: 22px;