aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-03-27 09:32:53 -0700
committerNivesh Rajbhandari2012-03-27 09:32:53 -0700
commit406bbfc63f8ed42d7da105dbd068a49ff8fb5f09 (patch)
tree3a8b45f4802f002269ff1bcf596f94cee4679a07 /js
parentbda9f8f5829c943486f8850e68c991e83f8fb8c8 (diff)
parent309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff)
downloadninja-406bbfc63f8ed42d7da105dbd068a49ff8fb5f09.tar.gz
Merge branch 'refs/heads/ninja-internal' into WebGLMaterials
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js')
-rwxr-xr-xjs/components/button.reel/button.css40
-rwxr-xr-xjs/components/button.reel/button.html26
-rwxr-xr-xjs/components/button.reel/button.js225
-rwxr-xr-xjs/components/checkbox.reel/checkbox.js21
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.css19
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.html16
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.js20
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.html2
-rwxr-xr-xjs/controllers/color-controller.js5
-rwxr-xr-xjs/controllers/document-controller.js14
-rwxr-xr-xjs/controllers/elements/component-controller.js13
-rwxr-xr-xjs/controllers/elements/shapes-controller.js45
-rwxr-xr-xjs/controllers/selection-controller.js12
-rwxr-xr-xjs/data/pi/pi-data.js33
-rwxr-xr-xjs/document/html-document.js177
-rw-r--r--js/document/templates/montage-html/main.reel/main.js42
-rwxr-xr-xjs/helper-classes/3D/snap-manager.js21
-rwxr-xr-xjs/helper-classes/RDGE/rdge-compiled.js6
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/engine.js7
-rwxr-xr-xjs/io/system/coreioapi.js4
-rw-r--r--js/io/system/ninjalibrary.json4
-rwxr-xr-xjs/lib/NJUtils.js32
-rwxr-xr-xjs/lib/drawing/world.js162
-rwxr-xr-xjs/lib/geom/circle.js54
-rwxr-xr-xjs/lib/geom/geom-obj.js154
-rwxr-xr-xjs/lib/geom/line.js44
-rwxr-xr-xjs/lib/geom/rectangle.js67
-rwxr-xr-xjs/lib/rdge/materials/bump-metal-material.js40
-rw-r--r--js/lib/rdge/materials/cloud-material.js300
-rwxr-xr-xjs/lib/rdge/materials/flat-material.js21
-rw-r--r--js/lib/rdge/materials/julia-material.js6
-rwxr-xr-xjs/lib/rdge/materials/linear-gradient-material.js53
-rw-r--r--js/lib/rdge/materials/mandel-material.js6
-rw-r--r--js/lib/rdge/materials/plasma-material.js18
-rw-r--r--js/lib/rdge/materials/pulse-material.js44
-rw-r--r--js/lib/rdge/materials/radial-blur-material.js57
-rwxr-xr-xjs/lib/rdge/materials/radial-gradient-material.js54
-rw-r--r--js/lib/rdge/materials/taper-material.js27
-rw-r--r--js/lib/rdge/materials/twist-vert-material.js28
-rwxr-xr-xjs/lib/rdge/materials/uber-material.js180
-rw-r--r--js/lib/rdge/materials/water-material.js103
-rw-r--r--js/mediators/io-mediator.js130
-rwxr-xr-xjs/models/materials-model.js90
-rwxr-xr-xjs/models/shape-model.js3
-rwxr-xr-xjs/ninja.reel/ninja.js21
-rwxr-xr-xjs/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js89
-rwxr-xr-xjs/panels/color/colorpopup-manager.js2
-rw-r--r--js/panels/presets/default-animation-presets.js125
-rw-r--r--js/panels/presets/default-style-presets.js18
-rwxr-xr-xjs/panels/properties.reel/properties.css13
-rwxr-xr-xjs/panels/properties.reel/sections/custom.reel/custom.js13
-rwxr-xr-xjs/panels/properties.reel/sections/position-and-size.reel/position-and-size.css32
-rwxr-xr-xjs/panels/properties.reel/sections/position-and-size.reel/position-and-size.html13
-rwxr-xr-xjs/panels/properties.reel/sections/position-and-size.reel/position-and-size.js10
54 files changed, 2110 insertions, 651 deletions
diff --git a/js/components/button.reel/button.css b/js/components/button.reel/button.css
deleted file mode 100755
index f50a9873..00000000
--- a/js/components/button.reel/button.css
+++ /dev/null
@@ -1,40 +0,0 @@
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
7.button {
8 border:none;
9 cursor:default;
10 text-align:center;
11 -webkit-user-select:none;
12 opacity:0.8;
13 display:table-cell;
14 vertical-align:middle;
15 width:100%;
16 height:100%;
17 background-color:#333333;
18 color:white;
19}
20
21.button:hover
22{
23 opacity:1;
24}
25
26.button:active
27{
28 outline:solid 1px black;
29}
30
31.button.on
32{
33 background-color: #333333;
34}
35
36.button.off
37{
38 background-color: #cccccc;
39 color:black;
40} \ No newline at end of file
diff --git a/js/components/button.reel/button.html b/js/components/button.reel/button.html
deleted file mode 100755
index d0398a6a..00000000
--- a/js/components/button.reel/button.html
+++ /dev/null
@@ -1,26 +0,0 @@
1<!DOCTYPE html>
2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
5 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
6 </copyright> -->
7<html>
8<head>
9 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
10 <link rel="stylesheet" type="text/css" href="button.css">
11 <script type="text/montage-serialization">
12 {
13 "owner": {
14 "module": "js/components/button.reel",
15 "name": "Button",
16 "properties": {
17 "element": {"#": "button"}
18 }
19 }
20 }
21 </script>
22</head>
23<body>
24 <button id="button" class="button"></button>
25</body>
26</html> \ No newline at end of file
diff --git a/js/components/button.reel/button.js b/js/components/button.reel/button.js
deleted file mode 100755
index 2d26c8b4..00000000
--- a/js/components/button.reel/button.js
+++ /dev/null
@@ -1,225 +0,0 @@
1/* <copyright>
2This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3No 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,
8Component = require("montage/ui/component").Component;
9
10var Button = exports.Button = Montage.create(Component, {
11 // Button state
12 _focused: {
13 value: false
14 },
15
16 _pressed: {
17 value: false
18 },
19
20 _isToggleButton: {
21 value: false
22 },
23
24 isToggleButton: {
25 serializable: true,
26 enumerable: true,
27 get: function() {
28 return this._isToggleButton;
29 },
30 set: function(value) {
31 if (value !== this._isToggleButton) {
32 this._isToggleButton = value;
33 this.needsDraw = true;
34 }
35 }
36 },
37
38 _value: {
39 value: false
40 },
41
42 value: {
43 serializable: true,
44 enumerable: true,
45 get: function() {
46 return this._value;
47 },
48 set: function(value) {
49 if ( (value !== null) && (value !== this._value) ) {
50 this._value = value;
51 this.needsDraw = true;
52 }
53 }
54 },
55
56 _label: {
57 value: ""
58 },
59
60 label: {
61 serializable: true,
62 enumerable: true,
63 get: function() {
64 return this._label;
65 },
66 set: function(value) {
67 if (value !== this._label) {
68 this._label = value;
69 this.needsDraw = true;