aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-26 15:41:00 -0700
committerValerio Virgillito2012-06-26 15:41:00 -0700
commitcd2d380b1f75bf310c2a8c62e2ec4e3d6f4e39f8 (patch)
treeec31352880650f53097d3203a6c96a7938566174
parent87a8b62f71bb72274c3dd1fa389e88c12d482ebb (diff)
downloadninja-cd2d380b1f75bf310c2a8c62e2ec4e3d6f4e39f8.tar.gz
fix for the youtube giving an error when having less than 3 images
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat
-rw-r--r--node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html2
-rw-r--r--node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html1
-rwxr-xr-xnode_modules/montage-google/picasa-carousel.reel/picasa-carousel.html1
-rw-r--r--node_modules/montage-google/youtube-channel.reel/youtube-channel.html1
-rw-r--r--node_modules/montage-google/youtube-channel.reel/youtube-channel.js10
5 files changed, 6 insertions, 9 deletions
diff --git a/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html b/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html
index 332b2932..66471eab 100644
--- a/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html
+++ b/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html
@@ -45,7 +45,6 @@
45 } 45 }
46 }, 46 },
47 "owner": { 47 "owner": {
48 "prototype": "feed-reader/feed-entry.reel",
49 "properties": { 48 "properties": {
50 "element": {"#": "feed-entry"} 49 "element": {"#": "feed-entry"}
51 } 50 }
@@ -76,6 +75,7 @@
76</head> 75</head>
77<body> 76<body>
78 <div class="feed-entry" data-montage-id="feed-entry"> 77 <div class="feed-entry" data-montage-id="feed-entry">
78
79 <a target="_blank" data-montage-id="entry-url" class="entry-url"><h2 data-montage-id="entry-title" class="entry-title"></h2></a> 79 <a target="_blank" data-montage-id="entry-url" class="entry-url"><h2 data-montage-id="entry-title" class="entry-title"></h2></a>
80 <p data-montage-id="entry-description" class="entry-description"></p> 80 <p data-montage-id="entry-description" class="entry-description"></p>
81 </div> 81 </div>
diff --git a/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html b/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html
index 4d6792a1..a5c1346f 100644
--- a/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html
+++ b/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html
@@ -38,7 +38,6 @@
38 }, 38 },
39 39
40 "owner": { 40 "owner": {
41 "prototype": "feed-reader/feed-reader.reel",
42 "properties": { 41 "properties": {
43 "element": {"#": "feed-reader"} 42 "element": {"#": "feed-reader"}
44 } 43 }
diff --git a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html
index 8712c228..b5949299 100755
--- a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html
+++ b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html
@@ -12,7 +12,6 @@
12 <script type="text/montage-serialization"> 12 <script type="text/montage-serialization">
13 { 13 {
14 "owner": { 14 "owner": {
15 "prototype": "picasa-carousel.reel",
16 "properties": { 15 "properties": {
17 "element": {"#": "montage-google-picasa-carousel"}, 16 "element": {"#": "montage-google-picasa-carousel"},
18 "flow": {"@": "flow"} 17 "flow": {"@": "flow"}
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 00:46:16 +0000