Merge branch 'master' into pentool

1 files changed, 13 insertions, 6 deletions

diff --git a/node_modules/montage-google/youtube-channel.reel/youtube-channel.js b/node_modules/montage-google/youtube-channel.reel/youtube-channel.js
index 88f87f3c..18ea7923 100644
--- a/node_modules/montage-google/youtube-channel.reel/youtube-channel.js
+++ b/node_modules/montage-google/youtube-channel.reel/youtube-channel.js
@@ -6,38 +6,38 @@
 /*global require,exports*/
 var Montage = require("montage").Montage,
     Component = require("montage/ui/component").Component,
-    Uuid = require("montage/core/Uuid");
+    Uuid = require("montage/core/uuid");
 
 var YoutubeChannel = exports.YoutubeChannel = Montage.create(Component, {
 
     _userRe: {
-        enumerable: false,
         value: /youtube.com\/(user\/)?([a-z0-9]+)/i
     },
 
     imageA: {
         value: null
     },
+
     imageB: {
         value: null
     },
+
     imageC: {
         value: null
     },
+
     _popupElement: {
-        enumerable: false,
         value: null
     },
 
     _shouldShowPopup: {
-        enumerable: false,
         value: false
     },
 
     _channelUrl: {
-        enumerable: false,
         value: null
     },
+
     channelUrl: {
         depends: ["channel"],
         get: function() {
@@ -237,6 +237,13 @@ var YoutubeChannel = exports.YoutubeChannel = Montage.create(Component, {
             this._entries = data.feed.entry || [];
             this.needsDraw = true;
         }
-    }
+    },
 
+    serializeProperties: {
+        value: function(serializer) {
+            serializer.set("element", this.element);
+            serializer.set("channelUrl", this.channelUrl);
+            serializer.set("channel", this.channel);
+        }
+    }
 });
\ No newline at end of file