diff options
| author | Jose Antonio Marquez | 2012-04-27 14:29:01 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-04-27 14:29:01 -0700 |
| commit | 7fdeb9feac4d2da9f86646cda4548ea60e5effa9 (patch) | |
| tree | 6b43b7b2375fad6804ae88287906e3b77b4539b9 /js/components/popup-manager.reel/popup-manager.js | |
| parent | d988dead643ff4f9bfa417286a6b5f88be0e7c82 (diff) | |
| parent | c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff) | |
| download | ninja-7fdeb9feac4d2da9f86646cda4548ea60e5effa9.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/components/popup-manager.reel/popup-manager.js')
| -rwxr-xr-x | js/components/popup-manager.reel/popup-manager.js | 4 |
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 |
| 14 | exports.PopupMananger = Montage.create(Component, { | 14 | exports.PopupManager = Montage.create(Component, { |
| 15 | //////////////////////////////////////////////////////////////////// | 15 | //////////////////////////////////////////////////////////////////// |
| 16 | // | 16 | // |
| 17 | deserializedFromTemplate: { | 17 | deserializedFromTemplate: { |