diff options
| author | Eric Guzman | 2012-06-27 10:32:47 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-06-27 10:32:47 -0700 |
| commit | 58f1de4f1cb0f59abd47cec4430a032c073f85e9 (patch) | |
| tree | a6c2af9be68e6881311074bd3c8cc461deee7203 /js/components/layout | |
| parent | a72b6809e214eb524f866440a55f8366f078c240 (diff) | |
| parent | 2ebf3e3ea24d0d580575dfa13d31588dac1de445 (diff) | |
| download | ninja-58f1de4f1cb0f59abd47cec4430a032c073f85e9.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into CSSPanel_GIO
Diffstat (limited to 'js/components/layout')
| -rwxr-xr-x | js/components/layout/tools-list.reel/tools-list.html | 11 | ||||
| -rwxr-xr-x | js/components/layout/tools-properties.reel/tools-properties.html | 12 |
2 files changed, 19 insertions, 4 deletions
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html index 3a9661f5..5b175f49 100755 --- a/js/components/layout/tools-list.reel/tools-list.html +++ b/js/components/layout/tools-list.reel/tools-list.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE HTML> | 1 | <!DOCTYPE HTML> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 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/> | 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
| @@ -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", |
| @@ -126,7 +129,11 @@ | |||
| 126 | "EraserTool": {"@": "EraserTool1"}, | 129 | "EraserTool": {"@": "EraserTool1"}, |
| 127 | "RotateStageTool3D": {"@": "RotateStageTool3D1"}, | 130 | "RotateStageTool3D": {"@": "RotateStageTool3D1"}, |
| 128 | "PanTool": {"@": "PanTool1"}, | 131 | "PanTool": {"@": "PanTool1"}, |
| 129 | "ZoomTool": {"@": "ZoomTool1"} | 132 | "ZoomTool": {"@": "ZoomTool1"}, |
| 133 | "bindingTool": {"@": "BindingTool1"}, | ||
| 134 | "components": [ | ||
| 135 | {"@": "repetition1"} | ||
| 136 | ] | ||
| 130 | } | 137 | } |
| 131 | } | 138 | } |
| 132 | } | 139 | } |
diff --git a/js/components/layout/tools-properties.reel/tools-properties.html b/js/components/layout/tools-properties.reel/tools-properties.html index 6b766532..07444010 100755 --- a/js/components/layout/tools-properties.reel/tools-properties.html +++ b/js/components/layout/tools-properties.reel/tools-properties.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE HTML> | 1 | <!DOCTYPE HTML> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 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/> | 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
| @@ -102,6 +102,12 @@ | |||
| 102 | "element": {"#": "zoomProperties"} | 102 | "element": {"#": "zoomProperties"} |
| 103 | } | 103 | } |
| 104 | }, | 104 | }, |
| 105 | "bindingProperties": { | ||
| 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": {"@": "eraserProperties"}, | 140 | "eraserProperties": {"@": "eraserProperties"}, |
| 135 | "rotateStageProperties": {"@": "rotateStageProperties"}, | 141 | "rotateStageProperties": {"@": "rotateStageProperties"}, |
| 136 | "panProperties": {"@": "panProperties"}, | 142 | "panProperties": {"@": "panProperties"}, |
| 137 | "zoomProperties": {"@": "zoomProperties"} | 143 | "zoomProperties": {"@": "zoomProperties"}, |
| 144 | "bindingProperties": {"@": "bindingProperties"} | ||
| 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> |