Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal

Conflicts: js/components/gradientpicker.reel/gradientpicker.js js/components/tools-properties/text-properties.reel/text-properties.js js/document/views/base.js js/document/views/design.js js/helper-classes/3D/StageLine.js js/helper-classes/3D/draw-utils.js js/lib/drawing/world.js js/lib/geom/circle.js js/lib/geom/line.js js/lib/geom/rectangle.js js/lib/geom/shape-primitive.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/flag-material.js js/lib/rdge/materials/fly-material.js js/lib/rdge/materials/julia-material.js js/lib/rdge/materials/keleidoscope-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/water-material.js js/panels/Materials/materials-library-panel.reel/materials-library-panel.html js/panels/Materials/materials-library-panel.reel/materials-library-panel.js js/panels/Materials/materials-popup.reel/materials-popup.html js/panels/Materials/materials-popup.reel/materials-popup.js js/tools/LineTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
author: Valerio Virgillito 2012-07-09 14:35:44 -0700
committer: Valerio Virgillito 2012-07-09 14:35:44 -0700
commit: 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch)
tree: 3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/panels/Timeline/EasingMenu.reel
parent: c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent: 40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
download: ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz
3 files changed, 134 insertions, 134 deletions
diff --git a/js/panels/Timeline/EasingMenu.reel/EasingMenu.html b/js/panels/Timeline/EasingMenu.reel/EasingMenu.html
index dcf35d8f..b02a22c6 100644
--- a/js/panels/Timeline/EasingMenu.reel/EasingMenu.html
+++ b/js/panels/Timeline/EasingMenu.reel/EasingMenu.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <!-- <copyright>
 Copyright (c) 2012, Motorola Mobility, Inc
 All Rights Reserved.
@@ -29,31 +29,31 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 </copyright> -->
 <html lang="en">
-        <head>
+    <head>
-        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-        <link rel="stylesheet" type="text/css" href="css/EasingMenu.css">
+        <link rel="stylesheet" type="text/css" href="css/EasingMenu.css">
-                <script type="text/montage-serialization">
+        <script type="text/montage-serialization">
            {
                "owner": {
                    "prototype": "js/panels/Timeline/EasingMenu.reel",
                    "properties": {
                        "element": {"#": "container-easing-menu"}
-                        
                    }
-                                }
+                }
            }
        </script>
-        </head>
+    </head>
-        <body>
+    <body>
-                <div data-montage-id="container-easing-menu" class="container-easing-choices">
+        <div data-montage-id="container-easing-menu" class="container-easing-choices">
-                        <ul data-montage-id="easing_choices" class="easing-choices">
+            <ul data-montage-id="easing_choices" class="easing-choices">
-                                <li data-ninja-ease="none">none</li>
+                <li data-ninja-ease="none">none</li>
-                                <li data-ninja-ease="ease">ease</li>
+                <li data-ninja-ease="ease">ease</li>
-                                <li data-ninja-ease="ease-out">ease-out</li>
+                <li data-ninja-ease="ease-out">ease-out</li>
-                                <li data-ninja-ease="ease-in">ease-in</li>
+                <li data-ninja-ease="ease-in">ease-in</li>
-                                <li data-ninja-ease="ease-in-out">ease-in-out</li>
+                <li data-ninja-ease="ease-in-out">ease-in-out</li>
-                                <li data-ninja-ease="linear">linear</li>
+                <li data-ninja-ease="linear">linear</li>
-                        </ul>
+            </ul>
-                </div>
+        </div>
    </body>
 </html>
diff --git a/js/panels/Timeline/EasingMenu.reel/EasingMenu.js b/js/panels/Timeline/EasingMenu.reel/EasingMenu.js
index 6d41afb0..84e1efb1 100644
--- a/js/panels/Timeline/EasingMenu.reel/EasingMenu.js
+++ b/js/panels/Timeline/EasingMenu.reel/EasingMenu.js
@@ -29,8 +29,8 @@ POSSIBILITY OF SUCH DAMAGE.
 </copyright> */
 var Montage = require("montage/core/core").Montage,
