aboutsummaryrefslogtreecommitdiff
path: root/js/components/popup-manager.reel/popup-manager.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-04-26 17:09:12 -0700
committerValerio Virgillito2012-04-26 17:09:12 -0700
commit7968f3a9cf56392c914d6bd44cc90145b6d807a3 (patch)
treeb632e72735c9a071078121be07cf8cba2ebf29cc /js/components/popup-manager.reel/popup-manager.js
parentb03c3b087297f471840ab8595d5aa8bd0249a742 (diff)
parentbcfb200482c26b2bfc0d6577b1eb0de7a19a6762 (diff)
downloadninja-7968f3a9cf56392c914d6bd44cc90145b6d807a3.tar.gz
Merge branch 'master' of https://github.com/mayhewinator/ninja-internal into serialization
Diffstat (limited to 'js/components/popup-manager.reel/popup-manager.js')
-rwxr-xr-xjs/components/popup-manager.reel/popup-manager.js4
1 files changed, 2 insertions, 2 deletions
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: {