diff options
author | Pushkar Joshi | 2012-05-31 12:20:03 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-05-31 12:20:03 -0700 |
commit | 4bc52365b1f81a386c3c59fd7c6ad874bb387cb5 (patch) | |
tree | c5b17297aba04bd54a59cf6214d29486e089031b /node_modules/montage-google/youtube-channel.reel/youtube-channel.js | |
parent | 75a862d305bc4502e22bc5aa65fa271143b8cf6c (diff) | |
parent | 6042bdc5f2aada4412912fd01602d32c9088dc26 (diff) | |
download | ninja-4bc52365b1f81a386c3c59fd7c6ad874bb387cb5.tar.gz |
Merge branch 'master' into pentool
Diffstat (limited to 'node_modules/montage-google/youtube-channel.reel/youtube-channel.js')
-rw-r--r-- | node_modules/montage-google/youtube-channel.reel/youtube-channel.js | 19 |
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 @@ | |||
6 | /*global require,exports*/ | 6 | /*global require,exports*/ |
7 | var Montage = require("montage").Montage, | 7 | var Montage = require("montage").Montage, |
8 | Component = require("montage/ui/component").Component, | 8 | Component = require("montage/ui/component").Component, |
9 | Uuid = require("montage/core/Uuid"); | 9 | Uuid = require("montage/core/uuid"); |
10 | 10 | ||
11 | var YoutubeChannel = exports.YoutubeChannel = Montage.create(Component, { | 11 | var YoutubeChannel = exports.YoutubeChannel = Montage.create(Component, { |
12 | 12 | ||
13 | _userRe: { | 13 | _userRe: { |
14 | enumerable: false, | ||
15 | value: /youtube.com\/(user\/)?([a-z0-9]+)/i | 14 | value: /youtube.com\/(user\/)?([a-z0-9]+)/i |
16 | }, | 15 | }, |
17 | 16 | ||
18 | imageA: { | 17 | imageA: { |
19 | value: null | 18 | value: null |
20 | }, | 19 | }, |
20 | |||
21 | imageB: { | 21 | imageB: { |
22 | value: null | 22 | value: null |
23 | }, | 23 | }, |
24 | |||
24 | imageC: { | 25 | imageC: { |
25 | value: null | 26 | value: null |
26 | }, | 27 | }, |
28 | |||
27 | _popupElement: { | 29 | _popupElement: { |
28 | enumerable: false, | ||
29 | value: null | 30 | value: null |
30 | }, | 31 | }, |
31 | 32 | ||
32 | _shouldShowPopup: { | 33 | _shouldShowPopup: { |
33 | enumerable: false, | ||
34 | value: false | 34 | value: false |
35 | }, | 35 | }, |
36 | 36 | ||
37 | _channelUrl: { | 37 | _channelUrl: { |
38 | enumerable: false, | ||
39 | value: null | 38 | value: null |
40 | }, | 39 | }, |
40 | |||
41 | channelUrl: { | 41 | channelUrl: { |
42 | depends: ["channel"], | 42 | depends: ["channel"], |
43 | get: function() { | 43 | get: function() { |
@@ -237,6 +237,13 @@ var YoutubeChannel = exports.YoutubeChannel = Montage.create(Component, { | |||
237 | this._entries = data.feed.entry || []; | 237 | this._entries = data.feed.entry || []; |
238 | this.needsDraw = true; | 238 | this.needsDraw = true; |
239 | } | 239 | } |
240 | } | 240 | }, |
241 | 241 | ||
242 | serializeProperties: { | ||
243 | value: function(serializer) { | ||
244 | serializer.set("element", this.element); | ||
245 | serializer.set("channelUrl", this.channelUrl); | ||
246 | serializer.set("channel", this.channel); | ||
247 | } | ||
248 | } | ||
242 | }); \ No newline at end of file | 249 | }); \ No newline at end of file |