Merge branch 'refs/heads/Ninja-Internal' into Color

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 @@
         },
 
         "owner": {
-            "module": "youtube-channel.reel",
             "name": "YoutubeChannel",
             "properties": {
                 "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, {
 
     draw: {
         value: function() {
+            var self = this;
+
             if (this._script) {
                 if(this.element.childNodes.length < 1) {
                     this._savedReference.appendChild(this._script);
@@ -135,9 +137,9 @@ var YoutubeChannel = exports.YoutubeChannel = Montage.create(Component, {
             }
 
             if (this._entries) {
-                this.imageA.src = this._entries[0]["media$group"]["media$thumbnail"][0].url;
-                this.imageB.src = this._entries[1]["media$group"]["media$thumbnail"][0].url;
-                this.imageC.src = this._entries[2]["media$group"]["media$thumbnail"][0].url;
+                this.imageA.src = (this._entries[0]) ? this._entries[0]["media$group"]["media$thumbnail"][0].url : "";
+                this.imageB.src = (this._entries[1]) ? this._entries[1]["media$group"]["media$thumbnail"][0].url : "";
+                this.imageC.src = (this._entries[2]) ? this._entries[2]["media$group"]["media$thumbnail"][0].url : "";
             }
 
             if (this._videoId) {
@@ -145,8 +147,6 @@ var YoutubeChannel = exports.YoutubeChannel = Montage.create(Component, {
                 this._videoId = null;
             }
 
-            var self = this;
-
             if (this._shouldShowPopup) {
                 this._positionPopup();