diff options
| author | Eric Guzman | 2012-03-12 15:33:04 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-03-12 15:33:04 -0700 |
| commit | 7e3161153b87b891875ac65368a19aed12909fa3 (patch) | |
| tree | b80f48d711a9729fc39dbbdff28c4f0620e7302d /js/panels/PanelContainer/PanelContainer.reel/PanelContainer.html | |
| parent | 7a28932ba8a7517bbaaabe1f5edf678416aafc9c (diff) | |
| parent | 69d90467865a1384725b2301901be2180c5a841f (diff) | |
| download | ninja-7e3161153b87b891875ac65368a19aed12909fa3.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
Diffstat (limited to 'js/panels/PanelContainer/PanelContainer.reel/PanelContainer.html')
| -rwxr-xr-x | js/panels/PanelContainer/PanelContainer.reel/PanelContainer.html | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.html b/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.html deleted file mode 100755 index 5c6ac227..00000000 --- a/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.html +++ /dev/null | |||
| @@ -1,62 +0,0 @@ | |||
| 1 | <!DOCTYPE html> | ||
| 2 | <!-- <copyright> | ||
| 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
| 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
| 5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
| 6 | </copyright> --> | ||
| 7 | <html lang="en"> | ||
| 8 | <head> | ||
| 9 | |||
| 10 | <script type="text/montage-serialization"> | ||
| 11 | { | ||
| 12 | "panel": { | ||
| 13 | "module": "js/panels/Panel.reel", | ||
| 14 | "name": "Panel", | ||
| 15 | "properties": { | ||
| 16 | "element": {"#": "panel"} | ||
| 17 | }, | ||
| 18 | "bindings": { | ||
| 19 | "panelBase": { | ||
| 20 | "boundObject": {"@": "repetition1"}, | ||
| 21 | "boundObjectPropertyPath": "objectAtCurrentIteration", | ||
| 22 | "oneway": true | ||
| 23 | } | ||
| 24 | } | ||
| 25 | }, | ||
| 26 | |||
| 27 | |||
| 28 | "repetition1": { | ||
| 29 | "module": "montage/ui/repetition.reel", | ||
| 30 | "name": "Repetition", | ||
| 31 | "properties": { | ||
| 32 | "element": {"#": "panels"} | ||
| 33 | }, | ||
| 34 | "bindings": { | ||
| 35 | "objects": { | ||
| 36 | "boundObject": {"@": "owner"}, | ||
| 37 | "boundObjectPropertyPath": "_panels", | ||
| 38 | "oneway": true | ||
| 39 | } | ||
| 40 | } | ||
| 41 | }, | ||
| 42 | |||
| 43 | "owner": { | ||
| 44 | "module": "js/panels/PanelContainer/PanelContainer.reel", | ||
| 45 | "name": "PanelContainer", | ||
| 46 | "properties": { | ||
| 47 | "element": {"#": "panelContainer"}, | ||
| 48 | "repeater": {"@": "repetition1"} | ||
| 49 | } | ||
| 50 | } | ||
| 51 | } | ||
| 52 | </script> | ||
| 53 | |||
| 54 | </head> | ||
| 55 | <body> | ||
| 56 | <section id="panelContainer"> | ||
| 57 | <article id="panels" class="panels"> | ||
| 58 | <article id="panel" class="panel"></article> | ||
| 59 | </article> | ||
| 60 | </section> | ||
| 61 | </body> | ||
| 62 | </html> \ No newline at end of file | ||