aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-23 10:38:51 -0800
committerJose Antonio Marquez2012-02-23 10:38:51 -0800
commitd764428023d87446fbbb153d8e04a23b900d71d5 (patch)
tree2581815db5567b52d4c59663ea9e37d6df057ca3 /js
parent3e1be6d4d4f0d3a2474af7d915954f9b6464fe2e (diff)
parentcc295dd0fb873505eed01c232bd987cf6e2dcdd9 (diff)
downloadninja-d764428023d87446fbbb153d8e04a23b900d71d5.tar.gz
Merge branch 'refs/heads/NinjaInternal' into Color
Diffstat (limited to 'js')
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.html2
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.css16
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.html2
-rwxr-xr-xjs/components/ui/color-chip.reel/color-chip.js20
-rwxr-xr-xjs/components/ui/file-input.reel/file-input.html6
-rwxr-xr-xjs/components/ui/file-input.reel/file-input.js2
-rwxr-xr-xjs/components/ui/input-group.reel/input-group.css2
-rwxr-xr-xjs/components/ui/input-group.reel/input-group.html10
-rwxr-xr-xjs/components/ui/property-control.reel/property-control.html6
-rwxr-xr-xjs/components/ui/property-control.reel/property-control.js27
-rwxr-xr-xjs/controllers/color-controller.js14
-rwxr-xr-xjs/controllers/elements/element-controller.js13
-rwxr-xr-xjs/controllers/elements/image-controller.js2
-rwxr-xr-xjs/controllers/elements/shapes-controller.js12
-rwxr-xr-xjs/controllers/elements/stage-controller.js2
-rwxr-xr-xjs/data/tools-data.js2
-rwxr-xr-xjs/helper-classes/3D/snap-manager.js1
-rwxr-xr-xjs/helper-classes/RDGE/GLCircle.js10
-rwxr-xr-xjs/helper-classes/RDGE/GLLine.js594
-rwxr-xr-xjs/helper-classes/RDGE/GLRectangle.js117
-rwxr-xr-xjs/helper-classes/RDGE/GLWorld.js45
-rw-r--r--js/helper-classes/RDGE/Materials/DeformMaterial.js133
-rw-r--r--js/helper-classes/RDGE/Materials/FlyMaterial.js133
-rw-r--r--js/helper-classes/RDGE/Materials/JuliaMaterial.js150
-rw-r--r--js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js149
-rw-r--r--js/helper-classes/RDGE/Materials/MandelMaterial.js151
-rw-r--r--js/helper-classes/RDGE/Materials/PlasmaMaterial.js134
-rw-r--r--js/helper-classes/RDGE/Materials/PulseMaterial.js263
-rw-r--r--js/helper-classes/RDGE/Materials/RadialBlurMaterial.js257
-rw-r--r--js/helper-classes/RDGE/Materials/ReliefTunnelMaterial.js133
-rw-r--r--js/helper-classes/RDGE/Materials/SquareTunnelMaterial.js133
-rw-r--r--js/helper-classes/RDGE/Materials/StarMaterial.js133
-rw-r--r--js/helper-classes/RDGE/Materials/TaperMaterial.js223
-rw-r--r--js/helper-classes/RDGE/Materials/TunnelMaterial.js133
-rw-r--r--js/helper-classes/RDGE/Materials/TwistMaterial.js149
-rw-r--r--js/helper-classes/RDGE/Materials/TwistVertMaterial.js248
-rw-r--r--js/helper-classes/RDGE/Materials/WaterMaterial.js133
-rw-r--r--js/helper-classes/RDGE/Materials/ZInvertMaterial.js133
-rwxr-xr-xjs/helper-classes/RDGE/MaterialsLibrary.js59
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/precompiled.js10
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/runtime.js14
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/scenegraphNodes.js8
-rw-r--r--js/helper-classes/RDGE/src/tools/compile-rdge-core.bat4
-rw-r--r--js/helper-classes/RDGE/src/tools/compile-rdge-core.sh3
-rw-r--r--js/helper-classes/RDGE/src/tools/compiler.jarbin0 -> 4927265 bytes
-rw-r--r--js/helper-classes/RDGE/src/tools/rdge-compiled.js454
-rwxr-xr-xjs/panels/Materials/Materials.xml2
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.html8
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.js121
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.css131
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.html18
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.js47
-rwxr-xr-xjs/panels/properties/content.reel/content.js2
-rwxr-xr-xjs/preloader/Preloader.js21
-rwxr-xr-xjs/stage/stage.reel/stage.js31
-rwxr-xr-xjs/tools/EyedropperTool.js206
-rwxr-xr-xjs/tools/FillTool.js3
-rwxr-xr-xjs/tools/InkBottleTool.js35
-rwxr-xr-xjs/tools/RotateStage3DTool.js7
-rwxr-xr-xjs/tools/ZoomTool.js2
-rwxr-xr-xjs/tools/modifier-tool-base.js2
61 files changed, 4118 insertions, 763 deletions
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html
index 67328479..c1b9ed61 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.html
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.html
@@ -62,7 +62,7 @@
62 62
63 <div id="breadcrumb_trail" class="breadcrumbtrail"> 63 <div id="breadcrumb_trail" class="breadcrumbtrail">
64 <div id="breadcrumb_container" class="bread_crumb"> 64 <div id="breadcrumb_container" class="bread_crumb">
65 <div id="breadcrumb_button" class="toolbutton"></div> 65 <div id="breadcrumb_button"></div>
66 </div> 66 </div>
67 </div> 67 </div>
68 68
diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.css b/js/components/tools-properties/rect-properties.reel/rect-properties.css
index f50a9873..74509555 100755
--- a/js/components/tools-properties/rect-properties.reel/rect-properties.css
+++ b/js/components/tools-properties/rect-properties.reel/rect-properties.css
@@ -4,7 +4,7 @@
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.button { 7.rectProperties .button {
8 border:none; 8 border:none;
9 cursor:default; 9 cursor:default;
10 text-align:center; 10 text-align:center;
@@ -12,28 +12,30 @@
12 opacity:0.8; 12 opacity:0.8;
13 display:table-cell; 13 display:table-cell;
14 vertical-align:middle; 14 vertical-align:middle;
15 width:100%;
16 height:100%;
17 background-color:#333333; 15 background-color:#333333;
18 color:white; 16 color:white;
19} 17}
20 18
21.button:hover 19.rectProperties .subToolButton {
20 float:left;
21}
22
23.rectProperties .button:hover
22{ 24{
23 opacity:1; 25 opacity:1;
24} 26}
25 27
26.button:active 28.rectProperties .button:active
27{ 29{
28 outline:solid 1px black; 30 outline:solid 1px black;
29} 31}
30 32
31.button.on 33.rectProperties .button.on
32{ 34{
33 background-color: #333333; 35 background-color: #333333;
34} 36}
35 37
36.button.off 38.rectProperties .button.off
37{ 39{
38 background-color: #cccccc; 40 background-color: #cccccc;
39 color:black; 41 color:black;
diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.html b/js/components/tools-properties/rect-properties.reel/rect-properties.html
index e5c52466..214ff1d5 100755
--- a/js/components/tools-properties/rect-properties.reel/rect-properties.html
+++ b/js/components/tools-properties/rect-properties.reel/rect-properties.html
@@ -68,7 +68,7 @@
68 </head> 68 </head>
69 69
70 <body> 70 <body>
71 <div id="rectProperties"> 71 <div id="rectProperties" class="rectProperties">
72 <button id="lockButton" class="unselectable subToolButton button LockToolUp" style=" margin-left:20px"></button> 72 <button id="lockButton" class="unselectable subToolButton button LockToolUp" style=" margin-left:20px"></button>
73 <div id="TLRadiusLabel" class="unselectable subToolButton cornerRadius topLeft"></div> 73 <div id="TLRadiusLabel" class="unselectable subToolButton cornerRadius topLeft"></div>
74 <div id="TLRadiusControl" class="label"></div> 74 <div id="TLRadiusControl" class="label"></div>
diff --git a/js/components/ui/color-chip.reel/color-chip.js b/js/components/ui/color-chip.reel/color-chip.js
index e51bdd8a..ed1ac27a 100755
--- a/js/components/ui/color-chip.reel/color-chip.js
+++ b/js/components/ui/color-chip.reel/color-chip.js
@@ -29,12 +29,20 @@ var ColorChip = exports.ColorChip = Montage.create(Component, {
29 value: 20 29 value: 20
30 }, 30 },
31 31
32 initialColor: { 32 color: {
33 value: false 33 value: {r:0, g:0, b:0, a:1, css:'rgb(0,0,0)', mode:'rgb'}
34 }, 34 },
35 35
36 changeDelegate: { 36 changeDelegate: {
37 value: null 37 value: function(event) {
38 this.color = event._event.color;
39
40 var evt = document.createEvent("CustomEvent");
41 evt.initEvent("change", true, true);
42 evt.type = "change";
43