aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorAnanya Sen2012-02-23 13:52:32 -0800
committerAnanya Sen2012-02-23 13:52:32 -0800
commitec3d07c2fea4e79c68606234074f43d694982e5b (patch)
treedc7c830c361d35c04a4d9b6d55c6c36d7a5d61cd /js
parent7283884c39df537694b21419a3ea9e3ca7793b4b (diff)
parent287a0bad5b774a380ec6c8b3ddf24dc03234e248 (diff)
downloadninja-ec3d07c2fea4e79c68606234074f43d694982e5b.tar.gz
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts: js/document/html-document.js js/helper-classes/3D/snap-manager.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js')
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.html2
-rwxr-xr-xjs/components/layout/subtool-button.reel/subtool-button.html7
-rwxr-xr-xjs/components/layout/subtool-button.reel/subtool-button.js10
-rwxr-xr-xjs/components/layout/tool-button.reel/tool-button.html7
-rwxr-xr-xjs/components/layout/tool-button.reel/tool-button.js21
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.html19
-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/document-controller.js18
-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.js52
-rwxr-xr-xjs/document/html-document.js64
-rwxr-xr-xjs/document/templates/montage-html/index.html1
-rwxr-xr-xjs/document/templates/montage-html/styles.css5
-rwxr-xr-xjs/helper-classes/3D/snap-manager.js6
-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/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js28
-rw-r--r--js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js36
-rwxr-xr-xjs/lib/NJUtils.js4
-rwxr-xr-xjs/mediators/element-mediator.js12
-rw-r--r--js/mediators/io-mediator.js82
-rwxr-xr-xjs/ninja.reel/ninja.html3
-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/layout.js71
-rwxr-xr-xjs/stage/stage.reel/stage.js33
-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
77 files changed, 4394 insertions, 932 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/layout/subtool-button.reel/subtool-button.html b/js/components/layout/subtool-button.reel/subtool-button.html
index 9dad007d..24fce57c 100755
--- a/js/components/layout/subtool-button.reel/subtool-button.html
+++ b/js/components/layout/subtool-button.reel/subtool-button.html
@@ -16,8 +16,7 @@
16 "module": "js/components/layout/subtool-button.reel", 16 "module": "js/components/layout/subtool-button.reel",
17 "name": "SubToolButton", 17 "name": "SubToolButton",
18 "properties": { 18 "properties": {
19 "element": {"#": "buttonBackground"}, 19 "element": {"#": "toolButton"}
20 "button": {"#": "toolBarButton"}
21 } 20 }
22 } 21 }
23 } 22 }
@@ -26,9 +25,7 @@
26 </head> 25 </head>
27 26
28 <body> 27 <body>
29 <div id="buttonBackground" class="buttonBackground"> 28 <div id="toolButton" class="toolbutton"></div>
30 <div id="toolBarButton" class="buttonBackground"></div>
31 </div>
32 </body> 29 </body>
33 30
34</html> 31</html>
diff --git a/js/components/layout/subtool-button.reel/subtool-button.js b/js/components/layout/subtool-button.reel/subtool-button.js
index d1adca43..2b066f24 100755
--- a/js/components/layout/subtool-button.reel/subtool-button.js
+++ b/js/components/layout/subtool-button.reel/subtool-button.js
@@ -35,7 +35,7 @@ exports.SubToolButton = Montage.create(Component, {
35 boundObjectPropertyPath: "selected", 35 boundObjectPropertyPath: "selected",
36 oneway: false 36 oneway: false
37 }); 37 });
38 38 this.element.classList.add(this.data.id);
39 } 39 }
40 }, 40 },
41 41
@@ -43,13 +43,9 @@ exports.SubToolButton = Montage.create(Component, {
43 enumerable: false, 43 enumerable: false,
44 value: function() { 44 value: function() {
45 if(this._selected) { 45 if(this._selected) {
46 this.element.classList.add( "buttonSelected" ); 46 this.element.classList.add("active");
47 this.button.classList.remove( this.data.id + "Unpressed" );
48 this.button.classList.add( this.data.id + "Pressed" );
49 } else { 47 } else {
50 this.element.classList.remove( "buttonSelected" ); 48 this.element.classList.remove("active");
51 this.button.classList.remove( this.data.id + "Pressed" );
52 this.button.classList.add( this.data.id + "Unpressed" );
53 } 49 }
54 } 50 }
55 }, 51 },
diff --git a/js/components/layout/tool-button.reel/tool-button.html b/js/components/layout/tool-button.reel/tool-button.html
index 81a9b927..476b66f3 100755
--- a/js/components/layout/tool-button.reel/tool-button.html
+++ b/js/components/layout/tool-button.reel/tool-button.html
@@ -16,8 +16,7 @@
16 "module": "js/components/layout/tool-button.reel", 16 "module": "js/components/layout/tool-button.reel",
17 "name": "ToolButton", 17 "name": "ToolButton",
18 "properties": { 18 "properties": {
19 "element": {"#": "buttonBackground"}, 19 "element": {"#": "toolBarButton"}
20 "button": {"#": "toolBarButton"}
21 } 20 }
22 } 21 }
23 } 22 }
@@ -27,9 +26,7 @@
27 </head>