-        Component = require("montage/ui/component").Component,
+    Component = require("montage/ui/component").Component,
-        Popup = require("montage/ui/popup/popup.reel").Popup;
+    Popup = require("montage/ui/popup/popup.reel").Popup;
 var EasingMenu = exports.EasingMenu = Montage.create(Component, {
@@ -38,127 +38,127 @@ var EasingMenu = exports.EasingMenu = Montage.create(Component, {
        value: true
    },
-        /* Begin: Models */
+    /* Begin: Models */
-        
-        // popup: the initialized component.
+    // popup: the initialized component.
    _popup: {
-                value: null
+        value: null
    },
    popup: {
-        get: function() {
+        get: function() {
-                return this._popup;
+            return this._popup;
-        },
+        },
-        set: function(newVal) {
+        set: function(newVal) {
-                this._popup = newVal
+            this._popup = newVal
-        }
+        }
-    },
+    },
-    
    // callingComponent: pointer to the span that called for the menu
    _callingComponent: {
-        value: null
+        value: null
    },
    callingComponent: {
-        get: function() {
+        get: function() {
-                return this._callingComponent;
+            return this._callingComponent;
-        },
+        },
-        set: function(newVal) {
+        set: function(newVal) {
-                this._callingComponent = newVal;
+            this._callingComponent = newVal;
-        }
+        }
-    },
+    },
-    
    // anchor: pointer to the anchoring element
    _anchor: {
-        value: null
+        value: null
    },
    anchor: {
-        get: function() {
+        get: function() {
-                return this._anchor;
+            return this._anchor;
-        },
+        },
-        set: function(newVal) {
+        set: function(newVal) {
-                this._anchor = newVal;
+            this._anchor = newVal;
-        }
+        }
-    },
+    },
-    
-    
    _top: {
-        value: null
+        value: null
    },
    top: {
-        get: function() {
+        get: function() {
-                return this._top;
+            return this._top;
-        },
+        },
-        set: function(newVal) {
+        set: function(newVal) {
-                this._top = newVal;
+            this._top = newVal;
-        }
+        }
    },
    _left: {
-        value: null
+        value: null
    },
    left: {
-        get: function() {
+        get: function() {
-                return this._left;
+            return this._left;
-        },
+        },
-        set: function(newVal) {
+        set: function(newVal) {
-                this._left = newVal;
+            this._left = newVal;
-        }
+        }
-    },
+    },
-    
    // currentChoice: The data attribute of the current choice
    _currentChoice: {
-        value: "none"
+        value: "none"
    },
    currentChoice: {
-        get: function() {
+        get: function() {
-                return this._currentChoice;
+            return this._currentChoice;
-        },
+        },
-        set: function(newVal) {
+        set: function(newVal) {
-                this._currentChoice = newVal;
+            this._currentChoice = newVal;
-        }
+        }
-    },
+    },
-    
    _isShown: {
-        value: false
+        value: false
    },
-    
    /* End: Models */
-
author	Valerio Virgillito	2012-07-09 14:35:44 -0700
committer	Valerio Virgillito	2012-07-09 14:35:44 -0700
commit	84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch)
tree	3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/panels/Timeline/EasingMenu.reel
parent	c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent	40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
download	ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz

diff --git a/js/panels/Timeline/EasingMenu.reel/EasingMenu.html b/js/panels/Timeline/EasingMenu.reel/EasingMenu.html index dcf35d8f..b02a22c6 100644 --- a/js/panels/Timeline/EasingMenu.reel/EasingMenu.html +++ b/js/panels/Timeline/EasingMenu.reel/EasingMenu.html
@@ -1,4 +1,4 @@
1	<!DOCTYPE html>	1	<!doctype html>
2	<!-- <copyright>	2	<!-- <copyright>
3	Copyright (c) 2012, Motorola Mobility, Inc	3	Copyright (c) 2012, Motorola Mobility, Inc
4	All Rights Reserved.	4	All Rights Reserved.
@@ -29,31 +29,31 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29	POSSIBILITY OF SUCH DAMAGE.	29	POSSIBILITY OF SUCH DAMAGE.
30	</copyright> -->	30	</copyright> -->
31	<html lang="en">	31	<html lang="en">
32	<head>	32	<head>
33	<meta http-equiv="content-type" content="text/html; charset=utf-8" />	33	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
34	<link rel="stylesheet" type="text/css" href="css/EasingMenu.css">	34	<link rel="stylesheet" type="text/css" href="css/EasingMenu.css">
35	<script type="text/montage-serialization">	35	<script type="text/montage-serialization">
36	{	36	{
37	"owner": {	37	"owner": {
38	"prototype": "js/panels/Timeline/EasingMenu.reel",	38	"prototype": "js/panels/Timeline/EasingMenu.reel",
39	"properties": {	39	"properties": {
40	"element": {"#": "container-easing-menu"}	40	"element": {"#": "container-easing-menu"}
41		41
42	}	42	}
43	}	43	}
44	}	44	}
45	</script>	45	</script>
46	</head>	46	</head>
47	<body>	47	<body>
48	<div data-montage-id="container-easing-menu" class="container-easing-choices">	48	<div data-montage-id="container-easing-menu" class="container-easing-choices">
49	<ul data-montage-id="easing_choices" class="easing-choices">	49	<ul data-montage-id="easing_choices" class="easing-choices">
50	<li data-ninja-ease="none">none</li>	50	<li data-ninja-ease="none">none</li>
51	<li data-ninja-ease="ease">ease</li>	51	<li data-ninja-ease="ease">ease</li>
52	<li data-ninja-ease="ease-out">ease-out</li>	52	<li data-ninja-ease="ease-out">ease-out</li>
53	<li data-ninja-ease="ease-in">ease-in</li>	53	<li data-ninja-ease="ease-in">ease-in</li>
54	<li data-ninja-ease="ease-in-out">ease-in-out</li>	54	<li data-ninja-ease="ease-in-out">ease-in-out</li>
55	<li data-ninja-ease="linear">linear</li>	55	<li data-ninja-ease="linear">linear</li>
56	</ul>	56	</ul>
57	</div>	57	</div>
58	</body>	58	</body>
59	</html>	59	</html>


