Fix session and editor handling of focus mode, fixes #97

bergie · Sep 18, 2012 · 39a6e8e · 39a6e8e
1 parent 8b64bc7
commit 39a6e8e
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 42 deletions.
diff --git a/examples/create-min.js b/examples/create-min.js
diff --git a/examples/create.js b/examples/create.js
@@ -196,6 +196,11 @@
       this._setEditButtonState(state);
     },
 
+    setToolbar: function (state) {
+      this.options.toolbar = state;
+      this.element.midgardToolbar('setDisplay', state);
+    },
+
     showNotification: function (options) {
       if (this.element.midgardNotifications) {
         return this.element.midgardNotifications('create', options);
@@ -230,7 +235,7 @@
 
       var toolbarID = this.options.storagePrefix + 'Midgard.create.toolbar';
       if (window.sessionStorage.getItem(toolbarID)) {
-        this._setOption('toolbar', window.sessionStorage.getItem(toolbarID));
+        this.setToolbar(window.sessionStorage.getItem(toolbarID));
       }
 
       var stateID = this.options.storagePrefix + 'Midgard.create.state';
@@ -298,10 +303,10 @@
     _enableToolbar: function () {
       var widget = this;
       this.element.bind('midgardtoolbarstatechange', function (event, options) {
+        widget.setToolbar(options.display);
         if (window.sessionStorage) {
           window.sessionStorage.setItem(widget.options.storagePrefix + 'Midgard.create.toolbar', options.display);
         }
-        widget._setOption('toolbar', options.display);
       });
 
       this.element.midgardToolbar({
@@ -314,7 +319,7 @@
       this._setOption('state', 'edit');
       var widget = this;
       var editableOptions = {
-        toolbarState: widget.options.display,
+        toolbarState: widget.options.toolbar,
         disabled: false,
         vie: widget.vie,
         widgets: widget.options.editorWidgets,
@@ -883,6 +888,7 @@
       var editorWidget = this._editorWidget(editorName);
 
       data.editorOptions = this._editorOptions(editorName);
+      data.toolbarState = this.options.toolbarState;
       data.disabled = false;
 
       if (typeof jQuery(data.element)[editorWidget] !== 'function') {
@@ -1118,12 +1124,14 @@
       });
       this.options.disabled = false;
     },
+
     disable: function () {
       jQuery(this.element).hallo({
         editable: false
       });
       this.options.disabled = true;
     },
+
     _initialize: function () {
       jQuery(this.element).hallo(this.getHalloOptions());
       var self = this;
@@ -2703,19 +2711,12 @@
       var widget = this;
       jQuery('.create-ui-toggle', this.element).click(function () {
         if (widget.options.display === 'full') {
-          widget.hide();
-          widget.options.display = 'minimized';
+          widget.setDisplay('minimized');
         } else {
-          widget.show();
-          widget.options.display = 'full';
+          widget.setDisplay('full');
         }
-        widget._trigger('statechange', null, widget.options);
       });
 
-      this._setDisplay(this.options.display);
-
-      widget = this;
-
       jQuery(this.element).bind('midgardcreatestatechange', function (event, options) {
         if (options.state == 'browse') {
           widget._clearWorkflows();
@@ -2739,17 +2740,22 @@
       });
     },
 
-    _setOption: function (key, value) {
-      if (key === 'display') {
-        this._setDisplay(value);
-      }
-      this.options[key] = value;
+    _init: function () {
+      this.setDisplay(this.options.display);
     },
 
-    _setDisplay: function (value) {
+    setDisplay: function (value) {
+      if (value === this.options.display) {
+        return;
+      }
       if (value === 'minimized') {
-        jQuery('div.create-ui-toolbar-wrapper').hide();
-      } 
+        this.hide();
+        this.options.display = 'minimized';
+      } else {
+        this.show();
+        this.options.display = 'full';
+      }
+      this._trigger('statechange', null, this.options);
     },
 
     hide: function () {

diff --git a/src/editingWidgets/jquery.Midgard.midgardEditableEditorHallo.js b/src/editingWidgets/jquery.Midgard.midgardEditableEditorHallo.js
@@ -26,12 +26,14 @@
       });
       this.options.disabled = false;
     },
+
     disable: function () {
       jQuery(this.element).hallo({
         editable: false
       });
       this.options.disabled = true;
     },
+
     _initialize: function () {
       jQuery(this.element).hallo(this.getHalloOptions());
       var self = this;

diff --git a/src/jquery.Midgard.midgardCreate.js b/src/jquery.Midgard.midgardCreate.js
@@ -196,6 +196,11 @@
       this._setEditButtonState(state);
     },
 
+    setToolbar: function (state) {
+      this.options.toolbar = state;
+      this.element.midgardToolbar('setDisplay', state);
+    },
+
     showNotification: function (options) {
       if (this.element.midgardNotifications) {
         return this.element.midgardNotifications('create', options);
@@ -230,7 +235,7 @@
 
       var toolbarID = this.options.storagePrefix + 'Midgard.create.toolbar';
       if (window.sessionStorage.getItem(toolbarID)) {
-        this._setOption('toolbar', window.sessionStorage.getItem(toolbarID));
+        this.setToolbar(window.sessionStorage.getItem(toolbarID));
       }
 
       var stateID = this.options.storagePrefix + 'Midgard.create.state';
@@ -298,10 +303,10 @@
     _enableToolbar: function () {
       var widget = this;
       this.element.bind('midgardtoolbarstatechange', function (event, options) {
+        widget.setToolbar(options.display);
         if (window.sessionStorage) {
           window.sessionStorage.setItem(widget.options.storagePrefix + 'Midgard.create.toolbar', options.display);
         }
-        widget._setOption('toolbar', options.display);
       });
 
       this.element.midgardToolbar({
@@ -314,7 +319,7 @@
       this._setOption('state', 'edit');
       var widget = this;
       var editableOptions = {
-        toolbarState: widget.options.display,
+        toolbarState: widget.options.toolbar,
         disabled: false,
         vie: widget.vie,
         widgets: widget.options.editorWidgets,

diff --git a/src/jquery.Midgard.midgardEditable.js b/src/jquery.Midgard.midgardEditable.js
@@ -231,6 +231,7 @@
       var editorWidget = this._editorWidget(editorName);
 
       data.editorOptions = this._editorOptions(editorName);
+      data.toolbarState = this.options.toolbarState;
       data.disabled = false;
 
       if (typeof jQuery(data.element)[editorWidget] !== 'function') {

diff --git a/src/jquery.Midgard.midgardToolbar.js b/src/jquery.Midgard.midgardToolbar.js
@@ -26,19 +26,12 @@
       var widget = this;
       jQuery('.create-ui-toggle', this.element).click(function () {
         if (widget.options.display === 'full') {
-          widget.hide();
-          widget.options.display = 'minimized';
+          widget.setDisplay('minimized');
         } else {
-          widget.show();
-          widget.options.display = 'full';
+          widget.setDisplay('full');
         }
-        widget._trigger('statechange', null, widget.options);
       });
 
-      this._setDisplay(this.options.display);
-
-      widget = this;
-
       jQuery(this.element).bind('midgardcreatestatechange', function (event, options) {
         if (options.state == 'browse') {
           widget._clearWorkflows();
@@ -62,17 +55,22 @@
       });
     },
 
-    _setOption: function (key, value) {
-      if (key === 'display') {
-        this._setDisplay(value);
-      }
-      this.options[key] = value;
+    _init: function () {
+      this.setDisplay(this.options.display);
     },
 
-    _setDisplay: function (value) {
+    setDisplay: function (value) {
+      if (value === this.options.display) {
+        return;
+      }
       if (value === 'minimized') {
-        jQuery('div.create-ui-toolbar-wrapper').hide();
-      } 
+        this.hide();
+        this.options.display = 'minimized';
+      } else {
+        this.show();
+        this.options.display = 'full';
+      }
+      this._trigger('statechange', null, this.options);
     },
 
     hide: function () {