aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-09 12:18:55 -0700
committerValerio Virgillito2012-07-09 12:18:55 -0700
commit45d9ebaa233fcd202114ba2648d842ad1cef0eeb (patch)
tree307a7b34de27f4d3b1c40a315f47e284c5305a79
parentb7eb5e948a911ab78461eb77a7ff1b55da2c3d8d (diff)
parent409361a7f7653ddb09f9a7463e9ea4ce47caa960 (diff)
downloadninja-45d9ebaa233fcd202114ba2648d842ad1cef0eeb.tar.gz
Merge pull request #372 from mencio/youtube-fix
Removing the youtube hack now that we have the proper fix from montage
-rw-r--r--js/io/system/ninjalibrary.json2
-rw-r--r--node_modules/montage-google/youtube-channel.reel/youtube-channel.js12
2 files changed, 3 insertions, 11 deletions
diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json
index 86134b97..7f8ee94f 100644
--- a/js/io/system/ninjalibrary.json
+++ b/js/io/system/ninjalibrary.json
@@ -1,6 +1,6 @@
1{ 1{
2 "libraries": [ 2 "libraries": [
3 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.2.0"}, 3 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.2.1"},
4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.3"} 4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.3"}
5 ] 5 ]
6} \ No newline at end of file 6} \ No newline at end of file
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 43c6b9e0..cfef48e3 100644
--- a/node_modules/montage-google/youtube-channel.reel/youtube-channel.js
+++ b/node_modules/montage-google/youtube-channel.reel/youtube-channel.js
@@ -34,9 +34,6 @@ var Montage = require("montage").Montage,
34 34
35var YoutubeChannel = exports.YoutubeChannel = Montage.create(Component, { 35var YoutubeChannel = exports.YoutubeChannel = Montage.create(Component, {
36 36
37 _savedReference: {
38 value: null
39 },
40 37
41 _userRe: { 38 _userRe: {
42 value: /youtube.com\/(user\/)?([a-z0-9]+)/i 39 value: /youtube.com\/(user\/)?([a-z0-9]+)/i
@@ -142,7 +139,7 @@ var YoutubeChannel = exports.YoutubeChannel = Montage.create(Component, {
142 139
143 this._positionPopup(); 140 this._positionPopup();
144 141
145 this._savedReference = this.element; 142
146 } 143 }
147 }, 144 },
148 145
@@ -151,12 +148,7 @@ var YoutubeChannel = exports.YoutubeChannel = Montage.create(Component, {
151 var self = this; 148 var self = this;
152 149
153 if (this._script) { 150 if (this._script) {
154 if(this.element.childNodes.length < 1) { 151 this.element.appendChild(this._script);
155 this._savedReference.appendChild(this._script);
156 } else {
157 this.element.appendChild(this._script);
158 }
159
160 this._script = null; 152 this._script = null;
161 } 153 }
162 154