Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into integration

author: hwc487 2012-02-27 13:41:31 -0800
committer: hwc487 2012-02-27 13:41:31 -0800
commit: 124ad4709780013615d2ff1da05ace9887ee7709 (patch)
tree: e8de66216e338f4cba1a98c3a00473ead3daef9d /js/panels/Timeline/TimelineTrack.reel
parent: a8bd1585ae83d4d304b9f9f41823bb3dcbff9e01 (diff)
parent: 8125c8c6c9431067840d81c46624b6a2dd5eb4a7 (diff)
download: ninja-124ad4709780013615d2ff1da05ace9887ee7709.tar.gz
4 files changed, 67 insertions, 35 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
index cabd92c0..158d666e 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
@@ -1,4 +1,9 @@
 <!DOCTYPE html>
+<!-- <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> -->
 <html lang="en">
        <head>
        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index fddfd170..0c5121cd 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -1,3 +1,9 @@
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
 var Montage = require("montage/core/core").Montage;
 var Component = require("montage/ui/component").Component;
 var Collapser = require("js/panels/Timeline/Collapser").Collapser;
@@ -358,9 +364,11 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
    didDraw:{
        value:function () {
-            if (this._openDocRedrawCheck) {
+            if(this.application.ninja.currentDocument.documentRoot.children[0]){
-                this.retrieveStoredTweens();
+                if (this._openDocRedrawCheck) {
-                this._openDocRedrawCheck = false;
+                    this.retrieveStoredTweens();
+                    this._openDocRedrawCheck = false;
+                }
            }
        }
    },
@@ -459,42 +467,48 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
            this.animatedElement = this.application.ninja.timeline.arrLayers[this.trackID - 1].elementsList[0];
            this.animationName = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-name");
            this.animationDuration = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-duration");
-            this.trackDuration = this.animationDuration.split("s");
+            if(this.animationDuration){
-            this.currentMilliSec = this.trackDuration[0] * 1000;
+                this.trackDuration = this.animationDuration.split("s");
-            this.currentMillisecPerPixel = Math.floor(this.application.ninja.timeline.millisecondsOffset / 80);
+                this.currentMilliSec = this.trackDuration[0] * 1000;
-            this.clickPos = this.currentMilliSec / this.currentMillisecPerPixel;
+                this.currentMillisecPerPixel = Math.floor(this.application.ninja.timeline.millisecondsOffset / 80);
-            this.nextKeyframe = 0;
+                this.clickPos = this.currentMilliSec / this.currentMillisecPerPixel;
+                this.nextKeyframe = 0;
-            this.currentKeyframeRule = this.application.ninja.stylesController.getAnimationRuleWithName(this.animationName, this.application.ninja.currentDocument._document);
-            while (this.currentKeyframeRule[i]) {
+                this.currentKeyframeRule = this.application.ninja.stylesController.getAnimationRuleWithName(this.animationName, this.application.ninja.currentDocument._document);
-                var newTween = {};
+                while (this.currentKeyframeRule[i]) {
-                if (this.currentKeyframeRule[i].keyText === "0%") {
+                    var newTween = {};
-                    newTween.spanWidth = 0;
-                    newTween.keyFramePosition = 0;
+                    if (this.currentKeyframeRule[i].keyText === "0%") {
-                    newTween.keyFrameMillisec = 0;
+                        newTween.spanWidth = 0;
-                    newTween.tweenID = 0;
+                        newTween.keyFramePosition = 0;
-                    newTween.spanPosition = 0;
+                        newTween.keyFrameMillisec = 0;
-                    this.tweens.push(newTween);
+                        newTween.tweenID = 0;
+                        newTween.spanPosition = 0;
+                        this.tweens.push(newTween);
-                }
+                    }
-                else {
+                    else {
-                    percentValue = this.currentKeyframeRule[i].keyText;
+                        percentValue = this.currentKeyframeRule[i].keyText;
-                    splitValue = percentValue.split("%");
+                        splitValue = percentValue.split("%");
-                    fraction = splitValue[0] / 100;
+                        fraction = splitValue[0] / 100;
-                    this.currentMilliSec = fraction * this.trackDuration[0] * 1000;
+                        this.currentMilliSec = fraction * this.trackDuration[0] * 1000;
-                    this.currentMillisecPerPixel = Math.floor(this.application.ninja.timeline.millisecondsOffset / 80);
+                        this.currentMillisecPerPixel = Math.floor(this.application.ninja.timeline.millisecondsOffset / 80);
-                    this.clickPos = this.currentMilliSec / this.currentMillisecPerPixel;
+                        this.clickPos = this.currentMilliSec / this.currentMillisecPerPixel;
-                    newTween.spanWidth = this.clickPos - this.tweens[this.tweens.length - 1].keyFramePosition;
+                        newTween.spanWidth = this.clickPos - this.tweens[this.tweens.length - 1].keyFramePosition;
-                    newTween.keyFramePosition = this.clickPos;
+                        newTween.keyFramePosition = this.clickPos;
-                    newTween.keyFrameMillisec = this.currentMilliSec;
+                        newTween.keyFrameMillisec = this.currentMilliSec;
-                    newTween.tweenID = this.nextKeyframe;
+                        newTween.tweenID = this.nextKeyframe;
-                    newTween.spanPosition = this.clickPos - newTween.spanWidth;
+                        newTween.spanPosition = this.clickPos - newTween.spanWidth;
-                    this.tweens.push(newTween);
+                        this.tweens.push(newTween);
+                    }
+                    i++;
+                    this.nextKeyframe += 1;
                }
-                i++;
+            }
-                this.nextKeyframe += 1;
+            else{
+                return;
            }
        }
    },
diff --git a/js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css b/js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css
index 7a778e25..57e4dce6 100644
--- a/js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css
+++ b/js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css
@@ -1,4 +1,11 @@
 @charset "UTF-8";
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
 /* TimelineTrack.scss
 * Main SCSS file for TimelineTrack component, compiled by SASS into the file css/TimelineTrack.css.
 */
diff --git a/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss b/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss
index 43d5f438..1b025c74 100644
--- a/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss
+++ b/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss
@@ -1,5 +1,11 @@
 @charset "UTF-8";
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
 /* TimelineTrack.scss
 * Main SCSS file for TimelineTrack component, compiled by SASS into the file css/TimelineTrack.css.
 */
author	hwc487	2012-02-27 13:41:31 -0800
committer	hwc487	2012-02-27 13:41:31 -0800
commit	124ad4709780013615d2ff1da05ace9887ee7709 (patch)
tree	e8de66216e338f4cba1a98c3a00473ead3daef9d /js/panels/Timeline/TimelineTrack.reel
parent	a8bd1585ae83d4d304b9f9f41823bb3dcbff9e01 (diff)
parent	8125c8c6c9431067840d81c46624b6a2dd5eb4a7 (diff)
download	ninja-124ad4709780013615d2ff1da05ace9887ee7709.tar.gz

diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html index cabd92c0..158d666e 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
@@ -1,4 +1,9 @@
1	<!DOCTYPE html>	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> -->
2	<html lang="en">	7	<html lang="en">
3	<head>	8	<head>
4	<meta http-equiv="content-type" content="text/html; charset=utf-8" />	9	<meta http-equiv="content-type" content="text/html; charset=utf-8" />


diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js index fddfd170..0c5121cd 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -1,3 +1,9 @@
		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
1	var Montage = require("montage/core/core").Montage;	7	var Montage = require("montage/core/core").Montage;
2	var Component = require("montage/ui/component").Component;	8	var Component = require("montage/ui/component").Component;
3	var Collapser = require("js/panels/Timeline/Collapser").Collapser;	9	var Collapser = require("js/panels/Timeline/Collapser").Collapser;
@@ -358,9 +364,11 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
358		364
359	didDraw:{	365	didDraw:{
360	value:function () {	366	value:function () {
361	if (this._openDocRedrawCheck) {	367	if(this.application.ninja.currentDocument.documentRoot.children[0]){
362	this.retrieveStoredTweens();	368	if (this._openDocRedrawCheck) {
363	this._openDocRedrawCheck = false;	369	this.retrieveStoredTweens();
		370	this._openDocRedrawCheck = false;
		371	}
364	}	372	}
365	}	373	}
366	},	374	},
@@ -459,42 +467,48 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
459	this.animatedElement = this.application.ninja.timeline.arrLayers[this.trackID - 1].elementsList[0];	467	this.animatedElement = this.application.ninja.timeline.arrLayers[this.trackID - 1].elementsList[0];
460	this.animationName = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-name");	468	this.animationName = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-name");
461	this.animationDuration = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-duration");	469	this.animationDuration = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-duration");
462	this.trackDuration = this.animationDuration.split("s");	470	if(this.animationDuration){
463	this.currentMilliSec = this.trackDuration[0] * 1000;	471	this.trackDuration = this.animationDuration.split("s");
464	this.currentMillisecPerPixel = Math.floor(this.application.ninja.timeline.millisecondsOffset / 80);	472	this.currentMilliSec = this.trackDuration[0] * 1000;
465	this.clickPos = this.currentMilliSec / this.currentMillisecPerPixel;	473	this.currentMillisecPerPixel = Math.floor(this.application.ninja.timeline.millisecondsOffset / 80);
466	this.nextKeyframe = 0;	474	this.clickPos = this.currentMilliSec / this.currentMillisecPerPixel;
467		475	this.nextKeyframe = 0;
468	this.currentKeyframeRule = this.application.ninja.stylesController.getAnimationRuleWithName(this.animationName, this.application.ninja.currentDocument._document);	476
469	while (this.currentKeyframeRule[i]) {	477	this.currentKeyframeRule = this.application.ninja.stylesController.getAnimationRuleWithName(this.animationName, this.application.ninja.currentDocument._document);
470	var newTween = {};	478	while (this.currentKeyframeRule[i]) {
471	if (this.currentKeyframeRule[i].keyText === "0%") {	479	var newTween = {};
472	newTween.spanWidth = 0;	480
473	newTween.keyFramePosition = 0;	481	if (this.currentKeyframeRule[i].keyText === "0%") {
474	newTween.keyFrameMillisec = 0;	482	newTween.spanWidth = 0;
475	newTween.tweenID = 0;	483	newTween.keyFramePosition = 0;
476	newTween.spanPosition = 0;	484	newTween.keyFrameMillisec = 0;
477	this.tweens.push(newTween);	485	newTween.tweenID = 0;
		486	newTween.spanPosition = 0;
		487	this.tweens.push(newTween);
478		488
479	}	489	}
480	else {	490	else {
481	percentValue = this.currentKeyframeRule[i].keyText;	491	percentValue = this.currentKeyframeRule[i].keyText;
482	splitValue = percentValue.split("%");	492	splitValue = percentValue.split("%");
483	fraction = splitValue[0] / 100;	493	fraction = splitValue[0] / 100;
484	this.currentMilliSec = fraction * this.trackDuration[0] * 1000;	494	this.currentMilliSec = fraction * this.trackDuration[0] * 1000;
485	this.currentMillisecPerPixel = Math.floor(this.application.ninja.timeline.millisecondsOffset / 80);	495	this.currentMillisecPerPixel = Math.floor(this.application.ninja.timeline.millisecondsOffset / 80);
486	this.clickPos = this.currentMilliSec / this.currentMillisecPerPixel;	496	this.clickPos = this.currentMilliSec / this.currentMillisecPerPixel;
487	newTween.spanWidth = this.clickPos - this.tweens[this.tweens.length - 1].keyFramePosition;	497	newTween.spanWidth = this.clickPos - this.tweens[this.tweens.length - 1].keyFramePosition;
488	newTween.keyFramePosition = this.clickPos;	498	newTween.keyFramePosition = this.clickPos;
489	newTween.keyFrameMillisec = this.currentMilliSec;	499	newTween.keyFrameMillisec = this.currentMilliSec;
490	newTween.tweenID = this.nextKeyframe;	500	newTween.tweenID = this.nextKeyframe;
491	newTween.spanPosition = this.clickPos - newTween.spanWidth;	501	newTween.spanPosition = this.clickPos - newTween.spanWidth;
492	this.tweens.push(newTween);	502	this.tweens.push(newTween);
493		503
494		504
		505	}
		506	i++;
		507	this.nextKeyframe += 1;
495	}	508	}
496	i++;	509	}
497	this.nextKeyframe += 1;	510	else{
		511	return;
498	}	512	}
499	}	513	}
500	},	514	},


