Create separate List#renderItems for use in setValue since render her…

…e was creating an orphaned el (Resolves powmedia#282)
bpardee · Dec 19, 2013 · c1e61f8 · c1e61f8
1 parent 169def7
commit c1e61f8
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 38 deletions.
diff --git a/distribution.amd/editors/list.js b/distribution.amd/editors/list.js
@@ -50,15 +50,31 @@ define(['jquery', 'underscore', 'backbone', 'backbone-forms'], function($, _, Ba
     },
 
     render: function() {
-      var self = this,
-          value = this.value || [];
-
       //Create main element
       var $el = $($.trim(this.template()));
 
       //Store a reference to the list (item container)
       this.$list = $el.is('[data-items]') ? $el : $el.find('[data-items]');
 
+      this.renderItems();
+
+      this.setElement($el);
+      this.$el.attr('id', this.id);
+      this.$el.attr('name', this.key);
+
+      if (this.hasFocus) this.trigger('blur', this);
+
+      return this;
+    },
+
+    renderItems: function() {
+      var self = this,
+          value = this.value || [];
+
+      // Remove any old items
+      this.items = [];
+      this.$list.empty();
+
       //Add existing items
       if (value.length) {
         _.each(value, function(itemValue) {
@@ -70,14 +86,6 @@ define(['jquery', 'underscore', 'backbone', 'backbone-forms'], function($, _, Ba
       else {
         if (!this.Editor.isAsync) this.addItem();
       }
-
-      this.setElement($el);
-      this.$el.attr('id', this.id);
-      this.$el.attr('name', this.key);
-
-      if (this.hasFocus) this.trigger('blur', this);
-
-      return this;
     },
 
     /**
@@ -194,7 +202,7 @@ define(['jquery', 'underscore', 'backbone', 'backbone-forms'], function($, _, Ba
 
     setValue: function(value) {
       this.value = value;
-      this.render();
+      this.renderItems();
     },
 
     focus: function() {

diff --git a/distribution.amd/editors/list.min.js b/distribution.amd/editors/list.min.js
diff --git a/distribution/editors/list.js b/distribution/editors/list.js
@@ -48,15 +48,31 @@
     },
 
     render: function() {
-      var self = this,
-          value = this.value || [];
-
       //Create main element
       var $el = $($.trim(this.template()));
 
       //Store a reference to the list (item container)
       this.$list = $el.is('[data-items]') ? $el : $el.find('[data-items]');
 
+      this.renderItems();
+
+      this.setElement($el);
+      this.$el.attr('id', this.id);
+      this.$el.attr('name', this.key);
+
+      if (this.hasFocus) this.trigger('blur', this);
+
+      return this;
+    },
+
+    renderItems: function() {
+      var self = this,
+          value = this.value || [];
+
+      // Remove any old items
+      this.items = [];
+      this.$list.empty();
+
       //Add existing items
       if (value.length) {
         _.each(value, function(itemValue) {
@@ -68,14 +84,6 @@
       else {
         if (!this.Editor.isAsync) this.addItem();
       }
-
-      this.setElement($el);
-      this.$el.attr('id', this.id);
-      this.$el.attr('name', this.key);
-
-      if (this.hasFocus) this.trigger('blur', this);
-
-      return this;
     },
 
     /**
@@ -192,7 +200,7 @@
 
     setValue: function(value) {
       this.value = value;
-      this.render();
+      this.renderItems();
     },
 
     focus: function() {