diff options
-rwxr-xr-x | css/ninja.css | 2 | ||||
-rw-r--r-- | images/cursors/binding.png | bin | 0 -> 1359 bytes | |||
-rw-r--r-- | images/tools/binding.png | bin | 0 -> 1140 bytes | |||
-rwxr-xr-x | js/components/layout/tools-list.reel/tools-list.html | 4 | ||||
-rwxr-xr-x | js/components/layout/tools-properties.reel/tools-properties.html | 11 | ||||
-rwxr-xr-x | js/components/tools-properties/binding-properties.reel/binding-properties.css | 6 | ||||
-rwxr-xr-x | js/components/tools-properties/binding-properties.reel/binding-properties.html | 35 | ||||
-rwxr-xr-x | js/components/tools-properties/binding-properties.reel/binding-properties.js | 25 | ||||
-rwxr-xr-x | js/data/tools-data.js | 11 | ||||
-rw-r--r-- | js/tools/bindingTool.js | 32 | ||||
-rwxr-xr-x | scss/imports/scss/_toolbar.scss | 4 |
11 files changed, 128 insertions, 2 deletions
diff --git a/css/ninja.css b/css/ninja.css index 6a804e99..1531b76c 100755 --- a/css/ninja.css +++ b/css/ninja.css | |||
@@ -871,6 +871,8 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 | |||
871 | 871 | ||
872 | .InkBottleTool { background-image: url("../images/tools/Tool-FillColor.png"); } | 872 | .InkBottleTool { background-image: url("../images/tools/Tool-FillColor.png"); } |
873 | 873 | ||
874 | .bindingTool { background-image: url("../images/tools/binding.png"); } | ||
875 | |||
874 | .toolsList .colortoolbar { padding-left: 1px; padding-top: 4px; } | 876 | .toolsList .colortoolbar { padding-left: 1px; padding-top: 4px; } |
875 | 877 | ||
876 | .toolsList .colortoolbar button { width: 27px; height: 27px; background: black; border: 1px solid #000; padding: 0; margin: 0px; } | 878 | .toolsList .colortoolbar button { width: 27px; height: 27px; background: black; border: 1px solid #000; padding: 0; margin: 0px; } |
diff --git a/images/cursors/binding.png b/images/cursors/binding.png new file mode 100644 index 00000000..16e84574 --- /dev/null +++ b/images/cursors/binding.png | |||
Binary files differ | |||
diff --git a/images/tools/binding.png b/images/tools/binding.png new file mode 100644 index 00000000..33545ee1 --- /dev/null +++ b/images/tools/binding.png | |||
Binary files differ | |||
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..112cfcb0 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/> |
@@ -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": { |
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..7f1b0f7f --- /dev/null +++ b/js/components/tools-properties/binding-properties.reel/binding-properties.css | |||
@@ -0,0 +1,6 @@ | |||
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 | |||
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..5a55d0a4 --- /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"> | ||
28 | <label>View All Bindings</label> | ||
29 | <input type="checkbox" /> | ||
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 | ||
diff --git a/js/data/tools-data.js b/js/data/tools-data.js index 4d009530..12c6c965 100755 --- a/js/data/tools-data.js +++ b/js/data/tools-data.js | |||
@@ -222,6 +222,17 @@ exports.ToolsData = Montage.create(Montage, { | |||
222 | "lastInGroup": true, | 222 | "lastInGroup": true, |
223 | "container": false, | 223 | "container": false, |
224 | "selected": false | 224 | "selected": false |
225 | }, | ||
226 | { | ||
227 | "id": "bindingTool", | ||
228 | "properties": "bindingProperties", | ||
229 | "spriteSheet": true, | ||
230 | "action": "bindingTool", | ||
231 | "toolTip": "Binding (B)", | ||
232 | "cursor": "url('images/cursors/binding.png'),default", | ||
233 | "lastInGroup": true, | ||
234 | "container": false, | ||
235 | "selected": false | ||
225 | } | 236 | } |
226 | ] | 237 | ] |
227 | }, | 238 | }, |
diff --git a/js/tools/bindingTool.js b/js/tools/bindingTool.js new file mode 100644 index 00000000..05a4965f --- /dev/null +++ b/js/tools/bindingTool.js | |||
@@ -0,0 +1,32 @@ | |||
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 | DrawingTool = require("js/tools/drawing-tool").DrawingTool; | ||
9 | |||
10 | exports.BindingTool = Montage.create(DrawingTool, { | ||
11 | drawingFeedback: { value: { mode: "Draw2D", type: "" } }, | ||
12 | |||
13 | HandleLeftButtonDown: { | ||
14 | value: function(event) { | ||
15 | NJevent("enableStageMove"); | ||
16 | |||
17 | } | ||
18 | }, | ||
19 | |||
20 | HandleMouseMove: { | ||
21 | value: function(event) { | ||
22 | this.doDraw(event); | ||
23 |