aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.html4
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.html10
-rwxr-xr-xjs/components/tools-properties/binding-properties.reel/binding-properties.css17
-rwxr-xr-xjs/components/tools-properties/binding-properties.reel/binding-properties.html35
-rwxr-xr-xjs/components/tools-properties/binding-properties.reel/binding-properties.js25
-rwxr-xr-xjs/controllers/styles-controller.js4
-rw-r--r--js/controllers/tree-controller.js185
-rw-r--r--js/data/panels-data.js33
-rwxr-xr-xjs/data/tools-data.js11
-rwxr-xr-xjs/document/templates/banner/package.json3
-rw-r--r--js/io/system/ninjalibrary.js28
-rw-r--r--js/io/system/ninjalibrary.json4
-rwxr-xr-xjs/lib/drawing/world.js6
-rwxr-xr-xjs/lib/geom/brush-stroke.js2
-rwxr-xr-xjs/lib/geom/circle.js1433
-rwxr-xr-xjs/lib/geom/geom-obj.js852
-rwxr-xr-xjs/lib/geom/line.js914
-rwxr-xr-xjs/lib/geom/rectangle.js1409
-rwxr-xr-xjs/lib/geom/sub-path.js2
-rwxr-xr-xjs/ninja.reel/ninja.js20
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.html2
-rwxr-xr-xjs/panels/Panel.reel/Panel.js10
-rwxr-xr-xjs/panels/PanelContainer.reel/PanelContainer.html20
-rwxr-xr-xjs/panels/PanelContainer.reel/PanelContainer.js29
-rw-r--r--js/panels/binding-panel.reel/binding-panel.css0
-rw-r--r--js/panels/binding-panel.reel/binding-panel.html28
-rw-r--r--js/panels/binding-panel.reel/binding-panel.js12
-rw-r--r--js/panels/objects.reel/objects.css0
-rw-r--r--js/panels/objects.reel/objects.html28
-rw-r--r--js/panels/objects.reel/objects.js7
-rw-r--r--js/panels/presets/animations-presets.reel/animations-presets.html5
-rw-r--r--js/panels/presets/style-presets.reel/style-presets.html2
-rw-r--r--js/panels/presets/transitions-presets.reel/transitions-presets.html5
-rwxr-xr-xjs/tools/LineTool.js3
-rwxr-xr-xjs/tools/OvalTool.js2
-rwxr-xr-xjs/tools/RectTool.js2
-rwxr-xr-xjs/tools/TextTool.js40
-rw-r--r--js/tools/bindingTool.js51
38 files changed, 2770 insertions, 2473 deletions
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>
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>
2This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3No 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
7var Montage = require("montage/core/core").Montage;
8var Component = require("montage/ui/component").Component;
9var ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties;
10
11exports.BindingProperties = Montage.create(ToolProperties, {
12
13 _subPrepare: {
14 value: function() {
15