diff options
| author | Ananya Sen | 2012-06-26 16:07:00 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-06-26 16:07:00 -0700 |
| commit | 1d5372534d11c9c1b818ba5e7d67498c731e9ac6 (patch) | |
| tree | bc09c9f08ac2faa955995a91a78337276a81eb77 /js/panels/objects/objects-panel.reel | |
| parent | 3391a8e6fd5df0d464edaffd98c2b3fde23acf5a (diff) | |
| parent | 46174eb0ce93d660c8d2e9276fbdc4f9a03f056a (diff) | |
| download | ninja-1d5372534d11c9c1b818ba5e7d67498c731e9ac6.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into bugfix-master
Conflicts:
js/ninja.reel/ninja.html
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/panels/objects/objects-panel.reel')
3 files changed, 116 insertions, 0 deletions
diff --git a/js/panels/objects/objects-panel.reel/objects-panel.css b/js/panels/objects/objects-panel.reel/objects-panel.css new file mode 100644 index 00000000..3a83776e --- /dev/null +++ b/js/panels/objects/objects-panel.reel/objects-panel.css | |||
| @@ -0,0 +1,20 @@ | |||
| 1 | /* <copyright> | ||
| 2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
| 3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
| 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
| 5 | </copyright> */ | ||
| 6 | |||
| 7 | /* | ||
| 8 | |||
| 9 | <section data-montage-id="objects-panel" class="objects-panel"> | ||
| 10 | <ul data-montage-id="list" class="objects-list"> | ||
| 11 | <li data-montage-id="list-item" class="list-item"></li> | ||
| 12 | </ul> | ||
| 13 | </section> | ||
| 14 | |||
| 15 | */ | ||
| 16 | |||
| 17 | .objects-list { | ||
| 18 | margin: 10px 0 0 0; | ||
| 19 | padding: 0; | ||
| 20 | } | ||
diff --git a/js/panels/objects/objects-panel.reel/objects-panel.html b/js/panels/objects/objects-panel.reel/objects-panel.html new file mode 100644 index 00000000..17f414e8 --- /dev/null +++ b/js/panels/objects/objects-panel.reel/objects-panel.html | |||
| @@ -0,0 +1,58 @@ | |||
| 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> | ||
| 8 | <head> | ||
| 9 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> | ||
| 10 | <link rel="stylesheet" type="text/css" href="objects-panel.css"> | ||
| 11 | |||
| 12 | <script type="text/montage-serialization"> | ||
| 13 | { | ||
| 14 | "owner": { | ||
| 15 | "prototype": "js/panels/objects/objects-panel.reel", | ||
| 16 | "properties": { | ||
| 17 | "element": {"#": "objects-panel"} | ||
| 18 | } | ||
| 19 | }, | ||
| 20 | "repetition" : { | ||
| 21 | "prototype": "montage/ui/repetition.reel", | ||
| 22 | "properties": { | ||
| 23 | "element": {"#": "list"}, | ||
| 24 | "contentController": {"@": "arrayController"} | ||
| 25 | } | ||
| 26 | }, | ||
| 27 | "arrayController": { | ||
| 28 | "prototype": "montage/ui/controller/array-controller", | ||
| 29 | "bindings": { | ||
| 30 | "content": {"<-": "@owner.objects"} | ||
| 31 | } | ||
| 32 | }, | ||
| 33 | "objectComponent": { | ||
| 34 | "prototype": "js/panels/objects/object.reel", | ||
| 35 | "properties": { | ||
| 36 | "element": {"#": "list-item"} | ||
| 37 | }, | ||
| 38 | "bindings": { | ||
| 39 | "sourceObject" : {"<-": "@repetition.objectAtCurrentIteration"}, | ||
| 40 | "identifier" : {"<-": "@repetition.objectAtCurrentIteration.identifier"} | ||
| 41 | } | ||
| 42 | } | ||
| 43 | |||
| 44 | } | ||
| 45 | </script> | ||
| 46 | |||
| 47 | </head> | ||
| 48 | <body> | ||
| 49 | |||
| 50 | |||
| 51 | <section data-montage-id="objects-panel" class="objects-panel"> | ||
| 52 | <ul data-montage-id="list" class="objects-list"> | ||
| 53 | <li data-montage-id="list-item" class="list-item"></li> | ||
| 54 | </ul> | ||
| 55 | </section> | ||
| 56 | |||
| 57 | </body> | ||
| 58 | </html> | ||
diff --git a/js/panels/objects/objects-panel.reel/objects-panel.js b/js/panels/objects/objects-panel.reel/objects-panel.js new file mode 100644 index 00000000..727a09aa --- /dev/null +++ b/js/panels/objects/objects-panel.reel/objects-panel.js | |||
| @@ -0,0 +1,38 @@ | |||
| 1 | /* <copyright> | ||
| 2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
| 3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
| 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
| 5 | </copyright> */ | ||
| 6 | |||
| 7 | /** | ||
| 8 | @requires montage/core/core | ||
| 9 | @requires montage/ui/component | ||
| 10 | */ | ||
| 11 | var Montage = require("montage/core/core").Montage, | ||
| 12 | Component = require("montage/ui/component").Component; | ||
| 13 | |||
| 14 | exports.ObjectsPanel = Montage.create(Component, { | ||
| 15 | _objects: { value: null }, | ||
| 16 | objects: { | ||
| 17 | get: function() { | ||
| 18 | return this._objects; | ||
| 19 | }, | ||
| 20 | set: function(value) { | ||
| 21 | this._objects = value; | ||
| 22 | this.needsDraw = true; | ||
| 23 | } | ||
| 24 | }, | ||
| 25 | |||
| 26 | prepareForDraw : { | ||
| 27 | value: function() { | ||
| 28 | |||
| 29 | Object.defineBinding(this, 'objects', { | ||
| 30 | "boundObject": this.application.ninja.objectsController, | ||
| 31 | "boundObjectPropertyPath": "objects", | ||
| 32 | "oneway": true | ||
| 33 | }); | ||
| 34 | |||
| 35 | } | ||
| 36 | } | ||
| 37 | |||
| 38 | }); \ No newline at end of file | ||