Merge branch 'timeline-local' into timeline-multiselect

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	resolved using theirs. (selectLayers)

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, {
         }
     },
 
-    _hasBouncing: {
-        enumerable: false,
-        value: true
-    },
-
-    hasBouncing: {
-        get: function () {
-            return this._hasBouncing;
-        },
-        set: function (value) {
-            this._hasBouncing = value;
-        }
-    },
-
     _content: {
         enumerable: false,
         value: null
@@ -147,6 +133,13 @@ exports.Scroller = Montage.create(Component, {
         }
     },
 
+    canDraw: {
+        value: function() {
+            this.needsDraw = true;
+            return Component.canDraw.apply(this, arguments);
+        }
+    },
+
     willDraw: {
         enumerable: false,
         value: function () {