aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.js1
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.html2
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css24
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html137
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js49
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.html2
-rwxr-xr-xjs/controllers/elements/element-controller.js16
-rwxr-xr-xjs/controllers/elements/shapes-controller.js20
-rwxr-xr-xjs/controllers/elements/stage-controller.js2
-rwxr-xr-xjs/document/html-document.js4
-rwxr-xr-xjs/helper-classes/3D/vec-utils.js19
-rwxr-xr-xjs/helper-classes/3D/view-utils.js85
-rw-r--r--js/io/system/ninjalibrary.json2
-rwxr-xr-xjs/lib/drawing/world.js7
-rwxr-xr-xjs/lib/geom/anchor-point.js4
-rwxr-xr-xjs/lib/geom/brush-stroke.js16
-rwxr-xr-xjs/lib/geom/circle.js4
-rwxr-xr-xjs/lib/geom/rectangle.js20
-rwxr-xr-xjs/lib/geom/sub-path.js853
-rwxr-xr-xjs/mediators/drag-drop-mediator.js14
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.js21
-rwxr-xr-xjs/stage/tool-handle.js15
-rw-r--r--js/tools/BrushTool.js1
-rwxr-xr-xjs/tools/InkBottleTool.js22
-rwxr-xr-xjs/tools/PenTool.js1256
-rwxr-xr-xjs/tools/ToolBase.js12
-rwxr-xr-xjs/tools/drawing-tool-base.js2
27 files changed, 1460 insertions, 1150 deletions
diff --git a/js/components/layout/document-bar.reel/document-bar.js b/js/components/layout/document-bar.reel/document-bar.js
index 4dc39fd6..66a02725 100755
--- a/js/components/layout/document-bar.reel/document-bar.js
+++ b/js/components/layout/document-bar.reel/document-bar.js
@@ -57,7 +57,6 @@ exports.DocumentBar = Montage.create(Component, {
57 this._zoomFactor = value; 57 this._zoomFactor = value;
58 if (!this._firstDraw) 58 if (!this._firstDraw)
59 { 59 {
60 var viewUtils = this.application.ninja.stage.viewUtils;
61 this.application.ninja.stage.setZoom(value); 60 this.application.ninja.stage.setZoom(value);
62 } 61 }
63 } 62 }
diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.html b/js/components/tools-properties/brush-properties.reel/brush-properties.html
index 98442164..d9c35dc2 100755
--- a/js/components/tools-properties/brush-properties.reel/brush-properties.html
+++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html
@@ -84,7 +84,7 @@
84 </head> 84 </head>
85 85
86 <body> 86 <body>
87 <div id="brushProperties" class="subToolHolderPanel"> 87 <div data-montage-id="brushProperties" class="subToolHolderPanel">
88 <div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;"> 88 <div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;">
89 <label class="label"> Width:</label> 89 <label class="label"> Width:</label>
90 <div id="strokeSize" class="label"></div> 90 <div id="strokeSize" class="label"></div>
diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css
index 7f1b0f7f..a926a0b4 100755
--- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css
+++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css
@@ -4,3 +4,27 @@
4 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. 4 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5 </copyright> */ 5 </copyright> */
6 6
7.inkBottleProperties input[type="checkbox"].nj-skinned {
8 float:left;
9 margin-top:5px;
10}
11
12.inkBottleProperties select.nj-skinned {
13 float:left;
14 margin:2px 5px 0 0;
15}
16
17.inkBottleProperties label.disabled {
18 color:#999999;
19}
20
21.inkBottleProperties label.disabled:hover {
22 color:#999999;
23 background-color: transparent;
24 cursor:default;
25}
26
27.inkBottleProperties div.disabled:hover {
28 background-color: transparent;
29 cursor:default;
30} \ No newline at end of file
diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
index 1602e793..81facc49 100755
--- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
+++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
@@ -11,6 +11,30 @@
11 11
12 <script type="text/montage-serialization"> 12 <script type="text/montage-serialization">
13 { 13 {
14 "borderWidthCh": {
15 "prototype": "montage/ui/checkbox.reel",
16 "properties": {
17 "element": {"#": "useBorderWidthCh"},
18 "identifier": "useBorderWidth",
19 "checked": true
20 },
21 "listeners": [
22 {
23 "type": "action",
24 "listener": {"@": "owner"},
25 "capture": false
26 }
27 ]
28 },
29
30 "borderWidthLabel": {
31 "prototype": "montage/ui/dynamic-text.reel",
32 "properties": {
33 "element": {"#": "borderWidthLabel"},
34 "value": "Border:"
35 }
36 },
37
14 "borderWidthHT": { 38 "borderWidthHT": {
15 "module": "js/components/hottextunit.reel", 39 "module": "js/components/hottextunit.reel",
16 "name": "HotTextUnit", 40 "name": "HotTextUnit",
@@ -23,6 +47,54 @@
23 } 47 }
24 }, 48 },
25 49
50 "borderStyleCh": {
51 "prototype": "montage/ui/checkbox.reel",
52 "properties": {
53 "element": {"#": "useBorderStyleCh"},
54 "identifier": "useBorderStyle",
55 "checked": true
56 },
57 "listeners": [
58 {
59 "type": "action",
60 "listener": {"@": "owner"},
61 "capture": false
62 }
63 ]
64 },
65
66 "borderStyleLabel": {
67 "prototype": "montage/ui/dynamic-text.reel",
68 "properties": {
69 "element": {"#": "borderStyleLabel"},
70 "value": "Style:"
71 }
72 },
73
74 "strokeSizeCh": {
75 "prototype": "montage/ui/checkbox.reel",
76 "properties": {
77 "element": {"#": "useStrokeSizeCh"},
78 "identifier": "useStrokeSize",
79 "checked": true
80 },
81 "listeners": [
82 {
83 "type": "action",
84 "listener": {"@": "owner"},
85 "capture": false
86 }
87 ]
88 },
89
90 "strokeSizeLabel": {
91 "prototype": "montage/ui/dynamic-text.reel",
92 "properties": {
93 "element": {"#": "strokeSizeLabel"},
94 "value": "Stroke:"
95 }
96 },
97
26 "strokeSizeHT": { 98 "strokeSizeHT": {
27 "module": "js/components/hottextunit.reel", 99 "module": "js/components/hottextunit.reel",
28 "name": "HotTextUnit", 100 "name": "HotTextUnit",
@@ -36,6 +108,22 @@
36 } 108 }
37 }, 109 },
38