From 811ce7a7cdec18f304c6660a70012960e61d967a Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Thu, 24 May 2012 17:46:47 -0700
Subject: Timeline: bug fix "Layer name gets doubled" (Spreadsheet)

---
 js/components/editable.reel/editable.js  |  3 +--
 js/components/hintable.reel/hintable.js  |  7 +++--
 js/panels/Timeline/Layer.reel/Layer.html |  3 ++-
 js/panels/Timeline/Layer.reel/Layer.js   | 44 ++++++++++++++++++++++----------
 4 files changed, 39 insertions(+), 18 deletions(-)

(limited to 'js')

diff --git a/js/components/editable.reel/editable.js b/js/components/editable.reel/editable.js
index 6ccb0445..dad93b31 100644
--- a/js/components/editable.reel/editable.js
+++ b/js/components/editable.reel/editable.js
@@ -96,8 +96,7 @@ exports.Editable = Montage.create(Component, {
             return this._element.textContent;
         },
         set: function(str) {
-            //this._element.textContent = str;
-            this._element.innerText = str;
+            this._element.textContent = str;
         }
     },
 
diff --git a/js/components/hintable.reel/hintable.js b/js/components/hintable.reel/hintable.js
index 79549191..015b3a30 100644
--- a/js/components/hintable.reel/hintable.js
+++ b/js/components/hintable.reel/hintable.js
@@ -146,8 +146,11 @@ exports.Hintable = Montage.create(Editable, {
         },
         set: function(str) {
             var node = this._getFirstTextNode();
-            //node.textContent = str;
-            node.innerText = str;
+            if (node.textContent !== str) {
+            	node.textContent = str;
+            }
+            
+            //node.innerText = str;
         }
     },
 
diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html
index c7e7b575..44022211 100644
--- a/js/panels/Timeline/Layer.reel/Layer.html
+++ b/js/panels/Timeline/Layer.reel/Layer.html
@@ -17,6 +17,7 @@
 						"styleRepetition" : {"@":"repetition1"},
 						"dynamicLayerName" : {"@":"dtext1"},
 						"dynamicLayerTag" : {"@": "dtext2"},
+						"layer_label_text" : {"#": "layer-label-text"},
 						"mainCollapser" : {"@" : "mainCollapser"},
 						"positionCollapser" : {"@" : "positionCollapser"},
 						"styleCollapser" : {"@" : "styleCollapser"},
@@ -33,7 +34,7 @@
 	            		"value" : {
 	            			"boundObject" : {"@": "owner"},
 	            			"boundObjectPropertyPath" : "layerName",
-	            			"oneway" : false
+	            			"oneway" : true
 	            		}
 	            	}
 	            },
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index 8df0e9ae..db99e869 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -74,7 +74,7 @@ var Layer = exports.Layer = Montage.create(Component, {
 
     /* Layer models: the name, ID, and selected and animation booleans for the layer */
     _layerName:{
-    	value: "Default Layer Name"
+    	value: ""
     },
     
     layerName:{
@@ -83,13 +83,22 @@ var Layer = exports.Layer = Montage.create(Component, {
             return this._layerName;
         },
         set:function(newVal){
-			this._layerEditable.value = newVal;
-	    	this._layerName = newVal;
-	    	this.layerData.layerName = newVal;
+			if (this._layerEditable.value !== newVal) {
+				this._layerEditable.value = newVal;
+			}
+			if (this._layerName !== newVal) {
+				this._layerName = newVal;
+			}
+			if (this.layerData.layerName !== newVal) {
+				this.layerData.layerName = newVal;
+			}
+
 	    	if (typeof(this.dynamicLayerName) !== "undefined") {
-	    		this.dynamicLayerName.value = newVal;
+	    		if (this.dynamicLayerName.value !== newVal) {
+	    			this.dynamicLayerName.value = newVal;
+	    		}
 	    	}
-
+	    	this.needsDraw = true;
         }
     },
     _layerID:{
@@ -513,6 +522,11 @@ var Layer = exports.Layer = Montage.create(Component, {
             	//console.log('Layer.draw, removing selection for layer ', this.layerName)
             	this.element.classList.remove("layerSelected");
             }
+            
+            // Update layer name?
+            if (this.layerName !== this.layer_label_text.innerText) {
+            	this.layer_label_text.innerText = this.layerName;
+            }
     	}
     },
     didDraw: {
@@ -678,10 +692,12 @@ var Layer = exports.Layer = Montage.create(Component, {
 	/* Begin: Event handlers */
 	handleLayerNameChange: {
 		value: function(event) {
-			this.dynamicLayerName.value = this._layerEditable.value;
-			this.needsDraw = true;
-			this.application.ninja.documentController.activeDocument.needsSave = true;
-            this.layerData.stageElement.setAttribute("id",this.dynamicLayerName.value);
+			
+			if (this._layerEditable.value !== this.layerName) {
+				this.layerName = this._layerEditable.value;
+				this.application.ninja.documentController.activeDocument.needsSave = true;
+				this.layerData.stageElement.setAttribute("id",this._layerEditable.value);
+			}
 		}
 	},
 	handleAddStyleClick: {
@@ -706,10 +722,12 @@ var Layer = exports.Layer = Montage.create(Component, {
 			if (this._layerEditable.enteredValue.length === 0) {
 				newVal = this._layerEditable._preEditValue;
 			}
-			this.dynamicLayerName.value = newVal;
 			this.layerName = newVal;
-			this.application.ninja.documentController.activeDocument.needsSave = true;
-			this.needsDraw = true;
+			if (newVal !== this.layerName) {
+				this.layerName = newVal;
+				this.application.ninja.documentController.activeDocument.needsSave = true;
+				this.layerData.stageElement.setAttribute("id", newVal);
+			}
 		}
 	},
 	handleMousedown: {
-- 
cgit v1.2.3