aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorArmen Kesablyan2012-03-19 11:01:00 -0700
committerArmen Kesablyan2012-03-19 11:01:00 -0700
commit60107392554fa993a16e748f7281be423055cd19 (patch)
tree408b7b9422265d29df2c37eb6a120c09812abf2c /js
parent725bb869618b9e0ebb2820a24bca5d1cf53a4810 (diff)
parent954f5a13e371febcb1c0fb8015c577ee51c23130 (diff)
downloadninja-60107392554fa993a16e748f7281be423055cd19.tar.gz
Merge branch 'refs/heads/master' into DataBinding
Diffstat (limited to 'js')
-rw-r--r--js/components/focus-manager.reel/focus-manager.js49
-rwxr-xr-xjs/controllers/document-controller.js2
-rwxr-xr-xjs/controllers/elements/element-controller.js17
-rwxr-xr-xjs/document/html-document.js14
-rwxr-xr-xjs/helper-classes/3D/vec-utils.js71
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/MeshManager.js2
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/run_state.js16
-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.jarbin4927265 -> 0 bytes
-rw-r--r--js/helper-classes/RDGE/src/tools/rdge-compiled.js452
-rwxr-xr-xjs/helper-classes/backup-delete/GLAnchorPoint.js168
-rwxr-xr-xjs/helper-classes/backup-delete/GLBrushStroke.js561
-rwxr-xr-xjs/helper-classes/backup-delete/GLCircle.js711
-rwxr-xr-xjs/helper-classes/backup-delete/GLGeomObj.js324
-rwxr-xr-xjs/helper-classes/backup-delete/GLLight.js30
-rwxr-xr-xjs/helper-classes/backup-delete/GLLine.js507
-rwxr-xr-xjs/helper-classes/backup-delete/GLMaterial.js308
-rwxr-xr-xjs/helper-classes/backup-delete/GLPath.js232
-rwxr-xr-xjs/helper-classes/backup-delete/GLRectangle.js1238
-rwxr-xr-xjs/helper-classes/backup-delete/GLSubpath.js1286
-rwxr-xr-xjs/helper-classes/backup-delete/GLWorld.js1029
-rwxr-xr-xjs/helper-classes/backup-delete/Materials/BumpMetalMaterial.js307
-rw-r--r--js/helper-classes/backup-delete/Materials/DeformMaterial.js133
-rwxr-xr-xjs/helper-classes/backup-delete/Materials/FlatMaterial.js165
-rw-r--r--js/helper-classes/backup-delete/Materials/FlyMaterial.js133
-rw-r--r--js/helper-classes/backup-delete/Materials/JuliaMaterial.js150
-rw-r--r--js/helper-classes/backup-delete/Materials/KeleidoscopeMaterial.js149
-rwxr-xr-xjs/helper-classes/backup-delete/Materials/LinearGradientMaterial.js379
-rw-r--r--js/helper-classes/backup-delete/Materials/MandelMaterial.js151
-rw-r--r--js/helper-classes/backup-delete/Materials/PlasmaMaterial.js134
-rw-r--r--js/helper-classes/backup-delete/Materials/PulseMaterial.js266
-rw-r--r--js/helper-classes/backup-delete/Materials/RadialBlurMaterial.js257
-rwxr-xr-xjs/helper-classes/backup-delete/Materials/RadialGradientMaterial.js305
-rw-r--r--js/helper-classes/backup-delete/Materials/ReliefTunnelMaterial.js133
-rw-r--r--js/helper-classes/backup-delete/Materials/SquareTunnelMaterial.js133
-rw-r--r--js/helper-classes/backup-delete/Materials/StarMaterial.js133
-rw-r--r--js/helper-classes/backup-delete/Materials/TaperMaterial.js223
-rw-r--r--js/helper-classes/backup-delete/Materials/TunnelMaterial.js133
-rw-r--r--js/helper-classes/backup-delete/Materials/TwistMaterial.js149
-rw-r--r--js/helper-classes/backup-delete/Materials/TwistVertMaterial.js248
-rwxr-xr-xjs/helper-classes/backup-delete/Materials/UberMaterial.js744
-rw-r--r--js/helper-classes/backup-delete/Materials/WaterMaterial.js133
-rw-r--r--js/helper-classes/backup-delete/Materials/ZInvertMaterial.js133
-rwxr-xr-xjs/helper-classes/backup-delete/MaterialsLibrary.js230
-rwxr-xr-xjs/helper-classes/backup-delete/ParseUtils.js84
-rwxr-xr-xjs/helper-classes/backup-delete/glUtils.js319
-rwxr-xr-xjs/lib/geom/geom-obj.js6
-rwxr-xr-xjs/lib/rdge/materials/flat-material.js6
-rwxr-xr-xjs/lib/rdge/materials/uber-material.js130
-rwxr-xr-xjs/mediators/drag-drop-mediator.js187
-rwxr-xr-xjs/ninja.reel/ninja.css4
-rwxr-xr-xjs/ninja.reel/ninja.html11
-rwxr-xr-xjs/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js2
-rwxr-xr-xjs/panels/Splitter.js6
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js20
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js86
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js5
-rw-r--r--js/panels/presets/animations-presets.reel/animations-presets.css5
-rw-r--r--js/panels/presets/animations-presets.reel/animations-presets.html59
-rw-r--r--js/panels/presets/animations-presets.reel/animations-presets.js73
-rw-r--r--js/panels/presets/content.reel/content.html12
-rw-r--r--js/panels/presets/default-animation-presets.js94
-rw-r--r--js/panels/presets/default-transition-presets.js30
-rwxr-xr-xjs/panels/properties.reel/properties.html72
-rwxr-xr-xjs/panels/properties.reel/properties.js64
-rwxr-xr-xjs/preloader/Preloader.js302
-rwxr-xr-xjs/preloader/PreloaderWorker.js95
-rwxr-xr-xjs/stage/stage.reel/stage.html7
-rwxr-xr-xjs/stage/stage.reel/stage.js41
-rwxr-xr-xjs/tools/SelectionTool.js5
-rwxr-xr-xjs/tools/Translate3DToolBase.js111
-rwxr-xr-xjs/tools/TranslateObject3DTool.js40
-rwxr-xr-xjs/tools/drawing-tool.js2
-rwxr-xr-xjs/tools/modifier-tool-base.js25
75 files changed, 911 insertions, 12937 deletions
<
diff --git a/js/components/focus-manager.reel/focus-manager.js b/js/components/focus-manager.reel/focus-manager.js
new file mode 100644
index 00000000..65a84bc1
--- /dev/null
+++ b/js/components/focus-manager.reel/focus-manager.js
@@ -0,0 +1,49 @@
1/* <copyright>
2 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
4 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5 </copyright> */
6
7var Montage = require("montage/core/core").Montage,
8 Component = require("montage/ui/component").Component;
9
10exports.FocusManager = Montage.create(Component, {
11
12 hasTemplate: {
13 value: false
14 },
15
16 element: {
17 serializable: true,
18 enumerable: true,
19 get: function() {
20 return this._element;
21 },
22 set: function(value) {
23 // call super set
24 Object.getPropertyDescriptor(Component, "element").set.call(this, value);
25 }
26 },
27
28 hiddenInput: {
29 value: null
30 },
31
32 prepareForDraw: {
33 value: function() {
34 this.hiddenInput = document.createElement("input");
35 this.hiddenInput.type = "text";
36
37 this.element.appendChild(this.hiddenInput);
38
39 }
40 },
41
42 setFocus: {
43 value: function() {
44 this.hiddenInput.focus();
45 }
46 }
47
48});
49
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 87e93465..7d982a62 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -372,7 +372,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
372 nextDocumentIndex = closeDocumentIndex - 1; 372 nextDocumentIndex = closeDocumentIndex - 1;
373 } 373 }
374 this.application.ninja.stage.stageView.switchDocument(this._documents[nextDocumentIndex]); 374 this.application.ninja.stage.stageView.switchDocument(this._documents[nextDocumentIndex]);
375 if(typeof this.activeDocument.stopVideos !== "undefined"){doc.stopVideos();} 375 if(typeof doc.stopVideos !== "undefined"){doc.stopVideos();}
376 this._removeDocumentView(doc.container); 376 this._removeDocumentView(doc.container);
377 }else if(this._documents.length === 0){ 377 }else if(this._documents.length === 0){
378 if(typeof this.activeDocument.pauseAndStopVideos !== "undefined"){ 378 if(typeof this.activeDocument.pauseAndStopVideos !== "undefined"){
diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js
index 9f00604f..70aba54e 100755
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -51,23 +51,6 @@ var ElementController = exports.ElementController = Montage.create(NJComponent,
51 51
52 setAttribute: { 52 setAttribute: {
53 value: function(el, att, value) { 53 value: function(el, att, value) {
54 if(att === "id") {
55 if(value === "") {
56 el.setAttribute(att, value);
57 return;
58 }
59
60 // Then check if this is a valid id by the following spec: http://www.w3.org/TR/REC-html40/types.html#h-6.2
61 var regexID = /^([a-zA-Z])+([a-zA-Z0-9_\.\:\-])+/;
62 if(!regexID.test(value)) {
63 alert("Invalid ID");
64 return;
65 } else if (this.application.ninja.currentDocument._document.getElementById(value) !== null) {
66 alert("The following ID: " + value + " is already in Use");
67 }
68
69 }
70
71 el.setAttribute(att, value); 54 el.setAttribute(att, value);
72 } 55 }
73 }, 56 },
diff --git a/js/document/html-document.js b/js/document/html-document.js
index 051490f5..d4db6e2f 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -207,9 +207,18 @@ exports.HTMLDocument = Montage.create(TextDocument, {
207 }, 207 },