5 files changed, 10 insertions, 6 deletions

diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js
index 508b8130..c57bb2d7 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.js
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.js
@@ -7,6 +7,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 var Montage = require("montage/core/core").Montage,
     Component   = require("montage/ui/component").Component;
 var Button =                    require("js/components/button.reel").Button;
+var MaterialsModel = require("js/models/materials-model").MaterialsModel;
 
 ////////////////////////////////////////////////////////////////////////
 //Exporting as MaterialsPopup
@@ -223,7 +224,7 @@ exports.MaterialsPopup = Montage.create(Component, {
                                         (materialID ===  "RadialGradientMaterial")
                                 )
                         {
-                                var material = MaterialsLibrary.getMaterial( materialID );
+                                var material = MaterialsModel.getMaterial( materialID );
                                 if (material)
                                 {
                                         this._material = material;
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 2001c3fb..4ff28fd4 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -494,7 +494,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             var ptrParent = nj.queryParentSelector(event.target, ".container-layer");
             if (ptrParent !== false) {
                 var myIndex = this.getActiveLayerIndex();
-                this.selectLayer(myIndex);
+                this.selectLayer(myIndex, true);
             }
         }
     },
@@ -977,7 +977,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     },
 
     selectLayer:{
-        value:function (layerIndex) {
+        value:function (layerIndex, userSelection) {
             var i = 0;
             var arrLayersLength = this.arrLayers.length;
 
@@ -995,7 +995,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 this.layerRepetition.selectedIndexes = [layerIndex];
                 this.trackRepetition.selectedIndexes = [layerIndex];
                 this.currentLayerSelected = this.arrLayers[layerIndex];
-                if(!this._openDoc){
+                if(userSelection){
                     if(this._captureSelection){
                         if(this.currentLayerSelected.elementsList.length >= 1){
                             this.application.ninja.selectionController.selectElements(this.currentLayerSelected.elementsList);
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index 3a195f47..6ff38bef 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -175,7 +175,7 @@ var Tween = exports.Tween = Montage.create(Component, {
 
             // select the containing layer
             var selectIndex = this.application.ninja.timeline.getLayerIndexByID(this.parentComponent.parentComponent.trackID);
-            this.application.ninja.timeline.selectLayer(selectIndex);
+            this.application.ninja.timeline.selectLayer(selectIndex, true);
 
             // tell timeline to deselect all other tweens and push this one as the currentSelectedTweens in timeline
             this.application.ninja.timeline.deselectTweens();
diff --git a/js/panels/presets/style-presets.reel/style-presets.js b/js/panels/presets/style-presets.reel/style-presets.js
index 7871683e..11f41822 100644
--- a/js/panels/presets/style-presets.reel/style-presets.js
+++ b/js/panels/presets/style-presets.reel/style-presets.js
@@ -47,9 +47,11 @@ exports.StylesLibrary = Montage.create(Component, {
             selection.forEach(function(el) {
                 el._element.style.webkitTransition = "all 450ms linear";
 
-                el._element.addEventListener("webkitTransitionEnd", function(e) {
+                el._element.addEventListener("webkitTransitionEnd", function presetTransition(e) {
                     el._element.style.webkitTransition = '';
                     setStopRuleSelector("*");
+                    this.removeEventListener("webkitTransitionEnd", presetTransition, true);
+
                 }, true);
                 setStopRuleSelector("transitionStopRule");
                 el._element.classList.add(selectorBase);
diff --git a/js/panels/presets/transitions-presets.reel/transitions-presets.html b/js/panels/presets/transitions-presets.reel/transitions-presets.html
index c22ed351..5dc28edf 100644
--- a/js/panels/presets/transitions-presets.reel/transitions-presets.html
+++ b/js/panels/presets/transitions-presets.reel/transitions-presets.html
@@ -40,6 +40,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                     "element" : {"#": "libraryContainer"},
                     "branchComponent" : {"@": "branch" },
                     "contentController": {"@": "presetsController"},
+                    "activationEvent" : "dblclick",
                     "showRoot": false
                 }
             },