aboutsummaryrefslogtreecommitdiff
path: root/js/components/popup-manager.reel
diff options
context:
space:
mode:
authorPushkar Joshi2012-04-27 15:05:38 -0700
committerPushkar Joshi2012-04-27 15:05:38 -0700
commitc8fc8e1bd1c394f433b4fc1677f4bc596e7cc2cc (patch)
tree74fcb9818a917d4f8ddb0db0c78a8cff9af86339 /js/components/popup-manager.reel
parent28d1594b868e3c08e5603adbd5b29df1e24d57e9 (diff)
parentc8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff)
downloadninja-c8fc8e1bd1c394f433b4fc1677f4bc596e7cc2cc.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'js/components/popup-manager.reel')
-rwxr-xr-xjs/components/popup-manager.reel/popup-manager.html5
-rwxr-xr-xjs/components/popup-manager.reel/popup-manager.js4
2 files changed, 4 insertions, 5 deletions
diff --git a/js/components/popup-manager.reel/popup-manager.html b/js/components/popup-manager.reel/popup-manager.html
index 7fbbc86e..1ae93e15 100755
--- a/js/components/popup-manager.reel/popup-manager.html
+++ b/js/components/popup-manager.reel/popup-manager.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<!-- 2<!--
3<copyright> 3<copyright>
4 This file contains proprietary software owned by Motorola Mobility, Inc. 4 This file contains proprietary software owned by Motorola Mobility, Inc.
@@ -14,8 +14,7 @@
14 <script type="text/montage-serialization"> 14 <script type="text/montage-serialization">
15 { 15 {
16 "owner": { 16 "owner": {
17 "module": "js/components/popup-manager.reel", 17 "prototype": "js/components/popup-manager.reel",
18 "name": "PopupMananger",
19 "properties": { 18 "properties": {
20 "element": {"#": "popupWindows"} 19 "element": {"#": "popupWindows"}
21 } 20 }
diff --git a/js/components/popup-manager.reel/popup-manager.js b/js/components/popup-manager.reel/popup-manager.js
index fbcd5035..cf818b4e 100755
--- a/js/components/popup-manager.reel/popup-manager.js
+++ b/js/components/popup-manager.reel/popup-manager.js
@@ -10,8 +10,8 @@ var Montage = require("montage/core/core").Montage,
10 Component = require("montage/ui/component").Component, 10 Component = require("montage/ui/component").Component,
11 Popup = require("js/components/popup.reel").Popup; 11 Popup = require("js/components/popup.reel").Popup;
12//////////////////////////////////////////////////////////////////////// 12////////////////////////////////////////////////////////////////////////
13//Exporting as PopupMananger 13//Exporting as PopupManager
14exports.PopupMananger = Montage.create(Component, { 14exports.PopupManager = Montage.create(Component, {
15 //////////////////////////////////////////////////////////////////// 15 ////////////////////////////////////////////////////////////////////
16 // 16 //
17 deserializedFromTemplate: { 17 deserializedFromTemplate: {