diff options
| author | Jon Reid | 2012-05-15 11:24:53 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-05-15 11:24:53 -0700 |
| commit | 3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch) | |
| tree | d6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/components/popup-manager.reel | |
| parent | 53a604d0ccb1315576b94406cf3b0b958162307b (diff) | |
| parent | e33a4e58c271a9507082694a5268b840fdd05968 (diff) | |
| download | ninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz | |
Merge branch 'timeline-local' into timeline-multiselect
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
resolved using theirs. (selectLayers)
Diffstat (limited to 'js/components/popup-manager.reel')
| -rwxr-xr-x | js/components/popup-manager.reel/popup-manager.html | 7 | ||||
| -rwxr-xr-x | js/components/popup-manager.reel/popup-manager.js | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/js/components/popup-manager.reel/popup-manager.html b/js/components/popup-manager.reel/popup-manager.html index 7fbbc86e..399a2115 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 | } |
| @@ -27,7 +26,7 @@ | |||
| 27 | 26 | ||
| 28 | <body> | 27 | <body> |
| 29 | 28 | ||
| 30 | <section id="popupWindows"></section> | 29 | <section data-montage-id="popupWindows"></section> |
| 31 | 30 | ||
| 32 | </body> | 31 | </body> |
| 33 | 32 | ||
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: { |