Fix terminal-dragedit without layer

ericabouaf · Jun 17, 2012 · d684736 · d684736
1 parent 8cf6ad6
commit d684736
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 14 deletions.
diff --git a/examples/3-container.html b/examples/3-container.html
@@ -77,7 +77,7 @@
 
 
      src: c1.item(1),
-     tgt: c2.item(0),
+     tgt: c2.item(0)
 
   });
 

diff --git a/examples/6-form-container.html b/examples/6-form-container.html
@@ -21,17 +21,20 @@
   window.Y = Y;
 
   var layerEl = Y.one('#layer');
+  var mygraphic = new Y.Graphic({render: "#layer"});
 
   c1 = new Y.FormContainer({
     children: [
       { 
 		align: {points:["tl", "tc"]}, 
 		dir: [0,-1],
-		groups: ['string']
+		groups: ['string'],
+		graphic: mygraphic
 	},
       { 
 		align: {points:["tl", "bc"]}, dir: [0, 1],
-		groups: ['object']
+		groups: ['object'],
+		graphic: mygraphic
 	}
     ],
 

diff --git a/src/loader.js b/src/loader.js
@@ -25,7 +25,7 @@ YUI().use(function(Y) {
 						requires: ['widget','widget-child','widget-position','widget-position-align','wire-base', 'wires-delegate']
 					},
 					'terminal-dragedit': {
-						requires: ['dd-drop', 'dd-drag','dd-proxy']
+						requires: ['bezier-wire', 'dd-drop', 'dd-drag','dd-proxy']
 					},
 					'terminal-scissors': {
 						requires: ['overlay']

diff --git a/src/terminal-dragedit/terminal-dragedit.js b/src/terminal-dragedit/terminal-dragedit.js
@@ -27,6 +27,10 @@ Y.TerminalDragEdit.ATTRS = {
 
 	"editwire-class": {
 		value: Y.BezierWire
+	},
+
+	graphic: {
+	   value: null
 	}
 
 };
@@ -86,13 +90,18 @@ Y.TerminalDragEdit.prototype = {
 		var dir = this.get('dir');
 		var that = this;
 
-		// TODO: console.log( this.get('editwire-class') );
+		if(!this.get('graphic')) {
+		   this.set('graphic', this.get('root').graphic);
+		}
 
-		this.drag.wire = this.get('root').graphic.addShape({
-           type: Y.BezierWire, //,editwire-class
-           stroke: {
-               weight: 4,
-               color: "rgb(173,216,230)" 
+		this.drag.wire = this.get('graphic').addShape({
+
+		   type: this.get('editwire-class'),
+
+		   // TODO: customizable
+		   stroke: {
+		      weight: 4,
+		   color: "rgb(173,216,230)" 
            },
 
            src: { 
@@ -164,4 +173,4 @@ Y.TerminalDragEdit.prototype = {
 
 };
 
-}, '3.5.1', {requires: ['dd-drop', 'dd-drag', 'dd-proxy']});
+}, '3.5.1', {requires: ['bezier-wire', 'dd-drop', 'dd-drag', 'dd-proxy']});
diff --git a/src/wireit-app/wireit-app.js b/src/wireit-app/wireit-app.js
@@ -335,10 +335,18 @@ Y.EditorView = Y.Base.create('editorView', Y.View, [], {
 
 			// TODO: wire.config;
 
-			var w = new Y.BezierWire({
-				src: srcTerminal,
+         var w = layer.graphic.addShape({
+            type: Y.BezierWire,
+            stroke: {
+                weight: 4,
+                color: "rgb(173,216,230)" 
+            },
+
+
+            src: srcTerminal,
 				tgt: tgtTerminal
-			}).render( layer.get('contentBox') );
+
+         });
 
 		});