aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rw-r--r--js/components/converter/string-units-converter.js2
-rw-r--r--js/components/converter/string-value-converter.js2
-rwxr-xr-xjs/components/tools-properties/fill-properties.reel/fill-properties.html41
-rwxr-xr-xjs/components/tools-properties/fill-properties.reel/fill-properties.js19
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css15
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html116
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js28
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.js27
-rwxr-xr-xjs/controllers/document-controller.js26
-rwxr-xr-xjs/controllers/elements/body-controller.js4
-rwxr-xr-xjs/controllers/elements/component-controller.js4
-rwxr-xr-xjs/controllers/elements/element-controller.js102
-rwxr-xr-xjs/controllers/elements/shapes-controller.js103
-rwxr-xr-xjs/data/menu-data.js12
-rwxr-xr-xjs/data/tools-data.js4
-rwxr-xr-xjs/document/document-html.js14
-rwxr-xr-xjs/document/helpers/webgl-helper.js14
-rwxr-xr-xjs/document/mediators/template.js756
-rwxr-xr-xjs/document/models/base.js58
-rwxr-xr-xjs/document/models/html.js48
-rw-r--r--js/document/templates/app/main.js51
-rwxr-xr-xjs/document/templates/banner/index.html24
-rwxr-xr-xjs/document/templates/html/index.html27
-rwxr-xr-xjs/document/views/design.js92
-rwxr-xr-xjs/helper-classes/3D/draw-utils.js6
-rwxr-xr-xjs/helper-classes/3D/math-utils.js11
-rwxr-xr-xjs/helper-classes/3D/snap-manager.js14
-rw-r--r--js/io/system/ninjalibrary.js42
-rw-r--r--js/io/system/ninjalibrary.json2
-rw-r--r--js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js5
-rwxr-xr-xjs/lib/NJUtils.js120
-rwxr-xr-xjs/lib/geom/brush-stroke.js93
-rwxr-xr-xjs/lib/geom/sub-path.js331
-rwxr-xr-xjs/mediators/drag-drop-mediator.js2
-rwxr-xr-xjs/mediators/element-mediator.js123
-rw-r--r--js/mediators/io-mediator.js712
-rwxr-xr-xjs/mediators/keyboard-mediator.js7
-rwxr-xr-xjs/models/element-model.js94
-rwxr-xr-xjs/ninja.reel/ninja.js41
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js96
-rwxr-xr-xjs/panels/components-panel.reel/components-panel.js64
-rwxr-xr-xjs/stage/stage.reel/stage.js5
-rw-r--r--js/tools/BrushTool.js15
-rwxr-xr-xjs/tools/EyedropperTool.js1
-rwxr-xr-xjs/tools/FillTool.js33
-rwxr-xr-xjs/tools/InkBottleTool.js50
-rwxr-xr-xjs/tools/LineTool.js109
-rwxr-xr-xjs/tools/PenTool.js445
-rwxr-xr-xjs/tools/SelectionTool.js114
-rwxr-xr-xjs/tools/ShapeTool.js45
-rwxr-xr-xjs/tools/TagTool.js15
-rwxr-xr-xjs/tools/drawing-tool.js3
-rwxr-xr-xjs/tools/modifier-tool-base.js2
53 files changed, 2488 insertions, 1701 deletions
diff --git a/js/components/converter/string-units-converter.js b/js/components/converter/string-units-converter.js
index 6b97d5c5..9f6e4112 100644
--- a/js/components/converter/string-units-converter.js
+++ b/js/components/converter/string-units-converter.js
@@ -9,7 +9,6 @@ var Montage = require("montage").Montage,
9 9
10exports.StringUnitsConverter = Montage.create(Converter, { 10exports.StringUnitsConverter = Montage.create(Converter, {
11 11
12 // convert fahrenheit to celsius (showing our non-metric heritage here)
13 convert: { 12 convert: {
14 value: function(value) { 13 value: function(value) {
15 if(value) { 14 if(value) {
@@ -20,7 +19,6 @@ exports.StringUnitsConverter = Montage.create(Converter, {
20 } 19 }
21 }, 20 },
22 21
23 // revert celsius to fahrenheit
24 revert: { 22 revert: {
25 value: function(value) { 23 value: function(value) {
26 console.log("revert string to unit ", value); 24 console.log("revert string to unit ", value);
diff --git a/js/components/converter/string-value-converter.js b/js/components/converter/string-value-converter.js
index 28d7dd29..f397f731 100644
--- a/js/components/converter/string-value-converter.js
+++ b/js/components/converter/string-value-converter.js
@@ -9,7 +9,6 @@ var Montage = require("montage").Montage,
9 9
10exports.StringValueConverter = Montage.create(Converter, { 10exports.StringValueConverter = Montage.create(Converter, {
11 11
12 // convert fahrenheit to celsius (showing our non-metric heritage here)
13 convert: { 12 convert: {
14 value: function(value) { 13 value: function(value) {
15 console.log(value); 14 console.log(value);
@@ -18,7 +17,6 @@ exports.StringValueConverter = Montage.create(Converter, {
18 } 17 }
19 }, 18 },
20 19
21 // revert celsius to fahrenheit
22 revert: { 20 revert: {
23 value: function(value) { 21 value: function(value) {
24 console.log("revert string to value ", value); 22 console.log("revert string to value ", value);
diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.html b/js/components/tools-properties/fill-properties.reel/fill-properties.html
index 734966dc..ca447b8b 100755
--- a/js/components/tools-properties/fill-properties.reel/fill-properties.html
+++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html
@@ -11,10 +11,35 @@
11 11
12 <script type="text/montage-serialization"> 12 <script type="text/montage-serialization">
13 { 13 {
14 "_fillMaterialCB": { 14 "useFillColor": {
15 "prototype": "montage/ui/checkbox.reel",
16 "properties": {
17 "element": {"#": "useFillColor"},
18 "identifier": "useFillColor",
19 "checked": true
20 }
21 },
22
23 "useWebGL": {
24 "prototype": "montage/ui/checkbox.reel",
25 "properties": {
26 "element": {"#": "useWebGL"},
27 "identifier": "useWebGL",
28 "checked": false
29 },
30 "listeners": [
31 {
32 "type": "action",
33 "listener": {"@": "owner"},
34 "capture": false
35 }
36 ]
37 },
38
39 "fillMaterial": {
15 "prototype": "js/components/combobox.reel", 40 "prototype": "js/components/combobox.reel",
16 "properties": { 41 "properties": {
17 "element": {"#": "fillMaterialCB"}, 42 "element": {"#": "fillMaterial"},
18 "labelField": "_name", 43 "labelField": "_name",
19 "dataField": "_name" 44 "dataField": "_name"
20 } 45 }
@@ -24,11 +49,12 @@
24 "properties": { 49 "properties": {
25 "element": {"#": "fillProperties"}, 50 "element": {"#": "fillProperties"},
26 51
52 "useFillColor": {"@": "useFillColor"},
27 "_fillColorCtrl": {"#": "fillColorCtrl"}, 53 "_fillColorCtrl": {"#": "fillColorCtrl"},
28 54
29 "_useWebGL": {"#": "useWebGLCH"}, 55 "useWebGL": {"@": "useWebGL"},
30 "_materialsContainer": {"#": "materialsContainer"}, 56 "_materialsContainer": {"#": "materialsContainer"},
31 "_fillMaterial": {"@": "_fillMaterialCB"} 57 "fillMaterial": {"@": "fillMaterial"}
32 } 58 }
33 } 59 }
34 } 60 }
@@ -38,16 +64,17 @@
38 64
39 <body> 65 <body>
40 <div data-montage-id="fillProperties" class="subToolHolderPanel optionsFillTool toolOptionsFloatChildren"> 66 <div data-montage-id="fillProperties" class="subToolHolderPanel optionsFillTool toolOptionsFloatChildren">
67 <input data-montage-id="useFillColor" type="checkbox" name="useFillColorControl" class="nj-skinned"/>
41 <div class="toolColorChipIcon FillTool"></div> 68 <div class="toolColorChipIcon FillTool"></div>
42 <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div> 69 <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div>
43 <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div>