diff --git a/js/panels/Timeline/EasingMenu.reel/EasingMenu.js b/js/panels/Timeline/EasingMenu.reel/EasingMenu.js index 6d41afb0..84e1efb1 100644 --- a/js/panels/Timeline/EasingMenu.reel/EasingMenu.js +++ b/js/panels/Timeline/EasingMenu.reel/EasingMenu.js
@@ -29,8 +29,8 @@ POSSIBILITY OF SUCH DAMAGE.
29	</copyright> */	29	</copyright> */
30		30
31	var Montage = require("montage/core/core").Montage,	31	var Montage = require("montage/core/core").Montage,
32	Component = require("montage/ui/component").Component,	32	Component = require("montage/ui/component").Component,
33	Popup = require("montage/ui/popup/popup.reel").Popup;	33	Popup = require("montage/ui/popup/popup.reel").Popup;
34		34
35	var EasingMenu = exports.EasingMenu = Montage.create(Component, {	35	var EasingMenu = exports.EasingMenu = Montage.create(Component, {
36		36
@@ -38,127 +38,127 @@ var EasingMenu = exports.EasingMenu = Montage.create(Component, {
38	value: true	38	value: true
39	},	39	},
40		40
41	/* Begin: Models */	41	/* Begin: Models */
42		42
43	// popup: the initialized component.	43	// popup: the initialized component.
44	_popup: {	44	_popup: {
45	value: null	45	value: null
46	},	46	},
47	popup: {	47	popup: {
48	get: function() {	48	get: function() {
49	return this._popup;	49	return this._popup;
50	},	50	},
51	set: function(newVal) {	51	set: function(newVal) {
52	this._popup = newVal	52	this._popup = newVal
53	}	53	}
54	},	54	},
55		55
56	// callingComponent: pointer to the span that called for the menu	56	// callingComponent: pointer to the span that called for the menu
57	_callingComponent: {	57	_callingComponent: {
58	value: null	58	value: null
59	},	59	},
60	callingComponent: {	60	callingComponent: {
61	get: function() {	61	get: function() {
62	return this._callingComponent;	62	return this._callingComponent;
63	},	63	},
64	set: function(newVal) {	64	set: function(newVal) {
65	this._callingComponent = newVal;	65	this._callingComponent = newVal;
66	}	66	}
67	},	67	},
68		68
69	// anchor: pointer to the anchoring element	69	// anchor: pointer to the anchoring element
70	_anchor: {	70	_anchor: {
71	value: null	71	value: null
72	},	72	},
73	anchor: {	73	anchor: {
74	get: function() {	74	get: function() {
75	return this._anchor;	75	return this._anchor;
76	},	76	},
77	set: function(newVal) {	77	set: function(newVal) {
78	this._anchor = newVal;	78	this._anchor = newVal;
79	}	79	}
80	},	80	},
81		81
82		82
83	_top: {	83	_top: {
84	value: null	84	value: null
85	},	85	},
86	top: {	86	top: {
87	get: function() {	87	get: function() {
88	return this._top;	88	return this._top;
89	},	89	},
90	set: function(newVal) {	90	set: function(newVal) {
91	this._top = newVal;	91	this._top = newVal;
92	}	92	}
93	},	93	},
94	_left: {	94	_left: {
95	value: null	95	value: null
96	},	96	},
97	left: {	97	left: {
98	get: function() {	98	get: function() {
99	return this._left;	99	return this._left;
100	},	100	},
101	set: function(newVal) {	101	set: function(newVal) {
102	this._left = newVal;	102	this._left = newVal;
103	}	103	}
104	},	104	},
105		105
106	// currentChoice: The data attribute of the current choice	106	// currentChoice: The data attribute of the current choice
107	_currentChoice: {	107	_currentChoice: {
108	value: "none"	108	value: "none"
109	},	109	},
110	currentChoice: {	110	currentChoice: {
111	get: function() {	111	get: function() {
112	return this._currentChoice;	112	return this._currentChoice;
113	},	113	},
114	set: function(newVal) {	114	set: function(newVal) {
115	this._currentChoice = newVal;	115	this._currentChoice = newVal;
116	}	116	}
117	},	117	},
118		118
119	_isShown: {	119	_isShown: {
120	value: false	120	value: false
121	},	121	},
122		122
123	/* End: Models */	123	/* End: Models */
124		124