diff options
| author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
| commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
| tree | 867f8bdd588c8f9076979233ca46a688ff70523e /node_modules/montage/ui/popup/popup.reel/popup.html | |
| parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
| parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
| download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/popup/popup.reel/popup.html')
| -rwxr-xr-x | node_modules/montage/ui/popup/popup.reel/popup.html | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/node_modules/montage/ui/popup/popup.reel/popup.html b/node_modules/montage/ui/popup/popup.reel/popup.html index 9948b868..5bc74dae 100755 --- a/node_modules/montage/ui/popup/popup.reel/popup.html +++ b/node_modules/montage/ui/popup/popup.reel/popup.html | |||
| @@ -11,8 +11,7 @@ | |||
| 11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
| 12 | { | 12 | { |
| 13 | "slot1": { | 13 | "slot1": { |
| 14 | "module": "montage/ui/slot.reel", | 14 | "prototype": "montage/ui/slot.reel", |
| 15 | "name": "Slot", | ||
| 16 | "properties": { | 15 | "properties": { |
| 17 | "element": { | 16 | "element": { |
| 18 | "#": "popup-content" | 17 | "#": "popup-content" |
| @@ -20,8 +19,7 @@ | |||
| 20 | } | 19 | } |
| 21 | }, | 20 | }, |
| 22 | "owner": { | 21 | "owner": { |
| 23 | "module": "montage/ui/popup/popup.reel", | 22 | "prototype": "montage/ui/popup/popup.reel", |
| 24 | "name": "Popup", | ||
| 25 | "properties": { | 23 | "properties": { |
| 26 | "element": { | 24 | "element": { |
| 27 | "#": "popup-container" | 25 | "#": "popup-container" |
| @@ -42,9 +40,9 @@ | |||
| 42 | 40 | ||
| 43 | </head> | 41 | </head> |
| 44 | <body> | 42 | <body> |
| 45 | <div id="popup-container" class="montage-invisible montage-popup-container"> | 43 | <div data-montage-id="popup-container" class="montage-invisible montage-popup-container"> |
| 46 | <div id="popup-wrapper" class="montage-popup-tooltip montage-popup-wrapper montage-popup-border"> | 44 | <div data-montage-id="popup-wrapper" class="montage-popup-tooltip montage-popup-wrapper montage-popup-border"> |
| 47 | <div id="popup-content" class="montage-popup-content"></div> | 45 | <div data-montage-id="popup-content" class="montage-popup-content"></div> |
| 48 | </div> | 46 | </div> |
| 49 | </div> | 47 | </div> |
| 50 | 48 | ||