diff options
| author | hwc487 | 2012-07-09 16:08:02 -0700 |
|---|---|---|
| committer | hwc487 | 2012-07-09 16:08:02 -0700 |
| commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
| tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /node_modules/montage-google/youtube-channel.reel | |
| parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
| parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
| download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
Diffstat (limited to 'node_modules/montage-google/youtube-channel.reel')
| -rw-r--r-- | node_modules/montage-google/youtube-channel.reel/youtube-channel.html | 2 | ||||
| -rw-r--r-- | node_modules/montage-google/youtube-channel.reel/youtube-channel.js | 12 |
2 files changed, 3 insertions, 11 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 f5a74b8c..7342f3e8 100644 --- a/node_modules/montage-google/youtube-channel.reel/youtube-channel.html +++ b/node_modules/montage-google/youtube-channel.reel/youtube-channel.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!doctype html> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
| 4 | All Rights Reserved. | 4 | All Rights Reserved. |
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 | ||
| 35 | var YoutubeChannel = exports.YoutubeChannel = Montage.create(Component, { | 35 | var 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 | ||