Remove elements before innerHTML is set for IE

walmartlabs · Dec 21, 2012 · 4622c4e · 4622c4e
1 parent c4d5692
commit 4622c4e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/helpers/element.js b/src/helpers/element.js
@@ -13,9 +13,11 @@ Handlebars.registerHelper('element', function(element, options) {
 // IE will lose a reference to the elements if view.el.innerHTML = '';
 // If they are removed one by one the references are not lost
 Thorax.View.on('before:append', function() {
-  _.each(this._elementsByCid, function(element, cid) {
-    $(element).remove();
-  });
+  if (this._renderCount > 0) {
+    _.each(this._elementsByCid, function(element, cid) {
+      $(element).remove();
+    });
+  }
 });
 
 Thorax.View.on('append', function(scope, callback) {

diff --git a/src/helpers/view.js b/src/helpers/view.js
@@ -23,6 +23,16 @@ Handlebars.registerHelper('view', function(view, options) {
   return new Handlebars.SafeString(Thorax.Util.tag(htmlAttributes, undefined, expandTokens ? this : null));
 });
 
+// IE will lose a reference to the elements if view.el.innerHTML = '';
+// If they are removed one by one the references are not lost
+Thorax.View.on('before:append', function() {
+  if (this._renderCount > 0) {
+    _.each(this.children, function(child, cid) {
+      child.$el.remove();
+    });
+  }
+});
+
 Thorax.View.on('append', function(scope, callback) {
   (scope || this.$el).find('[' + viewPlaceholderAttributeName + ']').forEach(function(el) {
     var placeholderId = el.getAttribute(viewPlaceholderAttributeName),