aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/ui/scroller.reel/scroller.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-03 22:53:07 -0700
committerValerio Virgillito2012-05-03 22:53:07 -0700
commit24b483db367291b72170f969de78efcb1a9b95bd (patch)
treea691a7803cefbfa76a6331a50cbeebcd16287d91 /node_modules/montage/ui/scroller.reel/scroller.js
parentdc93269cfa7c315d22d85c8217e2412749643f28 (diff)
downloadninja-24b483db367291b72170f969de78efcb1a9b95bd.tar.gz
integrating the latest montage version
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/scroller.reel/scroller.js')
-rw-r--r--node_modules/montage/ui/scroller.reel/scroller.js21
1 files changed, 7 insertions, 14 deletions
diff --git a/node_modules/montage/ui/scroller.reel/scroller.js b/node_modules/montage/ui/scroller.reel/scroller.js
index 8c367cd1..87218aeb 100644
--- a/node_modules/montage/ui/scroller.reel/scroller.js
+++ b/node_modules/montage/ui/scroller.reel/scroller.js
@@ -101,20 +101,6 @@ exports.Scroller = Montage.create(Component, {
101 } 101 }
102 }, 102 },
103 103
104 _hasBouncing: {
105 enumerable: false,
106 value: true
107 },
108
109 hasBouncing: {
110 get: function () {
111 return this._hasBouncing;
112 },
113 set: function (value) {
114 this._hasBouncing = value;
115 }
116 },
117
118 _content: { 104 _content: {
119 enumerable: false, 105 enumerable: false,
120 value: null 106 value: null
@@ -147,6 +133,13 @@ exports.Scroller = Montage.create(Component, {
147 } 133 }
148 }, 134 },
149 135
136 canDraw: {
137 value: function() {
138 this.needsDraw = true;
139 return Component.canDraw.apply(this, arguments);
140 }
141 },
142
150 willDraw: { 143 willDraw: {
151 enumerable: false, 144 enumerable: false,
152 value: function () { 145 value: function () {