aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.js25
-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/document-controller.js74
-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/data/menu-data.js61
-rwxr-xr-xjs/document/controllers/document.js45
-rwxr-xr-xjs/document/document-html.js322
-rwxr-xr-xjs/document/document-text.js (renamed from js/document/controllers/base-controller.js)14
-rwxr-xr-xjs/document/html-document.js11
-rwxr-xr-xjs/document/mediators/io.js (renamed from js/document/mediators/base-mediator.js)14
-rwxr-xr-xjs/document/mediators/template.js (renamed from js/document/models/base-model.js)14
-rwxr-xr-xjs/document/models/base.js42
-rwxr-xr-xjs/document/models/html.js24
-rwxr-xr-xjs/document/models/text.js24
-rwxr-xr-xjs/document/templates/montage-web/default_html.css19
-rwxr-xr-xjs/document/templates/montage-web/index.html49
-rw-r--r--js/document/templates/montage-web/main.reel/main.js49
-rwxr-xr-xjs/document/templates/montage-web/package.json8
-rwxr-xr-xjs/document/views/base.js (renamed from js/document/views/base-view.js)14
-rwxr-xr-xjs/document/views/code.js25
-rwxr-xr-xjs/document/views/design.js25
-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/ninja.reel/ninja.js29
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.js21
-rwxr-xr-xjs/panels/properties.reel/properties.js5
-rwxr-xr-xjs/stage/stage.reel/stage.js4
-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
48 files changed, 2244 insertions, 1259 deletions
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js
index f35972b6..597577f1 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -63,16 +63,27 @@ exports.Breadcrumb = Montage.create(Component, {
63 63
64 parentNode = this.container; 64 parentNode = this.container;
65 65
66 while(parentNode.id !== "UserContent") { 66 // This is for the old template support.
67 // TODO: Remove marker for old template: NINJA-STAGE-REWORK
68 if(this.application.ninja.currentDocument.documentRoot.id === "UserContent") {
69 while(parentNode.id !== "UserContent") {
70 this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
71 parentNode = parentNode.parentNode;
72 }
73
74 // This is always the top container which is now hardcoded to body
75 this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": "Body"});
76 } else {
77 while(parentNode !== this.application.ninja.currentDocument.documentRoot) {
78 this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
79 parentNode = parentNode.parentNode;
80 }
81
82 // This is always the top container which is now hardcoded to body
67 this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName}); 83 this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
68 parentNode = parentNode.parentNode; 84 console.log("this works!");
69 } 85 }
70 86
71 // This is always the top container which is now hardcoded to body
72 this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": "Body"});
73
74
75
76 } 87 }
77 }, 88 },
78 89
diff --git a/js/components/layout/document-bar.reel/document-bar.js b/js/components/layout/document-bar.reel/document-bar.js
index 27402dff..56b61f1d 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 },