aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-26 13:15:26 -0700
committerValerio Virgillito2012-06-26 13:15:26 -0700
commit87a8b62f71bb72274c3dd1fa389e88c12d482ebb (patch)
treebf9f995e2972c0a61355f24e64231cdf0b2c86b5 /js/components/layout
parent8821e662484aedb027e26a873883e6ca3fb55a51 (diff)
parenta95bba25c3ba6e31784a452e9b94748cc870ba5d (diff)
downloadninja-87a8b62f71bb72274c3dd1fa389e88c12d482ebb.tar.gz
Merge pull request #323 from dhg637/binding
Binding View - Binding Tool & Binding Panel
Diffstat (limited to 'js/components/layout')
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.html11
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.html12
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>