Call methods on widgets only after instantiation, refs #173

bergie · Apr 3, 2013 · 9db74dc · 9db74dc
1 parent d822837
commit 9db74dc
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/examples/create-min.js b/examples/create-min.js
diff --git a/examples/create.js b/examples/create.js
@@ -219,6 +219,10 @@
 
  setToolbar: function (state) {
  this.options.toolbar = state;
+ if (!this.element.data('Midgard-midgardToolbar')) {
+ // Toolbar not yet instantiated
+ return;
+ }
  this.element.midgardToolbar('setDisplay', state);
  },
 
@@ -1504,6 +1508,10 @@
  return;
  }
  self.options.toolbarState = data.display;
+ if (!self.element.data('IKS-hallo')) {
+ // Hallo not yet instantiated
+ return;
+ }
  var newOptions = self.getHalloOptions();
  self.element.hallo('changeToolbar', newOptions.parentElement, newOptions.toolbar, true);
  });

diff --git a/src/editingWidgets/jquery.Midgard.midgardEditableEditorHallo.js b/src/editingWidgets/jquery.Midgard.midgardEditableEditorHallo.js
@@ -54,6 +54,10 @@
  return;
  }
  self.options.toolbarState = data.display;
+ if (!self.element.data('IKS-hallo')) {
+ // Hallo not yet instantiated
+ return;
+ }
  var newOptions = self.getHalloOptions();
  self.element.hallo('changeToolbar', newOptions.parentElement, newOptions.toolbar, true);
  });

diff --git a/src/jquery.Midgard.midgardCreate.js b/src/jquery.Midgard.midgardCreate.js
@@ -219,6 +219,10 @@
 
  setToolbar: function (state) {
  this.options.toolbar = state;
+ if (!this.element.data('Midgard-midgardToolbar')) {
+ // Toolbar not yet instantiated
+ return;
+ }
  this.element.midgardToolbar('setDisplay', state);
  },