diff options
author | hwc487 | 2012-06-28 12:17:22 -0700 |
---|---|---|
committer | hwc487 | 2012-06-28 12:17:22 -0700 |
commit | 230b3d0fdfd29e998b82fef9f1ff5d2ca7ef8596 (patch) | |
tree | 133be243b24260f831252f347ed66f24e2b78136 /node_modules/montage-google/youtube-channel.reel | |
parent | 22cbc9644b79df60b3f6336f9563debd47fb3ea1 (diff) | |
parent | 56d6311f398e04eee3883a5c848fec3b2b53c981 (diff) | |
download | ninja-230b3d0fdfd29e998b82fef9f1ff5d2ca7ef8596.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Taper
Diffstat (limited to 'node_modules/montage-google/youtube-channel.reel')
-rw-r--r-- | node_modules/montage-google/youtube-channel.reel/youtube-channel.html | 1 | ||||
-rw-r--r-- | node_modules/montage-google/youtube-channel.reel/youtube-channel.js | 10 |
2 files changed, 5 insertions, 6 deletions
diff --git a/node_modules/montage-google/youtube-channel.reel/youtube-channel.html b/node_modules/montage-google/youtube-channel.reel/youtube-channel.html index 112fda72..01cc42f3 100644 --- a/node_modules/montage-google/youtube-channel.reel/youtube-channel.html +++ b/node_modules/montage-google/youtube-channel.reel/youtube-channel.html | |||
@@ -41,7 +41,6 @@ | |||
41 | }, | 41 | }, |
42 | 42 | ||
43 | "owner": { | 43 | "owner": { |
44 | "module": "youtube-channel.reel", | ||
45 | "name": "YoutubeChannel", | 44 | "name": "YoutubeChannel", |
46 | "properties": { | 45 | "properties": { |
47 | "element": {"#": "container"}, | 46 | "element": {"#": "container"}, |
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 ca08564b..95cd336a 100644 --- a/node_modules/montage-google/youtube-channel.reel/youtube-channel.js +++ b/node_modules/montage-google/youtube-channel.reel/youtube-channel.js | |||
@@ -124,6 +124,8 @@ var YoutubeChannel = exports.YoutubeChannel = Montage.create(Component, { | |||
124 | 124 | ||
125 | draw: { | 125 | draw: { |
126 | value: function() { | 126 | value: function() { |
127 | var self = this; | ||
128 | |||
127 | if (this._script) { | 129 | if (this._script) { |
128 | if(this.element.childNodes.length < 1) { | 130 | if(this.element.childNodes.length < 1) { |
129 | this._savedReference.appendChild(this._script); | 131 | this._savedReference.appendChild(this._script); |
@@ -135,9 +137,9 @@ var YoutubeChannel = exports.YoutubeChannel = Montage.create(Component, { | |||
135 | } | 137 | } |
136 | 138 | ||
137 | if (this._entries) { | 139 | if (this._entries) { |
138 | this.imageA.src = this._entries[0]["media$group"]["media$thumbnail"][0].url; | 140 | this.imageA.src = (this._entries[0]) ? this._entries[0]["media$group"]["media$thumbnail"][0].url : ""; |
139 | this.imageB.src = this._entries[1]["media$group"]["media$thumbnail"][0].url; | 141 | this.imageB.src = (this._entries[1]) ? this._entries[1]["media$group"]["media$thumbnail"][0].url : ""; |
140 | this.imageC.src = this._entries[2]["media$group"]["media$thumbnail"][0].url; | 142 | this.imageC.src = (this._entries[2]) ? this._entries[2]["media$group"]["media$thumbnail"][0].url : ""; |
141 | } | 143 | } |
142 | 144 | ||
143 | if (this._videoId) { | 145 | if (this._videoId) { |
@@ -145,8 +147,6 @@ var YoutubeChannel = exports.YoutubeChannel = Montage.create(Component, { | |||
145 | this._videoId = null; | 147 | this._videoId = null; |
146 | } | 148 | } |
147 | 149 | ||
148 | var self = this; | ||
149 | |||
150 | if (this._shouldShowPopup) { | 150 | if (this._shouldShowPopup) { |
151 | this._positionPopup(); | 151 | this._positionPopup(); |
152 | 152 | ||