diff options
Diffstat (limited to 'js/components')
6 files changed, 94 insertions, 4 deletions
diff --git a/js/components/hintable.reel/hintable.js b/js/components/hintable.reel/hintable.js index 803770db..e16c5f8a 100644 --- a/js/components/hintable.reel/hintable.js +++ b/js/components/hintable.reel/hintable.js | |||
@@ -185,12 +185,12 @@ exports.Hintable = Montage.create(Editable, { | |||
185 | handleInput : { | 185 | handleInput : { |
186 | value : function handleInput(e) { | 186 | value : function handleInput(e) { |
187 | this._super(arguments); | 187 | this._super(arguments); |
188 | 188 | ||
189 | var val = this.value, | 189 | var val = this.value, |
190 | matches, hint; | 190 | matches, hint; |
191 | //console.log('val = "' + val + '"'); | 191 | //console.log('val = "' + val + '"'); |
192 | //// Handle auto-suggest if configured | 192 | //// Handle auto-suggest if configured |
193 | if(this.hints instanceof Array) { | 193 | if(this.hints && this.hints.length) { |
194 | 194 | ||
195 | if(val.length > 0) { // content is not empty | 195 | if(val.length > 0) { // content is not empty |
196 | 196 | ||
@@ -305,7 +305,8 @@ exports.Hintable = Montage.create(Editable, { | |||
305 | 305 | ||
306 | /* --------- CONFIG ---------- */ | 306 | /* --------- CONFIG ---------- */ |
307 | hints : { | 307 | hints : { |
308 | value : ['Testing a hint.', 'Testing another hint.', 'Testing the last hint.'] | 308 | value : ['Testing a hint.', 'Testing another hint.', 'Testing the last hint.'], |
309 | distinct: true | ||
309 | }, | 310 | }, |
310 | hintClass : { | 311 | hintClass : { |
311 | value : "hintable-hint" | 312 | value : "hintable-hint" |
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html index 4e5b85ee..89901426 100755 --- a/js/components/layout/tools-list.reel/tools-list.html +++ b/js/components/layout/tools-list.reel/tools-list.html | |||
@@ -95,6 +95,9 @@ | |||
95 | "ZoomTool1": { | 95 | "ZoomTool1": { |
96 | "prototype": "js/tools/ZoomTool" | 96 | "prototype": "js/tools/ZoomTool" |
97 | }, | 97 | }, |
98 | "BindingTool1": { | ||
99 | "prototype": "js/tools/BindingTool" | ||
100 | }, | ||
98 | 101 | ||
99 | "disable": { | 102 | "disable": { |
100 | "prototype": "montage/ui/condition.reel", | 103 | "prototype": "montage/ui/condition.reel", |
@@ -127,6 +130,7 @@ | |||
127 | "RotateStageTool3D": {"@": "RotateStageTool3D1"}, | 130 | "RotateStageTool3D": {"@": "RotateStageTool3D1"}, |
128 | "PanTool": {"@": "PanTool1"}, | 131 | "PanTool": {"@": "PanTool1"}, |
129 | "ZoomTool": {"@": "ZoomTool1"}, | 132 | "ZoomTool": {"@": "ZoomTool1"}, |
133 | "bindingTool": {"@": "BindingTool1"}, | ||
130 | "components": [ | 134 | "components": [ |
131 | {"@": "repetition1"} | 135 | {"@": "repetition1"} |
132 | ] | 136 | ] |
diff --git a/js/components/layout/tools-properties.reel/tools-properties.html b/js/components/layout/tools-properties.reel/tools-properties.html index e7d1ac8b..ffaa0fca 100755 --- a/js/components/layout/tools-properties.reel/tools-properties.html +++ b/js/components/layout/tools-properties.reel/tools-properties.html | |||
@@ -102,6 +102,12 @@ | |||
102 | "element": {"#": "zoomProperties"} | 102 | "element": {"#": "zoomProperties"} |
103 | } | 103 | } |
104 | }, | 104 | }, |
105 | "bindingProperties1": { | ||
106 | "prototype": "js/components/tools-properties/binding-properties.reel", | ||
107 | "properties": { | ||
108 | "element": {"#": "bindingProperties"} | ||
109 | } | ||
110 | }, | ||
105 | 111 | ||
106 | "disable": { | 112 | "disable": { |
107 | "prototype": "montage/ui/condition.reel", | 113 | "prototype": "montage/ui/condition.reel", |
@@ -134,7 +140,8 @@ | |||
134 | "eraserProperties": {"@": "eraserProperties1"}, | 140 | "eraserProperties": {"@": "eraserProperties1"}, |
135 | "rotateStageProperties": {"@": "rotateStageProperties1"}, | 141 | "rotateStageProperties": {"@": "rotateStageProperties1"}, |
136 | "panProperties": {"@": "panProperties1"}, | 142 | "panProperties": {"@": "panProperties1"}, |
137 | "zoomProperties": {"@": "zoomProperties1"} | 143 | "zoomProperties": {"@": "zoomProperties1"}, |
144 | "bindingProperties": {"@": "bindingProperties1"} | ||
138 | }, | 145 | }, |
139 | "bindings": { | 146 | "bindings": { |
140 | "currentSelectedTool": { | 147 | "currentSelectedTool": { |
@@ -164,6 +171,7 @@ | |||
164 | <div data-montage-id="rotateStageProperties"></div> | 171 | <div data-montage-id="rotateStageProperties"></div> |
165 | <div data-montage-id="panProperties"></div> | 172 | <div data-montage-id="panProperties"></div> |
166 | <div data-montage-id="zoomProperties"></div> | 173 | <div data-montage-id="zoomProperties"></div> |
174 | <div data-montage-id="bindingProperties"></div> | ||
167 | <div data-montage-id="disabledCondition" class="panelDisabled"></div> | 175 | <div data-montage-id="disabledCondition" class="panelDisabled"></div> |
168 | </div> | 176 | </div> |
169 | </body> | 177 | </body> |
diff --git a/js/components/tools-properties/binding-properties.reel/binding-properties.css b/js/components/tools-properties/binding-properties.reel/binding-properties.css new file mode 100755 index 00000000..19d2b6c6 --- /dev/null +++ b/js/components/tools-properties/binding-properties.reel/binding-properties.css | |||
@@ -0,0 +1,17 @@ | |||
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 | .bindingSubTools { | ||
8 | padding:9px; | ||
9 | font-size:12px; | ||
10 | } | ||
11 | |||
12 | .bindingSubTools label { | ||
13 | |||
14 | } | ||
15 | .bindingSubTools input[type=checkbox] { | ||
16 | margin: 0px 3px; | ||
17 | } \ No newline at end of file | ||
diff --git a/js/components/tools-properties/binding-properties.reel/binding-properties.html b/js/components/tools-properties/binding-properties.reel/binding-properties.html new file mode 100755 index 00000000..cd0e0a50 --- /dev/null +++ b/js/components/tools-properties/binding-properties.reel/binding-properties.html | |||
@@ -0,0 +1,35 @@ | |||
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-properties.css"> | ||
11 | |||
12 | <script type="text/montage-serialization"> | ||
13 | { | ||
14 | |||
15 | "owner": { | ||
16 | "prototype": "js/components/tools-properties/binding-properties.reel", | ||
17 | "properties": { | ||
18 | "element": {"#": "bindingProperties"} | ||
19 | } | ||
20 | } | ||
21 | } | ||
22 | </script> | ||
23 | |||
24 | </head> | ||
25 | |||
26 | <body> | ||
27 | <div id="bindingProperties" class="subToolHolderPanel bindingSubTools"> | ||
28 | <input class="nj-skinned" type="checkbox" /> | ||
29 | <label>View All Bindings</label> | ||
30 | </div> | ||
31 | </body> | ||
32 | |||
33 | </html> | ||
34 | |||
35 | \ No newline at end of file | ||
diff --git a/js/components/tools-properties/binding-properties.reel/binding-properties.js b/js/components/tools-properties/binding-properties.reel/binding-properties.js new file mode 100755 index 00000000..8d30d855 --- /dev/null +++ b/js/components/tools-properties/binding-properties.reel/binding-properties.js | |||
@@ -0,0 +1,25 @@ | |||
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 | var Montage = require("montage/core/core").Montage; | ||
8 | var Component = require("montage/ui/component").Component; | ||
9 | var ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties; | ||
10 | |||
11 | exports.BindingProperties = Montage.create(ToolProperties, { | ||
12 | |||
13 | _subPrepare: { | ||
14 | value: function() { | ||
15 | |||
16 | } | ||
17 | }, | ||
18 | |||
19 | handleClick: { | ||
20 | value: function(event) { | ||
21 | |||
22 | } | ||
23 | } | ||
24 | |||
25 | }); \ No newline at end of file | ||