From 13ae16997d4bbca14e255d5989d1c44a76eac72c Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Wed, 16 May 2012 15:23:48 -0700
Subject: montage v.0.10 integration

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 node_modules/montage/ui/scroller.reel/scroller.html |  9 +++++++++
 node_modules/montage/ui/scroller.reel/scroller.js   | 20 --------------------
 2 files changed, 9 insertions(+), 20 deletions(-)

(limited to 'node_modules/montage/ui/scroller.reel')

diff --git a/node_modules/montage/ui/scroller.reel/scroller.html b/node_modules/montage/ui/scroller.reel/scroller.html
index 1663c26b..a0913331 100644
--- a/node_modules/montage/ui/scroller.reel/scroller.html
+++ b/node_modules/montage/ui/scroller.reel/scroller.html
@@ -44,6 +44,15 @@
                     }
                 ]
             },
+            "slot": {
+                "prototype": "montage/ui/slot.reel",
+                "properties": {
+                    "element": {"#": "content"}
+                },
+                "bindings": {
+                    "domContent": {"<-": "@owner.domContent"}
+                }
+            },
             "owner": {
                 "prototype": "montage/ui/scroller.reel",
                 "properties": {
diff --git a/node_modules/montage/ui/scroller.reel/scroller.js b/node_modules/montage/ui/scroller.reel/scroller.js
index 87218aeb..afb9c674 100644
--- a/node_modules/montage/ui/scroller.reel/scroller.js
+++ b/node_modules/montage/ui/scroller.reel/scroller.js
@@ -101,26 +101,6 @@ exports.Scroller = Montage.create(Component, {
         }
     },
 
-    _content: {
-        enumerable: false,
-        value: null
-    },
-
-    templateDidLoad: {
-        value: function () {
-            var orphanedFragment = document.createDocumentFragment(),
-                children = this.element.childNodes;
-
-
-            while (children.length > 0) {
-                // As the nodes are appended to item.fragment they are removed
-                // from item.element, so always use index 0.
-                orphanedFragment.appendChild(children[0]);
-            }
-            this._content.appendChild(orphanedFragment);
-        }
-    },
-
     handleTranslateStart: {
         value: function(event) {
             this._scrollBars.opacity = 0.5;
-- 
cgit v1.2.3