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

2 files changed, 7 insertions, 5 deletions

diff --git a/node_modules/montage/ui/bluemoon/progress.reel/progress.html b/node_modules/montage/ui/bluemoon/progress.reel/progress.html
index 53ff4ab3..a3835fe6 100644
--- a/node_modules/montage/ui/bluemoon/progress.reel/progress.html
+++ b/node_modules/montage/ui/bluemoon/progress.reel/progress.html
@@ -11,7 +11,6 @@
     <script type="text/montage-serialization">
 {
     "owner": {
-        "prototype": "montage/ui/bluemoon/progress.reel",
         "properties": {
             "element": {"#": "progress"},
             "_barElement": {"#": "bar"}
diff --git a/node_modules/montage/ui/bluemoon/progress.reel/progress.js b/node_modules/montage/ui/bluemoon/progress.reel/progress.js
index 20c60d94..d7661445 100644
--- a/node_modules/montage/ui/bluemoon/progress.reel/progress.js
+++ b/node_modules/montage/ui/bluemoon/progress.reel/progress.js
@@ -20,7 +20,7 @@ exports.Progress = Montage.create(Component,/** @lends module:"montage/ui/bluemo
   @private
 */
     _barElement: {
-        enumerable: false,
+        serializable: true,
         value: null
     },
 /**
@@ -51,7 +51,8 @@ exports.Progress = Montage.create(Component,/** @lends module:"montage/ui/bluemo
                 }
                 this.needsDraw = true;
             }
-        }
+        },
+        serializable: true
     },
 /**
   Description TODO
@@ -78,7 +79,8 @@ exports.Progress = Montage.create(Component,/** @lends module:"montage/ui/bluemo
                 }
                 this.needsDraw = true;
             }
-        }
+        },
+        serializable: true
     },
 /**
   Description TODO
@@ -111,7 +113,8 @@ exports.Progress = Montage.create(Component,/** @lends module:"montage/ui/bluemo
                 this._scrolling = value;
                 this.needsDraw = true;
             }
-        }
+        },
+        serializable: true
     },
 /**
     Description TODO