diff options
12 files changed, 164 insertions, 16 deletions
diff --git a/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.css b/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.css new file mode 100755 index 00000000..018448f1 --- /dev/null +++ b/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.css | |||
@@ -0,0 +1,5 @@ | |||
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> */ | ||
diff --git a/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.html b/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.html new file mode 100755 index 00000000..6b670455 --- /dev/null +++ b/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.html | |||
@@ -0,0 +1,27 @@ | |||
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="binding-view.css"> | ||
11 | |||
12 | <script type="text/montage-serialization"> | ||
13 | { | ||
14 | "owner": { | ||
15 | "prototype": "js/stage/binding-view.reel/binding-hud.reel", | ||
16 | "properties": { | ||
17 | "element": {"#": "hudOption"} | ||
18 | } | ||
19 | } | ||
20 | } | ||
21 | </script> | ||
22 | |||
23 | </head> | ||
24 | <body> | ||
25 | <div class="hudOption">Label for options</div> | ||
26 | </body> | ||
27 | </html> | ||
diff --git a/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.js b/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.js new file mode 100755 index 00000000..91a0564e --- /dev/null +++ b/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.js | |||
@@ -0,0 +1,18 @@ | |||
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.bindingHud = Montage.create(Component, { | ||
15 | title: { | ||
16 | value: "value" | ||
17 | } | ||
18 | }); \ No newline at end of file | ||
diff --git a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.html b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.html index 73252de4..c81b70d3 100755 --- a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.html +++ b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.html | |||
@@ -25,11 +25,20 @@ | |||
25 | "bindings": { | 25 | "bindings": { |
26 | "objects": { | 26 | "objects": { |
27 | "boundObject": {"@": "owner"}, | 27 | "boundObject": {"@": "owner"}, |
28 | "boundObjectPropertyPath": "bindables", | 28 | "boundObjectPropertyPath": "properties", |
29 | "oneway": true | 29 | "oneway": true |
30 | } | 30 | } |
31 | } | 31 | } |
32 | }, | 32 | }, |
33 | "hudOption": { | ||
34 | "prototype": "js/stage/binding-view.reel/binding-hud-option.reel", | ||
35 | "properties": { | ||
36 | "element": {"#" : "hudOption"} | ||
37 | }, | ||
38 | "bindings": { | ||
39 | "title": {"<-": "@objectAtCurrentIteration.title"} | ||
40 | } | ||
41 | } | ||
33 | } | 42 | } |
34 | </script> | 43 | </script> |
35 | 44 | ||
@@ -39,7 +48,7 @@ | |||
39 | 48 | ||
40 | <section data-montage-id="bindingHud" class="bindingHud"> | 49 | <section data-montage-id="bindingHud" class="bindingHud"> |
41 | <div data-montage-id="hudRepetition" class="hudRepetition"> | 50 | <div data-montage-id="hudRepetition" class="hudRepetition"> |
42 | 51 | <div data-montage-id="hudOption" class="hudOption"></div> | |
43 | </div> | 52 | </div> |
44 | </section> | 53 | </section> |
45 | 54 | ||
diff --git a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js index cbb4c1d7..a63f2775 100755 --- a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js +++ b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js | |||
@@ -11,6 +11,11 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
11 | var Montage = require("montage/core/core").Montage, | 11 | var Montage = require("montage/core/core").Montage, |
12 | Component = require("montage/ui/component").Component; | 12 | Component = require("montage/ui/component").Component; |
13 | 13 | ||
14 | exports.bindingHud = Montage.create(Component, { | 14 | exports.BindingHud = Montage.create(Component, { |
15 | 15 | properties: { | |
16 | value: [ | ||
17 | {"title": "myProperty1"}, | ||
18 | {"title":"myproperty2"} | ||
19 | ] | ||
20 | } | ||
16 | }); \ No newline at end of file | 21 | }); \ No newline at end of file |
diff --git a/js/stage/binding-view.reel/binding-view.html b/js/stage/binding-view.reel/binding-view.html index 43fa0112..152345d4 100755 --- a/js/stage/binding-view.reel/binding-view.html +++ b/js/stage/binding-view.reel/binding-view.html | |||
@@ -21,7 +21,7 @@ | |||
21 | "hudRepeater": { | 21 | "hudRepeater": { |
22 | "prototype": "montage/ui/repetition.reel", | 22 | "prototype": "montage/ui/repetition.reel", |
23 | "properties": { | 23 | "properties": { |
24 | "element": {"#": "hudRepetition"} | 24 | "element": {"#": "hudRepeater"} |
25 | }, | 25 | }, |
26 | "bindings": { | 26 | "bindings": { |
27 | "objects": { | 27 | "objects": { |
@@ -57,12 +57,12 @@ | |||
57 | }, | 57 | }, |
58 | "bindings": { | 58 | "bindings": { |
59 | "objectName": { | 59 | "objectName": { |
60 | "boundObject": {"@": "hudRepetition"}, | 60 | "boundObject": {"@": "hudRepeater"}, |
61 | "boundObjectPropertyPath": "objectAtCurrentIteration.objectName", | 61 | "boundObjectPropertyPath": "objectAtCurrentIteration.objectName", |
62 | "oneway": true | 62 | "oneway": true |
63 | }, | 63 | }, |
64 | "objectImage": { | 64 | "objectImage": { |
65 | "boundObject": {"@": "undoList"}, | 65 | "boundObject": {"@": "hudRepeater"}, |
66 | "boundObjectPropertyPath": "objectAtCurrentIteration.objectImage", | 66 | "boundObjectPropertyPath": "objectAtCurrentIteration.objectImage", |
67 | "oneway": true | 67 | "oneway": true |
68 | } | 68 | } |
@@ -76,11 +76,14 @@ | |||
76 | 76 | ||
77 | 77 | ||
78 | <section data-montage-id="bindingView" class="bindingView"> | 78 | <section data-montage-id="bindingView" class="bindingView"> |
79 | <div data-montage-id="hudRepetition" class="hudRepetition"> | 79 | <div data-montage-id="hudRepeater" class="hudRepetition"> |
80 | <div data-montage-id="hud"> | 80 | <div data-montage-id="hud"> |
81 | 81 | ||
82 | </div> | 82 | </div> |
83 | </div> | 83 | </div> |
84 | <div data-montage-id="nonVisualRepeater"> | ||
85 | <div data-montage-id="nonVisualComponent"></div> | ||
86 | </div> | ||
84 | </section> | 87 | </section> |
85 | 88 | ||
86 | </body> | 89 | </body> |
diff --git a/js/stage/binding-view.reel/binding-view.js b/js/stage/binding-view.reel/binding-view.js index d3d988c1..df3bc3ee 100755 --- a/js/stage/binding-view.reel/binding-view.js +++ b/js/stage/binding-view.reel/binding-view.js | |||
@@ -11,10 +11,31 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
11 | var Montage = require("montage/core/core").Montage, | 11 | var Montage = require("montage/core/core").Montage, |
12 | Component = require("montage/ui/component").Component; | 12 | Component = require("montage/ui/component").Component; |
13 | 13 | ||
14 | exports.bindingView = Montage.create(Component, { | 14 | exports.BindingView = Montage.create(Component, { |
15 | //private Properties | ||
16 | _selectedElement: { | ||
17 | value: null | ||
18 | }, | ||
15 | _bindables: { | 19 | _bindables: { |
16 | value: [] | 20 | value: [] |
17 | }, | 21 | }, |
22 | _nonVisualComponents: { | ||
23 | value:null | ||
24 | }, | ||
25 | |||
26 | //Public Objects | ||
27 | hudRepeater: { value: null }, | ||
28 | |||
29 | |||
30 | //Public Properties | ||
31 | selectedElement: { | ||
32 | get: function() { | ||
33 | return this._selectedElement; | ||
34 | }, | ||
35 | set: function(val) { | ||
36 | this._selectedElement = val; | ||
37 | } | ||