diff options
author | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
commit | 48a2a800155fd2d608fb7191c0180cd8f625cd44 (patch) | |
tree | 899f9cf1b09a01bc073f92ab498236aed80b38ec /node_modules/montage/ui/scroller.reel/scroller.js | |
parent | 2ea8a62835f4c20efff2623306e7205e6f5bf0ba (diff) | |
parent | d220c02e246b30509b28a47fa04916ca2b8122e4 (diff) | |
download | ninja-48a2a800155fd2d608fb7191c0180cd8f625cd44.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/scroller.reel/scroller.js')
-rw-r--r-- | node_modules/montage/ui/scroller.reel/scroller.js | 21 |
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 () { |