properly strip comments/text nodes

partially fixes #81 (except named templates)
rniemeyer · Jan 8, 2014 · 603902a · 603902a
1 parent ca9225c
commit 603902a
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 11 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
  "name": "knockout-sortable",
- "version": "0.8.4",
+ "version": "0.8.5",
  "main": "./build/knockout-sortable.min.js",
  "ignore": [
  "examples",

diff --git a/build/knockout-sortable.js b/build/knockout-sortable.js
@@ -1,4 +1,4 @@
-// knockout-sortable 0.8.4 | (c) 2013 Ryan Niemeyer | http://www.opensource.org/licenses/mit-license
+// knockout-sortable 0.8.5 | (c) 2014 Ryan Niemeyer | http://www.opensource.org/licenses/mit-license
 ;(function(factory) {
  if (typeof define === "function" && define.amd) {
  // AMD anonymous module
@@ -88,9 +88,9 @@
  startActual, updateActual;
 
  //remove leading/trailing non-elements from anonymous templates
- ko.utils.arrayForEach(element.childNodes, function(node) {
- if (node && node.nodeType !== 1) {
- node.parentNode.removeChild(node);
+ $element.contents().each(function() {
+ if (this && this.nodeType !== 1) {
+ element.removeChild(this);
  }
  });
 

diff --git a/build/knockout-sortable.min.js b/build/knockout-sortable.min.js
diff --git a/examples/singleList.html b/examples/singleList.html
@@ -74,6 +74,7 @@
  <div id="main">
  <h3>Tasks</h3>
  <div class="container" data-bind="sortable: tasks">
+ <!-- leading comment -->
  <div class="item">
  <span data-bind="visible: !$root.isTaskSelected($data)">
  <a href="#" data-bind="text: name, click: $root.selectedTask"></a>
@@ -82,6 +83,7 @@ <h3>Tasks</h3>
  <input data-bind="value: name, event: { blur: $root.clearTask }" />
  </span> 
  </div>
+ <!-- trailing comment -->
  </div>
  <a href="#" data-bind="click: addTask">Add Task</a>
  </div>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "knockout-sortable",
- "version": "0.8.4",
+ "version": "0.8.5",
  "devDependencies": {
  "grunt": "~0.4.1",
  "grunt-contrib-uglify": "0.x.x",

diff --git a/src/knockout-sortable.js b/src/knockout-sortable.js
@@ -87,9 +87,9 @@
  startActual, updateActual;
 
  //remove leading/trailing non-elements from anonymous templates
- ko.utils.arrayForEach(element.childNodes, function(node) {
- if (node && node.nodeType !== 1) {
- node.parentNode.removeChild(node);
+ $element.contents().each(function() {
+ if (this && this.nodeType !== 1) {
+ element.removeChild(this);
  }
  });