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/PropertyTrack.reel
parent: c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent: 40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
download: ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz
3 files changed, 36 insertions, 36 deletions
diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html
index 3f646e81..8a1a685b 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <!-- <copyright>
 Copyright (c) 2012, Motorola Mobility, Inc
 All Rights Reserved.
@@ -29,9 +29,9 @@ 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/PropertyTrack.css">
+        <link rel="stylesheet" type="text/css" href="css/PropertyTrack.css">
        <script type="text/montage-serialization">
                    {
                        "owner": {
@@ -46,9 +46,9 @@ POSSIBILITY OF SUCH DAMAGE.
                        "propTween" : {
                            "prototype" : "js/panels/timeline/Tween.reel",
                            "properties" : {
-                                "element":{"#": "prop_track_lane"}
+                                "element":{"#": "prop_track_lane"}
                            },
-                                        "bindings" : {
+                            "bindings" : {
                                "tweenData" : {
                                   "boundObject" : {"@": "propTweenRepetition"},
                                   "boundObjectPropertyPath" : "objectAtCurrentIteration.tweenData",
@@ -60,27 +60,27 @@ POSSIBILITY OF SUCH DAMAGE.
                        "propTweenRepetition": {
                            "prototype": "montage/ui/repetition.reel",
                            "properties": {
-                                "element": {"#": "prop_track_lanes"},
+                                "element": {"#": "prop_track_lanes"},
-                                   "isSelectionEnabled" : false
+                                   "isSelectionEnabled" : false
                            },
                            "bindings": {
                               "objects": {
-                                 "boundObject": {"@": "owner"},
+                                 "boundObject": {"@": "owner"},
-                                 "boundObjectPropertyPath": "propTweens",
+                                 "boundObjectPropertyPath": "propTweens",
-                                 "oneway": false
+                                 "oneway": false
                               }
                            }
                        }
                    }
        </script>
-        </head>
+    </head>
-        <body>
+    <body>
-                <div data-montage-id="property-track" class="timeline-track">
+        <div data-montage-id="property-track" class="timeline-track">
            <div data-montage-id="prop_track_lanes" class="prop-track">
                <div data-montage-id="prop_track_lane"></div>
            </div>
-                </div>
+        </div>
    </body>
 </html>
diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
index 6c68fa63..43ff34f9 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
@@ -212,10 +212,10 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
                    // check if there is an editor property assigned yet
                    // get this property track's editor prop name from layer data arrays
                    var selectIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID),
-                        currentSelectedStyleIndex = this.getCurrentSelectedStyleIndex(selectIndex);
+                        currentSelectedStyleIndex = this.getCurrentSelectedStyleIndex(selectIndex);
                    if (this.trackType == "style") {
-                        //console.log("PropertyTrack.handleClick; selectIndex = ", selectIndex, "; styleIndex = ", currentSelectedStyleIndex)
+                        //console.log("PropertyTrack.handleClick; selectIndex = ", selectIndex, "; styleIndex = ", currentSelectedStyleIndex)
                        if (this.application.ninja.timeline.arrLayers[selectIndex].layerData.arrLayerStyles[currentSelectedStyleIndex].editorProperty == null) {
                            console.log("Please enter a style property for this track before adding keyframes.");
                            return;
@@ -238,20 +238,20 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
            }
        }
    },
-    
    getCurrentSelectedStyleIndex: {
-        value: function(layerIndex) {
+        value: function(layerIndex) {
-                var returnVal = false,
+            var returnVal = false,
-                        i = 0,
+                i = 0,
-                        arrLayerStylesLength = this.application.ninja.timeline.arrLayers[layerIndex].layerData.arrLayerStyles.length;
+                arrLayerStylesLength = this.application.ninja.timeline.arrLayers[layerIndex].layerData.arrLayerStyles.length;
-                for (i = 0; i < arrLayerStylesLength; i++) {
+            for (i = 0; i < arrLayerStylesLength; i++) {
-                        var currItem =  this.application.ninja.timeline.arrLayers[layerIndex].layerData.arrLayerStyles[i];
+                var currItem =  this.application.ninja.timeline.arrLayers[layerIndex].layerData.arrLayerStyles[i];
-                        if (currItem.isSelected === true) {
+                if (currItem.isSelected === true) {
-                                returnVal = i;
+                    returnVal = i;
-                        }
+                }
-                }
+            }
-                return returnVal;
+            return returnVal;
-        }
+        }
    },
    handleNewPropTween:{
diff --git a/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss b/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
index 38a16622..2127b92d 100644
--- a/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
+++ b/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 /* PropertyTrack.scss
 * Main SCSS file for PropertyTrack component, compiled by SASS into the file css/PropertyTrack.css.
 */
- 
 // Import theme settings
 @import "../../../../../scss/imports/themes/default/colors";
 @import "../../../../../scss/imports/themes/default/mixins";
@@ -41,18 +41,18 @@ POSSIBILITY OF SUCH DAMAGE.
 .content-main .collapsible-content .timeline-track {
-        height: 18px;
+    height: 18px;
    padding-top: 2px;
-        border-bottom: 1px solid $color-menu-divider;
+    border-bottom: 1px solid $color-menu-divider;
    background-image: url("../images/gridline.jpg");
 }
 .timeline-track .content-main {
-        background-color: $color-menu-bg;
+    background-color: $color-menu-bg;
 }
 .prop-track .collapsible-content.collapsible-collapsed {
-        overflow: hidden;
+    overflow: hidden;
-        height: 0px;
+    height: 0px;
 }
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/PropertyTrack.reel
parent	c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent	40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
download	ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz

diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html index 3f646e81..8a1a685b 100644 --- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html +++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.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,9 +29,9 @@ 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/PropertyTrack.css">	34	<link rel="stylesheet" type="text/css" href="css/PropertyTrack.css">
35	<script type="text/montage-serialization">	35	<script type="text/montage-serialization">
36	{	36	{
37	"owner": {	37	"owner": {
@@ -46,9 +46,9 @@ POSSIBILITY OF SUCH DAMAGE.
46	"propTween" : {	46	"propTween" : {
47	"prototype" : "js/panels/timeline/Tween.reel",	47	"prototype" : "js/panels/timeline/Tween.reel",
48	"properties" : {	48	"properties" : {
49	"element":{"#": "prop_track_lane"}	49	"element":{"#": "prop_track_lane"}
50	},	50	},
51	"bindings" : {	51	"bindings" : {
52	"tweenData" : {	52	"tweenData" : {
53	"boundObject" : {"@": "propTweenRepetition"},	53	"boundObject" : {"@": "propTweenRepetition"},
54	"boundObjectPropertyPath" : "objectAtCurrentIteration.tweenData",	54	"boundObjectPropertyPath" : "objectAtCurrentIteration.tweenData",
@@ -60,27 +60,27 @@ POSSIBILITY OF SUCH DAMAGE.
60	"propTweenRepetition": {	60	"propTweenRepetition": {
61	"prototype": "montage/ui/repetition.reel",	61	"prototype": "montage/ui/repetition.reel",
62	"properties": {	62	"properties": {
63	"element": {"#": "prop_track_lanes"},	63	"element": {"#": "prop_track_lanes"},
64	"isSelectionEnabled" : false	64	"isSelectionEnabled" : false
65	},	65	},
66	"bindings": {	66	"bindings": {
67	"objects": {	67	"objects": {
68	"boundObject": {"@": "owner"},	68	"boundObject": {"@": "owner"},
69	"boundObjectPropertyPath": "propTweens",	69	"boundObjectPropertyPath": "propTweens",
70	"oneway": false	70	"oneway": false
71	}	71	}
72	}	72	}
73	}	73	}
74	}	74	}
75	</script>	75	</script>
76	</head>	76	</head>
77	<body>	77	<body>
78		78
79	<div data-montage-id="property-track" class="timeline-track">	79	<div data-montage-id="property-track" class="timeline-track">
80	<div data-montage-id="prop_track_lanes" class="prop-track">	80	<div data-montage-id="prop_track_lanes" class="prop-track">
81	<div data-montage-id="prop_track_lane"></div>	81	<div data-montage-id="prop_track_lane"></div>
82	</div>	82	</div>
83	</div>	83	</div>
84		84
85	</body>	85	</body>
86	</html>	86	</html>


diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js index 6c68fa63..43ff34f9 100644 --- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js +++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
@@ -212,10 +212,10 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
212	// check if there is an editor property assigned yet	212	// check if there is an editor property assigned yet
213	// get this property track's editor prop name from layer data arrays	213	// get this property track's editor prop name from layer data arrays
214	var selectIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID),	214	var selectIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID),
215	currentSelectedStyleIndex = this.getCurrentSelectedStyleIndex(selectIndex);	215	currentSelectedStyleIndex = this.getCurrentSelectedStyleIndex(selectIndex);
216		216
217	if (this.trackType == "style") {	217	if (this.trackType == "style") {
218	//console.log("PropertyTrack.handleClick; selectIndex = ", selectIndex, "; styleIndex = ", currentSelectedStyleIndex)	218	//console.log("PropertyTrack.handleClick; selectIndex = ", selectIndex, "; styleIndex = ", currentSelectedStyleIndex)
219	if (this.application.ninja.timeline.arrLayers[selectIndex].layerData.arrLayerStyles[currentSelectedStyleIndex].editorProperty == null) {	219	if (this.application.ninja.timeline.arrLayers[selectIndex].layerData.arrLayerStyles[currentSelectedStyleIndex].editorProperty == null) {
220	console.log("Please enter a style property for this track before adding keyframes.");	220	console.log("Please enter a style property for this track before adding keyframes.");
221	return;	221	return;
@@ -238,20 +238,20 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
238	}	238	}
239	}	239	}
240	},	240	},
241		241
242	getCurrentSelectedStyleIndex: {	242	getCurrentSelectedStyleIndex: {
243	value: function(layerIndex) {	243	value: function(layerIndex) {
244	var returnVal = false,	244	var returnVal = false,
245	i = 0,	245	i = 0,
246	arrLayerStylesLength = this.application.ninja.timeline.arrLayers[layerIndex].layerData.arrLayerStyles.length;	246	arrLayerStylesLength = this.application.ninja.timeline.arrLayers[layerIndex].layerData.arrLayerStyles.length;
247	for (i = 0; i < arrLayerStylesLength; i++) {	247	for (i = 0; i < arrLayerStylesLength; i++) {
248	var currItem = this.application.ninja.timeline.arrLayers[layerIndex].layerData.arrLayerStyles[i];	248	var currItem = this.application.ninja.timeline.arrLayers[layerIndex].layerData.arrLayerStyles[i];
249	if (currItem.isSelected === true) {	249	if (currItem.isSelected === true) {
250	returnVal = i;	250	returnVal = i;
251	}	251	}
252	}	252	}
253	return returnVal;	253	return returnVal;
254	}	254	}
255	},	255	},
256		256
257	handleNewPropTween:{	257	handleNewPropTween:{


diff --git a/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss b/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss index 38a16622..2127b92d 100644 --- a/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss +++ b/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
31	/* PropertyTrack.scss	31	/* PropertyTrack.scss
32	* Main SCSS file for PropertyTrack component, compiled by SASS into the file css/PropertyTrack.css.	32	* Main SCSS file for PropertyTrack component, compiled by SASS into the file css/PropertyTrack.css.
33	*/	33	*/
34		34
35	// Import theme settings	35	// Import theme settings
36	@import "../../../../../scss/imports/themes/default/colors";	36	@import "../../../../../scss/imports/themes/default/colors";
37	@import "../../../../../scss/imports/themes/default/mixins";	37	@import "../../../../../scss/imports/themes/default/mixins";
@@ -41,18 +41,18 @@ POSSIBILITY OF SUCH DAMAGE.
41		41
42		42
43	.content-main .collapsible-content .timeline-track {	43	.content-main .collapsible-content .timeline-track {
44	height: 18px;	44	height: 18px;
45	padding-top: 2px;	45	padding-top: 2px;
46	border-bottom: 1px solid $color-menu-divider;	46	border-bottom: 1px solid $color-menu-divider;
47	background-image: url("../images/gridline.jpg");	47	background-image: url("../images/gridline.jpg");
48	}	48	}
49		49
50		50
51	.timeline-track .content-main {	51	.timeline-track .content-main {
52	background-color: $color-menu-bg;	52	background-color: $color-menu-bg;
53	}	53	}
54		54
55	.prop-track .collapsible-content.collapsible-collapsed {	55	.prop-track .collapsible-content.collapsible-collapsed {
56	overflow: hidden;	56	overflow: hidden;
57	height: 0px;	57	height: 0px;
58	}	58	}