Merge branch 'timeline-k' of github.com:ntfx47/ninja-internal into TimelineUber

Conflicts:
	js/panels/Timeline/Layer.reel/Layer.js

Signed-off-by: Jonathan Duran <jduran@motorola.com>

1 files changed, 10 insertions, 3 deletions

diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index 4b7fe24c..679b88f3 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -484,9 +484,16 @@ var Layer = exports.Layer = Montage.create(Component, {
                 // Make it editable!
                 this._layerEditable = Hintable.create();
                 this._layerEditable.element = this.titleSelector;
-                this._layerEditable.addEventListener("blur", this.handleSelectorEditableBlur.bind(this), false);
-                this._layerEditable.addEventListener("change", this.handleSelectorEditableChange.bind(this), false);
-                
+                this.titleSelector.identifier = "selectorEditable";
+                this.titleSelector.addEventListener("click", this, false);
+                this._layerEditable.addEventListener("blur", function(event) {
+                        that.handleSelectorEditableBlur(event);
+                }, false);
+                this._layerEditable.addEventListener("change", function(event) {
+                                that.dynamicLayerName.value = that._layerEditable.value;
+                this.application.ninja.timeline.currentLayerSelected.layerData.elementsList[0].dataset.storedLayerName = that.dynamicLayerName.value
+                                that.needsDraw = true;
+                }, false);
                 this._layerEditable.editingClass = "editable2";
                 this._layerEditable.value = this.layerName;
                 //this._layerEditable.needsDraw = true;