[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CHANNELMGR-1660] CHANNELMGR-1660 Reset exit mode when opening content in other editor

[Mathijs den Burger]

Mathijs den Burger pushed to branch feature/CHANNELMGR-1660 at cms-community / 
hippo-addon-channel-manager


Commits:
f53533c0 by Mathijs den Burger at 2018-01-15T16:26:40+01:00
CHANNELMGR-1660 Reset exit mode when opening content in other editor

Otherwise a canceled exit will keep the exit mode, so the next exit will
still open the editor.

Also renamed 'mode' to 'exitMode' to improve readability.

- - - - -


1 changed file:

- 
frontend-ng/src/app/channel/sidePanels/rightSidePanel/editContent/editContentTools.controller.js


Changes:

=====================================
frontend-ng/src/app/channel/sidePanels/rightSidePanel/editContent/editContentTools.controller.js
=====================================
--- 
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/editContent/editContentTools.controller.js
+++ 
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/editContent/editContentTools.controller.js
@@ -33,19 +33,22 @@ class EditContentToolsCtrl {
     return this.ContentEditor.isEditing();
   }
 
-  openContentEditor(mode) {
-    this.mode = mode;
+  openContentEditor(exitMode) {
+    this.exitMode = exitMode;
     this.EditContentService.stopEditing();
   }
 
   uiCanExit() {
-    if (this.mode === 'view') {
+    if (this.exitMode === 'view') {
       return 
this.ContentEditor.confirmSaveOrDiscardChanges('SAVE_CHANGES_ON_PUBLISH_MESSAGE')
         .then(() => this.ContentEditor.deleteDraft())
-        .then(() => this._viewContent());
-    } else if (this.mode === 'edit') {
+        .then(() => this._viewContent())
+        .finally(() => this._clearExitMode());
+    } else if (this.exitMode === 'edit') {
       this._editContent();
     }
+    // yes, the UI can exit. Return something to make ESLint happy.
+    this._clearExitMode();
     return true;
   }
 
@@ -60,6 +63,10 @@ class EditContentToolsCtrl {
     this.ContentEditor.close();
     this.CmsService.reportUsageStatistic('CMSChannelsContentEditor');
   }
+
+  _clearExitMode() {
+    delete this.exitMode;
+  }
 }
 
 export default EditContentToolsCtrl;



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/f53533c09ee0266fad055b61cfc9f9fdfbf76161

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/f53533c09ee0266fad055b61cfc9f9fdfbf76161
You're receiving this email because of your account on code.onehippo.org.

_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn