From 556b0c55ae7ddf66f76ebaed6ab5fab72a01a530 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 5 Jun 2017 17:51:26 +0300 Subject: [PATCH] [DE] Added option for show/hide resolved comments. --- .../main/app/controller/LeftMenu.js | 12 ++++++++---- .../documenteditor/main/app/controller/Main.js | 3 ++- .../main/app/view/FileMenuPanels.js | 18 +++++++++++++++++- apps/documenteditor/main/locale/en.json | 1 + .../mobile/app/controller/Main.js | 2 +- 5 files changed, 29 insertions(+), 7 deletions(-) diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js index 9490b94ce..066f625af 100644 --- a/apps/documenteditor/main/app/controller/LeftMenu.js +++ b/apps/documenteditor/main/app/controller/LeftMenu.js @@ -307,7 +307,8 @@ define([ } value = Common.localStorage.getItem("de-settings-livecomment"); - (!(value!==null && parseInt(value) == 0)) ? this.api.asc_showComments() : this.api.asc_hideComments(); + var resolved = Common.localStorage.getItem("de-settings-resolvedcomment"); + (!(value!==null && parseInt(value) == 0)) ? this.api.asc_showComments(!(resolved!==null && parseInt(resolved) == 0)) : this.api.asc_hideComments(); /** coauthoring end **/ value = Common.localStorage.getItem("de-settings-fontrender"); @@ -515,9 +516,12 @@ define([ }, commentsShowHide: function(mode) { - var value = Common.localStorage.getItem("de-settings-livecomment"); - if (value !== null && 0 === parseInt(value)) { - (mode === 'show') ? this.api.asc_showComments() : this.api.asc_hideComments(); + var value = Common.localStorage.getItem("de-settings-livecomment"), + resolved = Common.localStorage.getItem("de-settings-resolvedcomment"); + value = (value!==null && parseInt(value) == 0); + resolved = (resolved!==null && parseInt(resolved) == 0); + if (value || resolved) { + (mode === 'show') ? this.api.asc_showComments(true) : ((!value) ? this.api.asc_showComments(!resolved) : this.api.asc_hideComments()); } if (mode === 'show') { diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index dcecfb286..63549a003 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -736,7 +736,8 @@ define([ /** coauthoring begin **/ value = Common.localStorage.getItem("de-settings-livecomment"); this.isLiveCommenting = !(value!==null && parseInt(value) == 0); - this.isLiveCommenting ? this.api.asc_showComments() : this.api.asc_hideComments(); + var resolved = Common.localStorage.getItem("de-settings-resolvedcomment"); + this.isLiveCommenting ? this.api.asc_showComments(!(resolved!==null && parseInt(resolved) == 0)) : this.api.asc_hideComments(); /** coauthoring end **/ value = Common.localStorage.getItem("de-settings-zoom"); diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js index 01d2100bb..8d846efa4 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -115,6 +115,10 @@ define([ '', '
', '','', + '', + '', + '
', + '','', /** coauthoring end **/ '', '', @@ -185,6 +189,13 @@ define([ this.chLiveComment = new Common.UI.CheckBox({ el: $('#fms-chb-live-comment'), labelText: this.strLiveComment + }).on('change', _.bind(function(field, newValue, oldValue, eOpts){ + this.chResolvedComment.setDisabled(field.getValue()!=='checked'); + }, this)); + + this.chResolvedComment = new Common.UI.CheckBox({ + el: $('#fms-chb-resolved-comment'), + labelText: this.strResolvedComment }); /** coauthoring end **/ @@ -341,6 +352,9 @@ define([ value = Common.localStorage.getItem("de-settings-livecomment"); this.chLiveComment.setValue(!(value!==null && parseInt(value) == 0)); + value = Common.localStorage.getItem("de-settings-resolvedcomment"); + this.chResolvedComment.setValue(!(value!==null && parseInt(value) == 0)); + value = Common.localStorage.getItem("de-settings-coauthmode"); if (value===null && Common.localStorage.getItem("de-settings-autosave")===null && this.mode.customization && this.mode.customization.autosave===false) @@ -390,6 +404,7 @@ define([ Common.localStorage.setItem("de-settings-zoom", this.cmbZoom.getValue()); /** coauthoring begin **/ Common.localStorage.setItem("de-settings-livecomment", this.chLiveComment.isChecked() ? 1 : 0); + Common.localStorage.setItem("de-settings-resolvedcomment", this.chResolvedComment.isChecked() ? 1 : 0); if (this.mode.isEdit && !this.mode.isOffline && this.mode.canCoAuthoring) { Common.localStorage.setItem("de-settings-coauthmode", this.cmbCoAuthMode.getValue()); Common.localStorage.setItem(this.cmbCoAuthMode.getValue() ? "de-settings-showchanges-fast" : "de-settings-showchanges-strict", this.cmbShowChanges.getValue()); @@ -462,7 +477,8 @@ define([ txtFitPage: 'Fit to Page', txtFitWidth: 'Fit to Width', textForceSave: 'Save to Server', - strForcesave: 'Always save to server (otherwise save to server on document close)' + strForcesave: 'Always save to server (otherwise save to server on document close)', + 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 9970d2bdf..c55c7031e 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -979,6 +979,7 @@ "DE.Views.FileMenuPanels.Settings.txtPt": "Point", "DE.Views.FileMenuPanels.Settings.txtSpellCheck": "Spell Checking", "DE.Views.FileMenuPanels.Settings.txtWin": "as Windows", + "DE.Views.FileMenuPanels.Settings.strResolvedComment": "Turn on display of the resolved comments", "DE.Views.HeaderFooterSettings.textBottomCenter": "Bottom Center", "DE.Views.HeaderFooterSettings.textBottomLeft": "Bottom Left", "DE.Views.HeaderFooterSettings.textBottomRight": "Bottom Right", diff --git a/apps/documenteditor/mobile/app/controller/Main.js b/apps/documenteditor/mobile/app/controller/Main.js index c8509804e..ceac2d37e 100644 --- a/apps/documenteditor/mobile/app/controller/Main.js +++ b/apps/documenteditor/mobile/app/controller/Main.js @@ -454,7 +454,7 @@ define([ /** coauthoring begin **/ value = Common.localStorage.getItem("de-settings-livecomment"); this.isLiveCommenting = !(value!==null && parseInt(value) == 0); - this.isLiveCommenting ? this.api.asc_showComments() : this.api.asc_hideComments(); + this.isLiveCommenting ? this.api.asc_showComments(true) : this.api.asc_hideComments(); /** coauthoring end **/ value = Common.localStorage.getItem("de-settings-zoom");