diff options
Diffstat (limited to 'js')
47 files changed, 1278 insertions, 485 deletions
diff --git a/js/components/layout/documents-tab.reel/documents-tab.html b/js/components/layout/documents-tab.reel/documents-tab.html index 4aed23d9..cf3dbbf5 100755 --- a/js/components/layout/documents-tab.reel/documents-tab.html +++ b/js/components/layout/documents-tab.reel/documents-tab.html | |||
@@ -33,17 +33,17 @@ | |||
33 | }, | 33 | }, |
34 | "name": { | 34 | "name": { |
35 | "boundObject": {"@": "repetition1"}, | 35 | "boundObject": {"@": "repetition1"}, |
36 | "boundObjectPropertyPath": "objectAtCurrentIteration.name", | 36 | "boundObjectPropertyPath": "objectAtCurrentIteration.model.file.name", |
37 | "oneway": true | 37 | "oneway": true |
38 | }, | 38 | }, |
39 | "saveFlag": { | 39 | "saveFlag": { |
40 | "boundObject": {"@": "repetition1"}, | 40 | "boundObject": {"@": "repetition1"}, |
41 | "boundObjectPropertyPath": "objectAtCurrentIteration.needsSave", | 41 | "boundObjectPropertyPath": "objectAtCurrentIteration.model.needsSave", |
42 | "oneway": true | 42 | "oneway": true |
43 | }, | 43 | }, |
44 | "active": { | 44 | "active": { |
45 | "boundObject": {"@": "repetition1"}, | 45 | "boundObject": {"@": "repetition1"}, |
46 | "boundObjectPropertyPath": "objectAtCurrentIteration.isActive", | 46 | "boundObjectPropertyPath": "objectAtCurrentIteration.model.isActive", |
47 | "oneway": true | 47 | "oneway": true |
48 | } | 48 | } |
49 | } | 49 | } |
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html index 9aa05e5d..25aac8fb 100755 --- a/js/components/layout/tools-list.reel/tools-list.html +++ b/js/components/layout/tools-list.reel/tools-list.html | |||
@@ -112,6 +112,9 @@ | |||
112 | "ZoomTool1": { | 112 | "ZoomTool1": { |
113 | "prototype": "js/tools/ZoomTool" | 113 | "prototype": "js/tools/ZoomTool" |
114 | }, | 114 | }, |
115 | "BindingTool1": { | ||
116 | "prototype": "js/tools/BindingTool" | ||
117 | }, | ||
115 | 118 | ||
116 | "disable": { | 119 | "disable": { |
117 | "prototype": "montage/ui/condition.reel", | 120 | "prototype": "montage/ui/condition.reel", |
@@ -151,6 +154,7 @@ | |||
151 | "RotateStageTool3D": {"@": "RotateStageTool3D1"}, | 154 | "RotateStageTool3D": {"@": "RotateStageTool3D1"}, |
152 | "PanTool": {"@": "PanTool1"}, | 155 | "PanTool": {"@": "PanTool1"}, |
153 | "ZoomTool": {"@": "ZoomTool1"}, | 156 | "ZoomTool": {"@": "ZoomTool1"}, |
157 | "bindingTool": {"@": "BindingTool1"}, | ||
154 | "components": [ | 158 | "components": [ |
155 | {"@": "repetition1"} | 159 | {"@": "repetition1"} |
156 | ] | 160 | ] |
diff --git a/js/components/layout/tools-properties.reel/tools-properties.html b/js/components/layout/tools-properties.reel/tools-properties.html index 10309ec4..9061cd12 100755 --- a/js/components/layout/tools-properties.reel/tools-properties.html +++ b/js/components/layout/tools-properties.reel/tools-properties.html | |||
@@ -120,6 +120,12 @@ | |||
120 | "element": {"#": "zoomProperties"} | 120 | "element": {"#": "zoomProperties"} |
121 | } | 121 | } |
122 | }, | 122 | }, |
123 | "bindingProperties1": { | ||
124 | "prototype": "js/components/tools-properties/binding-properties.reel", | ||
125 | "properties": { | ||
126 | "element": {"#": "bindingProperties"} | ||
127 | } | ||
128 | }, | ||
123 | 129 | ||
124 | "disable": { | 130 | "disable": { |
125 | "prototype": "montage/ui/condition.reel", | 131 | "prototype": "montage/ui/condition.reel", |
@@ -155,7 +161,8 @@ | |||
155 | "eraserProperties": {"@": "eraserProperties1"}, | 161 | "eraserProperties": {"@": "eraserProperties1"}, |
156 | "rotateStageProperties": {"@": "rotateStageProperties1"}, | 162 | "rotateStageProperties": {"@": "rotateStageProperties1"}, |
157 | "panProperties": {"@": "panProperties1"}, | 163 | "panProperties": {"@": "panProperties1"}, |
158 | "zoomProperties": {"@": "zoomProperties1"} | 164 | "zoomProperties": {"@": "zoomProperties1"}, |
165 | "bindingProperties": {"@": "bindingProperties1"} | ||
159 | }, | 166 | }, |
160 | "bindings": { | 167 | "bindings": { |
161 | "currentSelectedTool": { | 168 | "currentSelectedTool": { |
@@ -188,6 +195,7 @@ | |||
188 | <div data-montage-id="rotateStageProperties"></div> | 195 | <div data-montage-id="rotateStageProperties"></div> |
189 | <div data-montage-id="panProperties"></div> | 196 | <div data-montage-id="panProperties"></div> |
190 | <div data-montage-id="zoomProperties"></div> | 197 | <div data-montage-id="zoomProperties"></div> |
198 | <div data-montage-id="bindingProperties"></div> | ||
191 | <div data-montage-id="disabledCondition" class="panelDisabled"></div> | 199 | <div data-montage-id="disabledCondition" class="panelDisabled"></div> |
192 | </div> | 200 | </div> |
193 | </body> | 201 | </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> | ||