From d614acfe1bdc2505e68a795aa7530b6cda97eef7 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 6 Oct 2017 13:29:46 +0300 Subject: [PATCH] Revert "[DE] Added Sogou Pinyin input in Chrome." This reverts commit a7e46280003b363acf1d267d2cfc13a01769dcb6. --- .../main/app/controller/LeftMenu.js | 3 --- apps/documenteditor/main/app/controller/Main.js | 4 ---- .../main/app/view/FileMenuPanels.js | 16 +--------------- apps/documenteditor/main/locale/en.json | 1 - 4 files changed, 1 insertion(+), 23 deletions(-) diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js index e5ff63785..31ecfc3e7 100644 --- a/apps/documenteditor/main/app/controller/LeftMenu.js +++ b/apps/documenteditor/main/app/controller/LeftMenu.js @@ -299,9 +299,6 @@ define([ var value; this.api.SetTextBoxInputMode(Common.localStorage.getBool("de-settings-inputmode")); - if (Common.Utils.isChrome) - window["AscInputMethod"]["SogouPinyin"] = Common.localStorage.getBool("de-settings-inputsogou"); - /** coauthoring begin **/ if (this.mode.isEdit && !this.mode.isOffline && this.mode.canCoAuthoring) { var fast_coauth = Common.localStorage.getBool("de-settings-coauthmode", true); diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 81bd0771d..5fc6b164d 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -800,10 +800,6 @@ define([ me.api.SetTextBoxInputMode(Common.localStorage.getBool("de-settings-inputmode")); - if (Common.Utils.isChrome) { - window["AscInputMethod"]["SogouPinyin"] = Common.localStorage.getBool("de-settings-inputsogou"); - } - /** coauthoring begin **/ if (me.appOptions.isEdit && !me.appOptions.isOffline && me.appOptions.canCoAuthoring) { value = Common.localStorage.getItem("de-settings-coauthmode"); diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js index a43602008..a2953db42 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -128,10 +128,6 @@ define([ '', '
', '','', - '', - '', - '
', - '','', '', '', '', @@ -189,11 +185,6 @@ define([ labelText: this.strInputMode }); - this.chInputSogou = new Common.UI.CheckBox({ - el: $('#fms-chb-input-sogou'), - labelText: this.strInputSogou - }); - /** coauthoring begin **/ this.chLiveComment = new Common.UI.CheckBox({ el: $('#fms-chb-live-comment'), @@ -348,13 +339,10 @@ define([ $('tr.coauth.changes', this.el)[mode.isEdit && !mode.isOffline && mode.canCoAuthoring ? 'show' : 'hide'](); $('tr.comments', this.el)[mode.canCoAuthoring && mode.canComments ? 'show' : 'hide'](); /** coauthoring end **/ - - $('tr.sogou', this.el)[mode.isEdit && Common.Utils.isChrome ?'show':'hide'](); }, updateSettings: function() { this.chInputMode.setValue(Common.localStorage.getBool("de-settings-inputmode")); - Common.Utils.isChrome && this.chInputSogou.setValue(Common.localStorage.getBool("de-settings-inputsogou")); var value = Common.localStorage.getItem("de-settings-zoom"); value = (value!==null) ? parseInt(value) : (this.mode.customization && this.mode.customization.zoom ? parseInt(this.mode.customization.zoom) : 100); @@ -405,7 +393,6 @@ define([ applySettings: function() { Common.localStorage.setItem("de-settings-inputmode", this.chInputMode.isChecked() ? 1 : 0); - Common.Utils.isChrome && Common.localStorage.setItem("de-settings-inputsogou", this.chInputSogou.isChecked() ? 1 : 0); Common.localStorage.setItem("de-settings-zoom", this.cmbZoom.getValue()); /** coauthoring begin **/ Common.localStorage.setItem("de-settings-livecomment", this.chLiveComment.isChecked() ? 1 : 0); @@ -483,8 +470,7 @@ define([ txtFitWidth: 'Fit to Width', textForceSave: 'Save to Server', strForcesave: 'Always save to server (otherwise save to server on document close)', - strResolvedComment: 'Turn on display of the resolved comments', - strInputSogou: 'Turn on Sogou Pinyin input' + strResolvedComment: 'Turn on display of the resolved comments' }, DE.Views.FileMenuPanels.Settings || {})); DE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({ diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index c8b492a0c..f15a493ba 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -994,7 +994,6 @@ "DE.Views.FileMenuPanels.Settings.strFontRender": "Font Hinting", "DE.Views.FileMenuPanels.Settings.strForcesave": "Always save to server (otherwise save to server on document close)", "DE.Views.FileMenuPanels.Settings.strInputMode": "Turn on hieroglyphs", - "DE.Views.FileMenuPanels.Settings.strInputSogou": "Turn on Sogou Pinyin input", "DE.Views.FileMenuPanels.Settings.strLiveComment": "Turn on display of the comments", "DE.Views.FileMenuPanels.Settings.strResolvedComment": "Turn on display of the resolved comments", "DE.Views.FileMenuPanels.Settings.strShowChanges": "Realtime Collaboration Changes",