diff options
author | Ananya Sen | 2012-02-17 14:26:56 -0800 |
---|---|---|
committer | Ananya Sen | 2012-02-17 14:26:56 -0800 |
commit | 2980816130a44cd478b2a9d6606e021efbcebd4a (patch) | |
tree | 762d98ba8852b858c03760f4b9bef294fae6486c /node_modules/montage/ui/component.js | |
parent | 96178309ddcdb54c0c451b69ea6fb8cdf76fcf62 (diff) | |
parent | a42c536c2b3209afc058eabd31167bd0aa6f71c8 (diff) | |
download | ninja-2980816130a44cd478b2a9d6606e021efbcebd4a.tar.gz |
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts:
css/ninja.css
js/controllers/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/component.js')
-rwxr-xr-x | node_modules/montage/ui/component.js | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/node_modules/montage/ui/component.js b/node_modules/montage/ui/component.js index e41a1958..d347f655 100755 --- a/node_modules/montage/ui/component.js +++ b/node_modules/montage/ui/component.js | |||
@@ -6,7 +6,6 @@ | |||
6 | /** | 6 | /** |
7 | @module montage/ui/component | 7 | @module montage/ui/component |
8 | @requires montage/core/core | 8 | @requires montage/core/core |
9 | @requires montage/core/event/mutable-event | ||
10 | @requires montage/ui/reel | 9 | @requires montage/ui/reel |
11 | @requires montage/core/gate | 10 | @requires montage/core/gate |
12 | @requires montage/core/logger | component | 11 | @requires montage/core/logger | component |
@@ -14,7 +13,6 @@ | |||
14 | @requires montage/core/event/event-manager | 13 | @requires montage/core/event/event-manager |
15 | */ | 14 | */ |
16 | var Montage = require("montage").Montage, | 15 | var Montage = require("montage").Montage, |
17 | MutableEvent = require("core/event/mutable-event").MutableEvent, | ||
18 | Template = require("ui/template").Template, | 16 | Template = require("ui/template").Template, |
19 | Gate = require("core/gate").Gate, | 17 | Gate = require("core/gate").Gate, |
20 | logger = require("core/logger").logger("component"), | 18 | logger = require("core/logger").logger("component"), |
@@ -441,10 +439,6 @@ var Component = exports.Component = Montage.create(Montage,/** @lends module:mon | |||
441 | childComponents.splice(ix, 1); | 439 | childComponents.splice(ix, 1); |
442 | childComponent._cachedParentComponent = null; | 440 | childComponent._cachedParentComponent = null; |
443 | } | 441 | } |
444 | |||
445 | if (element && element.parentNode) { | ||
446 | element.parentNode.removeChild(element); | ||
447 | } | ||
448 | } | 442 | } |
449 | }, | 443 | }, |
450 | /** | 444 | /** |