Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal

2 files changed, 26 insertions, 18 deletions

diff --git a/node_modules/montage/ui/scroller.reel/scroller.html b/node_modules/montage/ui/scroller.reel/scroller.html
index a0913331..0b525746 100644
--- a/node_modules/montage/ui/scroller.reel/scroller.html
+++ b/node_modules/montage/ui/scroller.reel/scroller.html
@@ -10,7 +10,7 @@
     <script type="text/montage-serialization">{
 
             "scrollbars": {
-                "prototype": "montage/ui/scroll-bars.reel",
+                "prototype": "ui/scroll-bars.reel",
                 "properties": {
                     "element": {
                         "#": "scrollbars"
@@ -18,7 +18,7 @@
                 }
             },
             "translateComposer1": {
-                "prototype": "montage/ui/composer/translate-composer",
+                "prototype": "ui/composer/translate-composer",
                 "properties": {
                     "component": {"@": "owner"},
                     "minTranslateX": 0,
@@ -26,8 +26,8 @@
                     "invertAxis": true
                 },
                 "bindings": {
-                    "translateX": {"<<->": "@owner.scrollX"},
-                    "translateY": {"<<->": "@owner.scrollY"},
+                    "translateX": {"<->": "@owner.scrollX"},
+                    "translateY": {"<->": "@owner.scrollY"},
                     "maxTranslateX": {"<-": "@owner._maxTranslateX"},
                     "maxTranslateY": {"<-": "@owner._maxTranslateY"},
                     "axis": {"<-": "@owner.axis"},
@@ -45,7 +45,7 @@
                 ]
             },
             "slot": {
-                "prototype": "montage/ui/slot.reel",
+                "prototype": "ui/slot.reel",
                 "properties": {
                     "element": {"#": "content"}
                 },
@@ -54,7 +54,7 @@
                 }
             },
             "owner": {
-                "prototype": "montage/ui/scroller.reel",
+                "prototype": "ui/scroller.reel",
                 "properties": {
                     "_content": {
                         "#": "content"
diff --git a/node_modules/montage/ui/scroller.reel/scroller.js b/node_modules/montage/ui/scroller.reel/scroller.js
index afb9c674..4661f60a 100644
--- a/node_modules/montage/ui/scroller.reel/scroller.js
+++ b/node_modules/montage/ui/scroller.reel/scroller.js
@@ -10,7 +10,6 @@ var Montage = require("montage").Montage,
 exports.Scroller = Montage.create(Component, {
 
     _scrollX: {
-        enumerable: false,
         value: 0
     },
 
@@ -21,11 +20,11 @@ exports.Scroller = Montage.create(Component, {
         set: function (value) {
             this._scrollX = value;
             this.needsDraw = true;
-        }
+        },
+        serializable: true
     },
 
     _scrollY: {
-        enumerable: false,
         value: 0
     },
 
@@ -36,7 +35,8 @@ exports.Scroller = Montage.create(Component, {
         set: function (value) {
             this._scrollY = value;
             this.needsDraw = true;
-        }
+        },
+        serializable: true
     },
 
     _maxTranslateX: {
@@ -48,7 +48,6 @@ exports.Scroller = Montage.create(Component, {
     },
 
     _axis: {
-        enumerable: false,
         value: "auto"
     },
 
@@ -59,11 +58,11 @@ exports.Scroller = Montage.create(Component, {
         set: function (value) {
             this._axis = value;
             this.needsDraw = true;
-        }
+        },
+        serializable: true
     },
 
     _displayScrollbars: {
-        enumerable: false,
         value: "auto"
     },
 
@@ -84,11 +83,11 @@ exports.Scroller = Montage.create(Component, {
                     break;
             }
             this.needsDraw = true;
-        }
+        },
+        serializable: true
     },
 
     _hasMomentum: {
-        enumerable: false,
         value: true
     },
 
@@ -98,7 +97,18 @@ exports.Scroller = Montage.create(Component, {
         },
         set: function (value) {
             this._hasMomentum = value;
-        }
+        },
+        serializable: true
+    },
+
+    _content: {
+        value: null,
+        serializable: true
+    },
+
+    _scrollBars: {
+        value: null,
+        serializable: true
     },
 
     handleTranslateStart: {
@@ -121,7 +131,6 @@ exports.Scroller = Montage.create(Component, {
     },
 
     willDraw: {
-        enumerable: false,
         value: function () {
             this._left = this._element.offsetLeft;
             this._top = this._element.offsetTop;
@@ -187,7 +196,6 @@ exports.Scroller = Montage.create(Component, {
     },
 
     draw: {
-        enumerable: false,
         value: function () {
             this._content.style.webkitTransform="translate3d("+(-this._scrollX)+"px, "+(-this._scrollY)+"px, 0)";
         }