aboutsummaryrefslogtreecommitdiff
path: root/js/components/popup-manager.reel/popup-manager.js
diff options
context:
space:
mode:
authorAnanya Sen2012-05-01 13:39:30 -0700
committerAnanya Sen2012-05-01 13:39:30 -0700
commitc360d1a5cfe894591ae65f892ead11d0ca537b18 (patch)
tree13964f810d3516dbc02e27ab5bb576fe62366f26 /js/components/popup-manager.reel/popup-manager.js
parent3137d919e6b4ccbb2fb68c5920f4376acde3f1f5 (diff)
parente3fa4c7db57b63c5ac604c9420062de5d0fe413a (diff)
downloadninja-c360d1a5cfe894591ae65f892ead11d0ca537b18.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements
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: {