diff options
author | Eric Guzman | 2012-05-17 17:43:05 -0700 |
---|---|---|
committer | Eric Guzman | 2012-05-17 17:43:05 -0700 |
commit | 458a4598ed64e3d8c6010a216fb7fb4b3c3c87e7 (patch) | |
tree | ee329e409fe28ae54c894b9e27e82e1f85aefc85 /node_modules/montage/ui/scroller.reel | |
parent | 82954f400f7f8609aef0d2bc1f44c9d960907be6 (diff) | |
parent | 52394cdd71bd62c8c109fd135fa146b7183fbd1f (diff) | |
download | ninja-458a4598ed64e3d8c6010a216fb7fb4b3c3c87e7.tar.gz |
Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates
Conflicts:
js/document/templates/montage-html/default_html.css
js/lib/NJUtils.js
Diffstat (limited to 'node_modules/montage/ui/scroller.reel')
-rw-r--r-- | node_modules/montage/ui/scroller.reel/scroller.html | 9 | ||||
-rw-r--r-- | node_modules/montage/ui/scroller.reel/scroller.js | 20 |
2 files changed, 9 insertions, 20 deletions
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 @@ | |||
44 | } | 44 | } |
45 | ] | 45 | ] |
46 | }, | 46 | }, |
47 | "slot": { | ||
48 | "prototype": "montage/ui/slot.reel", | ||
49 | "properties": { | ||
50 | "element": {"#": "content"} | ||
51 | }, | ||
52 | "bindings": { | ||
53 | "domContent": {"<-": "@owner.domContent"} | ||
54 | } | ||
55 | }, | ||
47 | "owner": { | 56 | "owner": { |
48 | "prototype": "montage/ui/scroller.reel", | 57 | "prototype": "montage/ui/scroller.reel", |
49 | "properties": { | 58 | "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, { | |||
101 | } | 101 | } |
102 | }, | 102 | }, |
103 | 103 | ||
104 | _content: { | ||
105 | enumerable: false, | ||
106 | value: null | ||
107 | }, | ||
108 | |||
109 | templateDidLoad: { | ||
110 | value: function () { | ||
111 | var orphanedFragment = document.createDocumentFragment(), | ||
112 | children = this.element.childNodes; | ||
113 | |||
114 | |||
115 | while (children.length > 0) { | ||
116 | // As the nodes are appended to item.fragment they are removed | ||
117 | // from item.element, so always use index 0. | ||
118 | orphanedFragment.appendChild(children[0]); | ||
119 | } | ||
120 | this._content.appendChild(orphanedFragment); | ||
121 | } | ||
122 | }, | ||
123 | |||
124 | handleTranslateStart: { | 104 | handleTranslateStart: { |
125 | value: function(event) { | 105 | value: function(event) { |
126 | this._scrollBars.opacity = 0.5; | 106 | this._scrollBars.opacity = 0.5; |