aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorJonathan Duran2012-03-06 17:08:55 -0800
committerJonathan Duran2012-03-06 17:08:55 -0800
commitbb6a1d82b2884b410f5859cc0c2cafd380acbe6a (patch)
tree6ec3e960a0c38ce8fd88c9bc17f5227d072ebe76 /js
parent2815adfd7c19b3dff89dc3e1bda9af8d30dca8d6 (diff)
parent2e3943a8f751ec572066f168b58464c24b9f29e5 (diff)
downloadninja-bb6a1d82b2884b410f5859cc0c2cafd380acbe6a.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js')
-rwxr-xr-xjs/controllers/document-controller.js9
-rwxr-xr-xjs/controllers/elements/shapes-controller.js17
-rwxr-xr-xjs/controllers/selection-controller.js12
-rwxr-xr-xjs/controllers/undo-controller.js17
-rw-r--r--js/data/panels-data.js25
-rwxr-xr-xjs/document/html-document.js187
-rwxr-xr-xjs/helper-classes/3D/Rectangle.js2
-rwxr-xr-xjs/helper-classes/3D/StageLine.js8
-rwxr-xr-xjs/helper-classes/3D/draw-utils.js2
-rwxr-xr-xjs/helper-classes/3D/element-planes.js2
-rwxr-xr-xjs/helper-classes/3D/math-utils.js87
-rwxr-xr-xjs/helper-classes/3D/snap-2d-record.js2
-rwxr-xr-xjs/helper-classes/3D/snap-manager.js78
-rwxr-xr-xjs/helper-classes/3D/vec-utils.js16
-rwxr-xr-xjs/helper-classes/3D/view-utils.js12
-rwxr-xr-xjs/helper-classes/backup-delete/GLAnchorPoint.js (renamed from js/helper-classes/RDGE/GLAnchorPoint.js)0
-rwxr-xr-xjs/helper-classes/backup-delete/GLBrushStroke.js (renamed from js/helper-classes/RDGE/GLBrushStroke.js)0
-rwxr-xr-xjs/helper-classes/backup-delete/GLCircle.js (renamed from js/helper-classes/RDGE/GLCircle.js)0
-rwxr-xr-xjs/helper-classes/backup-delete/GLGeomObj.js (renamed from js/helper-classes/RDGE/GLGeomObj.js)4
-rwxr-xr-xjs/helper-classes/backup-delete/GLLight.js (renamed from js/helper-classes/RDGE/GLLight.js)0
-rwxr-xr-xjs/helper-classes/backup-delete/GLLine.js (renamed from js/helper-classes/RDGE/GLLine.js)0
-rwxr-xr-xjs/helper-classes/backup-delete/GLMaterial.js (renamed from js/helper-classes/RDGE/GLMaterial.js)0
-rwxr-xr-xjs/helper-classes/backup-delete/GLPath.js (renamed from js/helper-classes/RDGE/GLPath.js)0
-rwxr-xr-xjs/helper-classes/backup-delete/GLRectangle.js (renamed from js/helper-classes/RDGE/GLRectangle.js)0
-rwxr-xr-xjs/helper-classes/backup-delete/GLSubpath.js (renamed from js/helper-classes/RDGE/GLSubpath.js)0
-rwxr-xr-xjs/helper-classes/backup-delete/GLWorld.js (renamed from js/helper-classes/RDGE/GLWorld.js)0
-rwxr-xr-xjs/helper-classes/backup-delete/Materials/BumpMetalMaterial.js (renamed from js/helper-classes/RDGE/Materials/BumpMetalMaterial.js)0
-rw-r--r--js/helper-classes/backup-delete/Materials/DeformMaterial.js (renamed from js/helper-classes/RDGE/Materials/DeformMaterial.js)0
-rwxr-xr-xjs/helper-classes/backup-delete/Materials/FlatMaterial.js (renamed from js/helper-classes/RDGE/Materials/FlatMaterial.js)0
-rw-r--r--js/helper-classes/backup-delete/Materials/FlyMaterial.js (renamed from js/helper-classes/RDGE/Materials/FlyMaterial.js)0
-rw-r--r--js/helper-classes/backup-delete/Materials/JuliaMaterial.js (renamed from js/helper-classes/RDGE/Materials/JuliaMaterial.js)0
-rw-r--r--js/helper-classes/backup-delete/Materials/KeleidoscopeMaterial.js (renamed from js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js)0
-rwxr-xr-xjs/helper-classes/backup-delete/Materials/LinearGradientMaterial.js (renamed from js/helper-classes/RDGE/Materials/LinearGradientMaterial.js)0
-rw-r--r--js/helper-classes/backup-delete/Materials/MandelMaterial.js (renamed from js/helper-classes/RDGE/Materials/MandelMaterial.js)0
-rw-r--r--js/helper-classes/backup-delete/Materials/PlasmaMaterial.js (renamed from js/helper-classes/RDGE/Materials/PlasmaMaterial.js)0
-rw-r--r--js/helper-classes/backup-delete/Materials/PulseMaterial.js (renamed from js/helper-classes/RDGE/Materials/PulseMaterial.js)0
-rw-r--r--js/helper-classes/backup-delete/Materials/RadialBlurMaterial.js (renamed from js/helper-classes/RDGE/Materials/RadialBlurMaterial.js)0
-rwxr-xr-xjs/helper-classes/backup-delete/Materials/RadialGradientMaterial.js (renamed from js/helper-classes/RDGE/Materials/RadialGradientMaterial.js)0
-rw-r--r--js/helper-classes/backup-delete/Materials/ReliefTunnelMaterial.js (renamed from js/helper-classes/RDGE/Materials/ReliefTunnelMaterial.js)0
-rw-r--r--js/helper-classes/backup-delete/Materials/SquareTunnelMaterial.js (renamed from js/helper-classes/RDGE/Materials/SquareTunnelMaterial.js)0
-rw-r--r--js/helper-classes/backup-delete/Materials/StarMaterial.js (renamed from js/helper-classes/RDGE/Materials/StarMaterial.js)0
-rw-r--r--js/helper-classes/backup-delete/Materials/TaperMaterial.js (renamed from js/helper-classes/RDGE/Materials/TaperMaterial.js)0
-rw-r--r--js/helper-classes/backup-delete/Materials/TunnelMaterial.js (renamed from js/helper-classes/RDGE/Materials/TunnelMaterial.js)0
-rw-r--r--js/helper-classes/backup-delete/Materials/TwistMaterial.js (renamed from js/helper-classes/RDGE/Materials/TwistMaterial.js)0
-rw-r--r--js/helper-classes/backup-delete/Materials/TwistVertMaterial.js (renamed from js/helper-classes/RDGE/Materials/TwistVertMaterial.js)0
-rwxr-xr-xjs/helper-classes/backup-delete/Materials/UberMaterial.js (renamed from js/helper-classes/RDGE/Materials/UberMaterial.js)0
-rw-r--r--js/helper-classes/backup-delete/Materials/WaterMaterial.js (renamed from js/helper-classes/RDGE/Materials/WaterMaterial.js)0
-rw-r--r--js/helper-classes/backup-delete/Materials/ZInvertMaterial.js (renamed from js/helper-classes/RDGE/Materials/ZInvertMaterial.js)0
-rwxr-xr-xjs/helper-classes/backup-delete/MaterialsLibrary.js (renamed from js/helper-classes/RDGE/MaterialsLibrary.js)0
-rwxr-xr-xjs/helper-classes/backup-delete/ParseUtils.js (renamed from js/helper-classes/3D/ParseUtils.js)0
-rwxr-xr-xjs/helper-classes/backup-delete/glUtils.js (renamed from js/helper-classes/3D/glUtils.js)0
-rw-r--r--js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js6
-rwxr-xr-xjs/lib/drawing/world.js917
-rwxr-xr-xjs/lib/geom/anchor-point.js242
-rwxr-xr-xjs/lib/geom/brush-stroke.js482
-rwxr-xr-xjs/lib/geom/circle.js751
-rwxr-xr-xjs/lib/geom/geom-obj.js280
-rwxr-xr-xjs/lib/geom/line.js488
-rwxr-xr-xjs/lib/geom/rectangle.js1165
-rw-r--r--js/lib/geom/shape-primitive.js54
-rwxr-xr-xjs/lib/geom/sub-path.js1288
-rwxr-xr-xjs/lib/math/matrix.js104
-rwxr-xr-xjs/lib/rdge/materials/bump-metal-material.js314
-rw-r--r--js/lib/rdge/materials/deform-material.js127
-rwxr-xr-xjs/lib/rdge/materials/flat-material.js159
-rw-r--r--js/lib/rdge/materials/fly-material.js119
-rw-r--r--js/lib/rdge/materials/julia-material.js136
-rw-r--r--js/lib/rdge/materials/keleidoscope-material.js144
-rwxr-xr-xjs/lib/rdge/materials/linear-gradient-material.js434
-rw-r--r--js/lib/rdge/materials/mandel-material.js147
-rwxr-xr-xjs/lib/rdge/materials/material-parser.js73
-rwxr-xr-xjs/lib/rdge/materials/material.js346
-rw-r--r--js/lib/rdge/materials/plasma-material.js132
-rw-r--r--js/lib/rdge/materials/pulse-material.js258
-rw-r--r--js/lib/rdge/materials/radial-blur-material.js244
-rwxr-xr-xjs/lib/rdge/materials/radial-gradient-material.js351
-rw-r--r--js/lib/rdge/materials/relief-tunnel-material.js122
-rw-r--r--js/lib/rdge/materials/square-tunnel-material.js120
-rw-r--r--js/lib/rdge/materials/star-material.js124
-rw-r--r--js/lib/rdge/materials/taper-material.js223
-rw-r--r--js/lib/rdge/materials/tunnel-material.js125
-rw-r--r--js/lib/rdge/materials/twist-material.js139
-rw-r--r--js/lib/rdge/materials/twist-vert-material.js248
-rwxr-xr-xjs/lib/rdge/materials/uber-material.js614
-rw-r--r--js/lib/rdge/materials/water-material.js126
-rw-r--r--js/lib/rdge/materials/z-invert-material.js125
-rw-r--r--js/mediators/io-mediator.js167
-rwxr-xr-xjs/models/materials-model.js225
-rwxr-xr-xjs/models/properties-3d.js24
-rwxr-xr-xjs/ninja.reel/ninja.html13
-rwxr-xr-xjs/ninja.reel/ninja.js30
-rwxr-xr-xjs/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js2
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.js3
-rwxr-xr-xjs/panels/Panel.reel/Panel.js100
-rwxr-xr-xjs/panels/PanelContainer.reel/PanelContainer.html110
-rwxr-xr-xjs/panels/PanelContainer.reel/PanelContainer.js (renamed from js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js)75
-rwxr-xr-xjs/panels/PanelContainer/PanelContainer.reel/PanelContainer.html146
-rw-r--r--js/panels/drag-drop-composer.js2
-rw-r--r--js/panels/presets/style-presets.reel/style-presets.js4
-rw-r--r--js/panels/presets/transitions-presets.reel/transitions-presets.html1
-rwxr-xr-xjs/preloader/Preloader.js104
-rwxr-xr-xjs/stage/stage-deps.js4
-rwxr-xr-xjs/stage/tool-handle.js60
-rw-r--r--js/tools/BrushTool.js6
-rwxr-xr-xjs/tools/LineTool.js14
-rwxr-xr-xjs/tools/OvalTool.js25
-rwxr-xr-xjs/tools/PenTool.js25
-rwxr-xr-xjs/tools/RectTool.js24
-rwxr-xr-xjs/tools/SelectionTool.js282
-rwxr-xr-xjs/tools/ShapeTool.js4
-rwxr-xr-xjs/tools/TranslateObject3DTool.js7
-rwxr-xr-xjs/tools/drawing-tool-base.js18
-rwxr-xr-xjs/tools/modifier-tool-base.js7
113 files changed, 12026 insertions, 663 deletions
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 64ff2c7e..194496a6 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -76,11 +76,14 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
76 // 76 //
77 handleWebRequest: { 77 handleWebRequest: {
78 value: function (request) { 78 value: function (request) {
79 if (this._hackRootFlag && request.url.indexOf('js/document/templates/montage-html') !== -1) { 79 //TODO: Check if frameId is proper
80 if (this._hackRootFlag && request.parentFrameId !== -1) {
80 //TODO: Optimize creating string 81 //TODO: Optimize creating string
81 return {redirectUrl: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+request.url.split('/')[request.url.split('/').length-1]}; 82 //console.log(this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1], request.url);
82 } 83 //return {redirectUrl: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+request.url.split('/')[request.url.split('/').length-1]};
84 return {redirectUrl: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+request.url.split(chrome.extension.getURL('js/document/templates/montage-html/'))[1]};
83 } 85 }