aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorEric Guzman2012-03-29 16:29:04 -0700
committerEric Guzman2012-03-29 16:29:04 -0700
commitccd57d8610a7839cf14b2c9e354b64acf53093a7 (patch)
treef11b4418483fd21831b72ca6dc0451422a25bfe2 /js
parent7aefa059c79c9bef5c7a8a93cdfbd1ce55f69118 (diff)
parentf4949cab544886702e7ad6eeaa6215125c7b067a (diff)
downloadninja-ccd57d8610a7839cf14b2c9e354b64acf53093a7.tar.gz
Merge branch 'refs/heads/master' into PresetsPI
Diffstat (limited to 'js')
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.css10
-rwxr-xr-xjs/components/layout/document-entry.reel/document-entry.css15
-rwxr-xr-xjs/components/layout/documents-tab.reel/documents-tab.css11
-rwxr-xr-xjs/components/menu/menu-item.reel/menu-item.js13
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.html25
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.js30
-rw-r--r--js/components/ui/icon-list-basic/icon.reel/icon.css2
-rwxr-xr-xjs/components/ui/icon-list-basic/icon.reel/icon.js2
-rwxr-xr-xjs/components/ui/tree-basic/treeItem.reel/treeItem.css2
-rwxr-xr-xjs/components/ui/tree-basic/treeItem.reel/treeItem.js2
-rwxr-xr-xjs/controllers/color-controller.js4
-rwxr-xr-xjs/controllers/document-controller.js26
-rwxr-xr-xjs/controllers/elements/shapes-controller.js66
-rwxr-xr-xjs/data/menu-data.js912
-rwxr-xr-xjs/data/pi/pi-data.js141
-rwxr-xr-xjs/document/html-document.js6
-rwxr-xr-xjs/document/text-document.js8
-rwxr-xr-xjs/helper-classes/3D/snap-manager.js2
-rwxr-xr-xjs/helper-classes/3D/vec-utils.js2
-rwxr-xr-xjs/helper-classes/3D/view-utils.js13
-rwxr-xr-xjs/io/system/coreioapi.js2
-rwxr-xr-xjs/io/ui/file-picker/file-input-field.reel/file-input-field.js1
-rwxr-xr-xjs/io/ui/file-picker/file-picker-controller.js9
-rw-r--r--js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js13
-rwxr-xr-xjs/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js3
-rw-r--r--js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js80
-rwxr-xr-xjs/io/ui/new-file-dialog/new-file-workflow-controller.js14
-rw-r--r--js/io/ui/save-as-dialog.reel/save-as-dialog.js50
-rwxr-xr-xjs/lib/drawing/world.js27
-rwxr-xr-xjs/lib/geom/brush-stroke.js638
-rwxr-xr-xjs/lib/geom/geom-obj.js3
-rwxr-xr-xjs/lib/geom/sub-path.js18
-rw-r--r--js/lib/rdge/materials/radial-blur-material.js18
-rwxr-xr-xjs/mediators/keyboard-mediator.js2
-rwxr-xr-xjs/models/materials-model.js1
-rwxr-xr-xjs/ninja.reel/ninja.html101
-rwxr-xr-xjs/ninja.reel/ninja.js120
-rwxr-xr-xjs/panels/Splitter.js2
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css4
-rw-r--r--js/panels/resize-composer.js34
-rwxr-xr-xjs/stage/stage-view.reel/stage-view.js12
-rw-r--r--js/tools/BrushTool.js174
-rwxr-xr-xjs/tools/EyedropperTool.js28
-rwxr-xr-xjs/tools/PenTool.js33
44 files changed, 1919 insertions, 760 deletions
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.css b/js/components/layout/bread-crumb.reel/bread-crumb.css
index dcfd471c..26a56b45 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.css
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.css
@@ -4,14 +4,20 @@
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.breadcrumbTrail{ 7.breadcrumbTrail {
8
8 background-color: #282828; 9 background-color: #282828;
9 border-style: double;
10 height: 26px; 10 height: 26px;
11 position:relative; 11 position:relative;
12 -webkit-box-flex: 0; 12 -webkit-box-flex: 0;
13} 13}
14 14
15.mainContentContainer > section.breadcrumbTrail {
16 border:0;
17 margin:0;
18 border-bottom:1px solid #000;
19 margin-bottom:1px;
20}
15.breadcrumbTrail button.nj-skinned { 21.breadcrumbTrail button.nj-skinned {
16 float: left; 22 float: left;
17 width: 60px; 23 width: 60px;
diff --git a/js/components/layout/document-entry.reel/document-entry.css b/js/components/layout/document-entry.reel/document-entry.css
index 52d08d72..4601974f 100755
--- a/js/components/layout/document-entry.reel/document-entry.css
+++ b/js/components/layout/document-entry.reel/document-entry.css
@@ -4,19 +4,26 @@
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.documentEntry{
8 white-space: nowrap;
9}
10
7.documentEntry span 11.documentEntry span
8{ 12{
9 /*display: inline-block;*/ 13 display: inline-block;
10 white-space: nowrap; 14 white-space: pre;
11 overflow: hidden; 15 overflow: hidden;
12 text-overflow: ellipsis; /* Causes ... to appear ?? */ 16 text-overflow: ellipsis;
13 max-width:100px; 17 max-width:100px;
18 width:85%;
19 min-width:0px;
14} 20}
15 21
16.documentEntry img { 22.documentEntry img {
17 opacity: 0.5; /* 50% */ 23 opacity: 0.5; /* 50% */
18 padding-left: 5px;
19 width: 12px; 24 width: 12px;
25 max-width:12px;
26 min-width:5px;
20 height: 12px; 27 height: 12px;
21 -webkit-transition: opacity 0.2s ease; 28 -webkit-transition: opacity 0.2s ease;
22 transition: opacity 0.2s ease; 29 transition: opacity 0.2s ease;
diff --git a/js/components/layout/documents-tab.reel/documents-tab.css b/js/components/layout/documents-tab.reel/documents-tab.css
index 689eb777..da00f727 100755
--- a/js/components/layout/documents-tab.reel/documents-tab.css
+++ b/js/components/layout/documents-tab.reel/documents-tab.css
@@ -12,7 +12,6 @@
12} 12}
13 13
14.openDocuments { 14.openDocuments {
15 float: left;
16 height: 25px; 15 height: 25px;
17 width: 100%; 16 width: 100%;
18 font-size: 12px; 17 font-size: 12px;
@@ -21,16 +20,20 @@
21 padding: 0; 20 padding: 0;
22 position: relative; 21 position: relative;
23 text-decoration: none; 22 text-decoration: none;
23 display: -webkit-box;
24 -webkit-box-orient: horizontal;
25 -webkit-box-pack:start;
26 -webkit-box-align:start;
24} 27}
25 28
26.openDocuments li { 29.openDocuments li {
27 border-right: 1px solid black; 30 border-right: 1px solid black;
28 cursor: pointer; 31 cursor: pointer;
29 display: inline;
30 float: left;
31 padding: 0.5em 1em; 32 padding: 0.5em 1em;
32 text-shadow: 1px 1px 1px #000000;
33 vertical-align: middle; 33 vertical-align: middle;
34 text-shadow: 1px 1px 1px #000000;
35 -webkit-box-flex: 1;
36 max-width: 115px;
34} 37}
35 38
36.openDocuments li:hover, 39.openDocuments li:hover,
diff --git a/js/components/menu/menu-item.reel/menu-item.js b/js/components/menu/menu-item.reel/menu-item.js
index 64a89a6a..26fc7573 100755
--- a/js/components/menu/menu-item.reel/menu-item.js
+++ b/js/components/menu/menu-item.reel/menu-item.js
@@ -61,6 +61,8 @@ exports.MenuItem = Montage.create(Component, {
61 61
62 prepareForDraw: { 62 prepareForDraw: {
63 value: function() { 63 value: function() {
64 var boundObject = this.application.ninja, strArr = null, i=0;
65
64 if(!this.data) return; 66 if(!this.data) return;
65 67
66 if(this.data.separator) { 68 if(this.data.separator) {
@@ -82,9 +84,14 @@ exports.MenuItem = Montage.create(Component, {
82 } 84 }
83 85
84 if(this.data.enabled.boundProperty) { 86 if(this.data.enabled.boundProperty) {
87
88 boundObject = this.application.ninja[this.data.enabled.boundObj];
89
85 Object.defineBinding(this, "enabled", { 90 Object.defineBinding(this, "enabled", {
86 boundObject: this.application.ninja[this.data.enabled.boundObj], 91 boundObject: boundObject,
87 boundObjectPropertyPath: this.data.enabled.boundProperty 92 boundObjectPropertyPath: this.data.enabled.boundProperty,
93 boundValueMutator: this.data.enabled.boundValueMutator,
94 oneway : this.data.enabled.oneway
88 }); 95 });
89 96
90 } else { 97 } else {
@@ -134,7 +141,7 @@ exports.MenuItem = Montage.create(Component, {
134