Inclusive morph

package.json

@@ -21,7 +21,7 @@
     "express": "^4.5.0",
     "github": "^0.2.3",
     "glob": "~4.3.2",
-    "htmlbars": "0.10.0",
+    "htmlbars": "0.11.0",
     "qunit-extras": "^1.3.0",
     "qunitjs": "^1.16.0",
     "route-recognizer": "0.1.5",

packages/ember-metal-views/lib/renderer.js

@@ -17,10 +17,9 @@ function Renderer(_helper, _destinedForDOM) {
   this._destinedForDOM = _destinedForDOM === undefined ? true : _destinedForDOM;
 }
 
-function Renderer_renderTree(_view, _parentView, _insertAt) {
+function Renderer_renderTree(_view, _parentView, _refMorph) {
   var views = this._views;
   views[0] = _view;
-  var insertAt = _insertAt === undefined ? -1 : _insertAt;
   var index = 0;
   var total = 1;
   var levelBase = _parentView ? _parentView._level+1 : 0;
@@ -114,15 +113,15 @@ function Renderer_renderTree(_view, _parentView, _insertAt) {
 
       parentIndex = parents[level];
       parent = parentIndex === -1 ? _parentView : views[parentIndex];
-      this.insertElement(view, parent, element, -1);
+      this.insertElement(view, parent, element, null);
       index = queue[--length];
       view = views[index];
       element = elements[level];
       elements[level] = null;
     }
   }
 
-  this.insertElement(view, _parentView, element, insertAt);
+  this.insertElement(view, _parentView, element, _refMorph);
 
   for (i=total-1; i>=0; i--) {
     if (willInsert) {
@@ -171,7 +170,12 @@ Renderer.prototype.appendAttrTo =
 
 Renderer.prototype.replaceIn =
   function Renderer_replaceIn(view, target) {
-    var morph = this._dom.createMorph(target, null, null);
+    var morph;
+    if (target.firstNode) {
+      morph = this._dom.createMorph(target, target.firstNode, target.lastNode);
+    } else {
+      morph = this._dom.appendMorph(target);
+    }
     this.scheduleInsert(view, morph);
   };
 
@@ -244,19 +248,15 @@ function Renderer_remove(_view, shouldDestroy, reset) {
   }
 }
 
-function Renderer_insertElement(view, parentView, element, index) {
+function Renderer_insertElement(view, parentView, element, refMorph) {
   if (element === null || element === undefined) {
     return;
   }
 
   if (view._morph) {
     view._morph.setContent(element);
   } else if (parentView) {
-    if (index === -1) {
-      view._morph = parentView._childViewsMorph.append(element);
-    } else {
-      view._morph = parentView._childViewsMorph.insert(index, element);
-    }
+    view._morph = parentView._childViewsMorph.insertContentBeforeMorph(element, refMorph);
   }
 }
 

packages/ember-metal-views/tests/test_helpers.js

@@ -47,15 +47,13 @@ MetalRenderer.prototype.createElement = function (view, contextualElement) {
     }
   }
   if (view.childViews) {
-    view._childViewsMorph = this._dom.createMorph(el, null, null);
+    view._childViewsMorph = this._dom.appendMorph(el);
   } else if (view.textContent) {
     setElementText(el, view.textContent);
   } else if (view.innerHTML) {
     this._dom.detectNamespace(el);
-    var nodes = this._dom.parseHTML(view.innerHTML, el);
-    while (nodes[0]) {
-      el.appendChild(nodes[0]);
-    }
+    var frag = this._dom.parseHTML(view.innerHTML, el);
+    el.appendChild(frag);
   }
   return el;
 };

packages/ember-routing-htmlbars/lib/helpers/link-to.js

@@ -302,7 +302,7 @@ function linkToHelper(params, hash, options, env) {
 
   if (!options.template) {
     var linkTitle = params.shift();
-    var shouldEscape = options.morph.escaped;
+    var parseTextAsHTML = options.morph.parseTextAsHTML;
 
     if (isStream(linkTitle)) {
       hash.linkTitle = { stream: linkTitle };
@@ -312,10 +312,10 @@ function linkToHelper(params, hash, options, env) {
       isHTMLBars: true,
       render: function(view, env) {
         var value = read(linkTitle) || "";
-        if (shouldEscape) {
-          return env.dom.createTextNode(value);
-        } else {
+        if (parseTextAsHTML) {
           return value;
+        } else {
+          return env.dom.createTextNode(value);
         }
       }
     };

packages/ember-views/lib/system/render_buffer.js

@@ -528,11 +528,8 @@ RenderBuffer.prototype = {
     if (content.nodeType) {
       this._element.appendChild(content);
     } else {
-      var nodes;
-      nodes = this.dom.parseHTML(content, contextualElement);
-      while (nodes[0]) {
-        this._element.appendChild(nodes[0]);
-      }
+      var frag = this.dom.parseHTML(content, contextualElement);
+      this._element.appendChild(frag);
     }
 
     // This should only happen with legacy string buffers

packages/ember-views/lib/system/utils.js

@@ -17,8 +17,8 @@ export function isSimpleClick(event) {
 */
 function getViewRange(view) {
   var range = document.createRange();
-  range.setStartAfter(view._morph.start);
-  range.setEndBefore(view._morph.end);
+  range.setStartBefore(view._morph.firstNode);
+  range.setEndAfter(view._morph.lastNode);
   return range;
 }
 

packages/ember-views/lib/views/container_view.js

@@ -272,7 +272,7 @@ var ContainerView = View.extend(MutableArray, {
       buffer._element = element;
       this._childViewsMorph = dom.appendMorph(element, this._morph.contextualElement);
     } else {
-      this._childViewsMorph = dom.createMorph(element, element.lastChild, null);
+      this._childViewsMorph = dom.appendMorph(element);
     }
 
     return element;
@@ -395,12 +395,13 @@ merge(states.hasElement, {
     var childViews = view._childViews;
     var renderer = view._renderer;
 
-    var i, len, childView;
-    for (i = 0, len = childViews.length; i < len; i++) {
-      childView = childViews[i];
+    var refMorph = null;
+    for (var i = childViews.length-1; i >= 0; i--) {
+      var childView = childViews[i];
       if (!childView._elementCreated) {
-        renderer.renderTree(childView, view, i);
+        renderer.renderTree(childView, view, refMorph);
       }
+      refMorph = childView._morph;
     }
   }
 });

packages/ember-views/tests/views/container_view_test.js

@@ -263,7 +263,7 @@ QUnit.test("views that are removed from a ContainerView should have their child
     container.removeObject(view);
   });
   equal(get(view, 'childViews.length'), 0, "child views are cleared when removed from container view");
-  equal(container.$().html(), '', "the child view is removed from the DOM");
+  equal(container.$().text(), '', "the child view is removed from the DOM");
 });
 
 QUnit.test("if a ContainerView starts with an empty currentView, nothing is displayed", function() {