From 3e4450efb05018107be5e3012bce45cc324569f8 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Thu, 28 Jun 2012 09:48:44 -0700
Subject: Timeline: Better deselection of tweens when selecting/deselecting
 layers.

Conflicts:

	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	Resolved: use mine (doesn't matter, affected code block is in
	commented out section)
---
 .../Timeline/TimelinePanel.reel/TimelinePanel.js   | 40 +++++++++++++++++-----
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 45353a08..3d31a50b 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -1217,8 +1217,21 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         		arrCurrentElementsSelected = [];
             var matchedValues = 0;
 
-            for(i=0;i<arrSelectedIndexesLength;i++){
-                for(j=0;j<currentLayersSelectedLength;j++){
+        	/*
+            if (arrSelectedIndexesLength !== 0) {
+	            for(i=0;i<arrSelectedIndexesLength;i++){
+	                for(j=0;j<currentLayersSelectedLength;j++){
+	
+	                    if(this.arrLayers[arrSelectedIndexes[i]] === this.arrLayers[this.currentLayerSelected[j]]){
+	                        matchedValues+=1;
+	                    }
+	                }
+	            }
+	
+	            if(matchedValues === arrSelectedIndexesLength){
+	                return;
+	            }
+            } 
 
                     if(this.arrLayers[arrSelectedIndexes[i]] === this.arrLayers[this.currentLayersSelected[j]]){
                         matchedValues+=1;
@@ -1226,11 +1239,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 }
             }
 
-            if(matchedValues === arrSelectedIndexesLength){
-                return;
-            }
 
-        	/*
         	 // TODO: this should probably check to see if it actually needs to run.
 
         	        		console.log(arrSelectedIndexes);
@@ -1266,6 +1275,21 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             		if (arrSelectedIndexes.indexOf(i) < 0) {
 						this.arrLayers[i].layerData.isSelected = false;
 	            		this.triggerLayerBinding(i);
+	            		
+	            		// Check to see if this layer, that we're deselecting, has
+	            		// any selected keyframes associated with it.  If it does, deselect them.
+	            		for (var j = 0; j < this.selectedTweens.length; j++) {
+	            			var currentStageElement;
+	            			if (typeof(this.selectedTweens[j].parentComponent.parentComponent.trackType) === "undefined") {
+	            				currentStageElement = this.selectedTweens[j].parentComponent.parentComponent.stageElement; 
+	            			} else {
+	            				currentStageElement = this.selectedTweens[j].parentComponent.parentComponent.parentComponent.parentComponent.parentComponent.parentComponent.stageElement;
+	            			}
+	            			if (this.arrLayers[i].layerData.stageElement === currentStageElement) {
+	            				this.selectedTweens[j].deselectTween();
+	            				this.selectedTweens.splice(j, 1);
+	            			}
+	            		}
             		}
             	}
             }
@@ -1273,8 +1297,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             	this.currentLayersSelected = false;
             }
 
-            // Deselect any tweens
-                this.deselectTweens();
+            // Deselect tweens
+            //this.deselectTweens();
 
             
             // If we are actually going to be selecting things, create an empty array to use
-- 
cgit v1.2.3


From 1b6202d3cd517480aebafdfe97e9b89600d715ce Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Thu, 28 Jun 2012 22:46:07 -0700
Subject: video autopsy fix: moving the event handler on creation

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/controllers/elements/video-controller.js | 13 -------------
 js/tools/TagTool.js                         | 24 +++++++++++++++++++++++-
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/js/controllers/elements/video-controller.js b/js/controllers/elements/video-controller.js
index 44ba5aa1..c36752f5 100755
--- a/js/controllers/elements/video-controller.js
+++ b/js/controllers/elements/video-controller.js
@@ -28,19 +28,6 @@ exports.VideoController = Montage.create(ElementController, {
         value: function(el, p, value) {
             switch(p) {
                 case "src":
-                	
-                	//TODO: Move this to the location where the element is created
-                	el.addEventListener('canplay', function(e) {
-						//TODO: Figure out why the video must be seeked to the end before pausing
-  						var time = Math.ceil(this.duration);
-  						//Trying to display the last frame (doing minus 2 seconds if long video)
-  						if (time > 2) this.currentTime = time - 2;
-  						else if (time > 1) this.currentTime = time - 1;
-  						else this.currentTime = time || 0;
-  						//Pauing video
-  						this.pause();
-  					}, false);
-  					
                     el.setAttribute(p, value);
                     break;
                 case "poster":
diff --git a/js/tools/TagTool.js b/js/tools/TagTool.js
index 31918f92..27665ee6 100755
--- a/js/tools/TagTool.js
+++ b/js/tools/TagTool.js
@@ -86,11 +86,15 @@ exports.TagTool = Montage.create(DrawingTool, {
             // Create the element
             if(this.options.selectedElement === "custom") {
                 element = document.application.njUtils.make(this.options.customName.value, null, this.application.ninja.currentDocument);
-
             } else {
                 element = document.application.njUtils.make(this.options.selectedElement, null, this.application.ninja.currentDocument);
             }
 
+            // Adding a canplay event to videos to pause them and prevent autoplay on stage
+            if(this.options.selectedElement === "video") {
+                element.addEventListener("canplay", this, false);
+            }
+
             // Create the styles
             styles = document.application.njUtils.stylesFromDraw(element, ~~drawData.width, ~~drawData.height, drawData);
 
@@ -109,6 +113,24 @@ exports.TagTool = Montage.create(DrawingTool, {
             // Add the element and styles
             this.application.ninja.elementMediator.addElements(element, styles);
         }
+    },
+
+    handleCanplay: {
+        value: function(event) {
+            //TODO: Figure out why the video must be seeked to the end before pausing
+            var time = Math.ceil(this.duration);
+            //Trying to display the last frame (doing minus 2 seconds if long video)
+            if (time > 2) {
+                this.currentTime = time - 2;
+            } else if (time > 1) {
+                this.currentTime = time - 1;
+            } else {
+                this.currentTime = time || 0;
+            }
+            //Pauing video
+            event.target.pause();
+        }
     }
+
 });
 
-- 
cgit v1.2.3