diff --git a/js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css b/js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css index 7a778e25..57e4dce6 100644 --- a/js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css +++ b/js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css
@@ -1,4 +1,11 @@
1	@charset "UTF-8";	1	@charset "UTF-8";
		2
		3	/* <copyright>
		4	This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
		5	No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
		6	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
		7	</copyright> */
		8
2	/* TimelineTrack.scss	9	/* TimelineTrack.scss
3	* Main SCSS file for TimelineTrack component, compiled by SASS into the file css/TimelineTrack.css.	10	* Main SCSS file for TimelineTrack component, compiled by SASS into the file css/TimelineTrack.css.
4	*/	11	*/


diff --git a/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss b/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss index 43d5f438..1b025c74 100644 --- a/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss +++ b/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss
@@ -1,5 +1,11 @@
1	@charset "UTF-8";	1	@charset "UTF-8";
2		2
		3	/* <copyright>
		4	This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
		5	No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
		6	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
		7	</copyright> */
		8
3	/* TimelineTrack.scss	9	/* TimelineTrack.scss
4	* Main SCSS file for TimelineTrack component, compiled by SASS into the file css/TimelineTrack.css.	10	* Main SCSS file for TimelineTrack component, compiled by SASS into the file css/TimelineTrack.css.
5	*/	11	*/