Destroy the label editor & DOM on wire destroy

ericabouaf · Aug 9, 2010 · 9e54179 · 9e54179
1 parent 3f60e6b
commit 9e54179
Show file tree

Hide file tree

Showing 12 changed files with 58 additions and 5 deletions.
diff --git a/VERSION.txt b/VERSION.txt
@@ -24,6 +24,11 @@ Changeset:
 		* Position constrained to (0,0) minimum
 		* Fix FormContainer terminals positioning if the fieldset is collapsed
 
+	* Adding 3 Containers :
+		* CanvasContainer : uses a canvas tag to render a container
+		* EllipseLabelContainer : inherits the CanvasContainer to draw an ellipse
+		* RectLabelContainer : Simple rect container with editable label
+
   * Layer enhancements
 		* Export wires properties in getWiring method
 

diff --git a/build/wireit-inputex-editor-composable-min.js b/build/wireit-inputex-editor-composable-min.js
diff --git a/build/wireit-inputex-editor-composable.js b/build/wireit-inputex-editor-composable.js
@@ -476,6 +476,14 @@ YAHOO.lang.extend(WireIt.Wire, WireIt.CanvasElement, {
     	// Remove references to old terminals
     	this.terminal1 = null;
     	this.terminal2 = null;
+
+		// Remove Label
+		if(this.labelEl) {
+			if(this.labelField) {
+				this.labelField.destroy();
+			}
+			this.labelEl.innerHTML = "";
+		}
    },
 
 

diff --git a/build/wireit-inputex-editor-grouping-min.js b/build/wireit-inputex-editor-grouping-min.js
diff --git a/build/wireit-inputex-editor-grouping.js b/build/wireit-inputex-editor-grouping.js
@@ -476,6 +476,14 @@ YAHOO.lang.extend(WireIt.Wire, WireIt.CanvasElement, {
     	// Remove references to old terminals
     	this.terminal1 = null;
     	this.terminal2 = null;
+
+		// Remove Label
+		if(this.labelEl) {
+			if(this.labelField) {
+				this.labelField.destroy();
+			}
+			this.labelEl.innerHTML = "";
+		}
    },
 
 

diff --git a/build/wireit-inputex-editor-min.js b/build/wireit-inputex-editor-min.js
diff --git a/build/wireit-inputex-editor.js b/build/wireit-inputex-editor.js
@@ -476,6 +476,14 @@ YAHOO.lang.extend(WireIt.Wire, WireIt.CanvasElement, {
     	// Remove references to old terminals
     	this.terminal1 = null;
     	this.terminal2 = null;
+
+		// Remove Label
+		if(this.labelEl) {
+			if(this.labelField) {
+				this.labelField.destroy();
+			}
+			this.labelEl.innerHTML = "";
+		}
    },
 
 

diff --git a/build/wireit-inputex-min.js b/build/wireit-inputex-min.js
diff --git a/build/wireit-inputex.js b/build/wireit-inputex.js
@@ -476,6 +476,14 @@ YAHOO.lang.extend(WireIt.Wire, WireIt.CanvasElement, {
     	// Remove references to old terminals
     	this.terminal1 = null;
     	this.terminal2 = null;
+
+		// Remove Label
+		if(this.labelEl) {
+			if(this.labelField) {
+				this.labelField.destroy();
+			}
+			this.labelEl.innerHTML = "";
+		}
    },
 
 

diff --git a/build/wireit-min.js b/build/wireit-min.js
diff --git a/build/wireit.js b/build/wireit.js
@@ -476,6 +476,14 @@ YAHOO.lang.extend(WireIt.Wire, WireIt.CanvasElement, {
     	// Remove references to old terminals
     	this.terminal1 = null;
     	this.terminal2 = null;
+
+		// Remove Label
+		if(this.labelEl) {
+			if(this.labelField) {
+				this.labelField.destroy();
+			}
+			this.labelEl.innerHTML = "";
+		}
    },
 
 

diff --git a/js/Wire.js b/js/Wire.js
@@ -206,6 +206,14 @@ YAHOO.lang.extend(WireIt.Wire, WireIt.CanvasElement, {
     	// Remove references to old terminals
     	this.terminal1 = null;
     	this.terminal2 = null;
+
+		// Remove Label
+		if(this.labelEl) {
+			if(this.labelField) {
+				this.labelField.destroy();
+			}
+			this.labelEl.innerHTML = "";
+		}
    },