Layer fix for loading wireConfig. jsBox fix for positionning terminals

ericabouaf · Mar 2, 2009 · 366b697 · 366b697
1 parent ea36234
commit 366b697
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 49 deletions.
diff --git a/examples/jsBox/jsBox.js b/examples/jsBox/jsBox.js
@@ -92,48 +92,7 @@ var jsBox = {
    		            }
 		         ]
 		      }
-		   }//,
-
-
-		   /*****************************
-		    * FAKE MODULES, JUST POC
-		    *****************************
-		   {
-		      "name": "asyncRequestCallback9", 
-		      "container": {
-		         "xtype": "jsBox.ComposedContainer",
-		         "title": "asyncRequestCallback9"
-		      }
-		   },
-		   {
-		      "name": "inputValue", 
-		      "container": {
-		         "xtype": "jsBox.ComposedContainer",
-		         "title": "inputValue"
-		      }
-		   },
-		   {
-		      "name": "Multiplication2", 
-		      "container": {
-		         "xtype": "jsBox.ComposedContainer",
-		         "title": "Multiplication2"
-		      }
-		   },
-		   {
-		      "name": "ComposedModule3", 
-		      "container": {
-		         "xtype": "jsBox.ComposedContainer",
-		         "title": "ComposedModule3"
-		      }
 		   }
-		   ,
-		   {
-		      "name": "machinTruc", 
-		      "container": {
-		         "xtype": "jsBox.ComposedContainer",
-		         "title": "machinTruc"
-		      }
-		   }*/
 		]
 	},
 
@@ -179,7 +138,8 @@ YAHOO.lang.extend(jsBox.WiringEditor, WireIt.WiringEditor, {
    /**
     * Overwrite updateLoadPanelList to add Composed modules to the module list
     */
-   updateLoadPanelList: function() { try {
+   updateLoadPanelList: function() { 
+      try {
        var left = YAHOO.util.Dom.get('left');
        var list = WireIt.cn("ul");
        if(YAHOO.lang.isArray(this.pipes)) {
@@ -218,8 +178,8 @@ YAHOO.lang.extend(jsBox.WiringEditor, WireIt.WiringEditor, {
        panelBody.innerHTML = "";
        panelBody.appendChild(list);
 
-    }catch(ex){console.log(ex);}
-    },
+      }catch(ex){console.log(ex);}
+    }
 
 });
 
@@ -289,7 +249,7 @@ YAHOO.extend(jsBox.Container, WireIt.Container, {
       }
       else if (curTerminalN > nParams) {
          // remove terminals
-         for(var i = nParams ; i < curTerminalN ; i++) {
+         for(var i = this.terminals.length-(curTerminalN-nParams) ; i < this.terminals.length ; i++) {
          	this.terminals[i].remove();
          	this.terminals[i] = null;
          }

diff --git a/js/Layer.js b/js/Layer.js
@@ -158,12 +158,9 @@ WireIt.Layer.prototype = {
       var src = wireConfig.src;
       var tgt = wireConfig.tgt;
 
-      /*var terminal1 = this.containers[src.moduleId].terminals[src.terminalId];
-      var terminal2 = this.containers[tgt.moduleId].terminals[tgt.terminalId];*/
       var terminal1 = this.containers[src.moduleId].getTerminal(src.terminal);
       var terminal2 = this.containers[tgt.moduleId].getTerminal(tgt.terminal);
-
-      var wire = new type( terminal1, terminal2, this.el);
+      var wire = new type( terminal1, terminal2, this.el, wireConfig);
       wire.redraw();
 
       return wire;