examples/builder/builder.js examples/builder/builder.php examples/builder/builder.smd examples/builder/builder.sql examples/builder/test.html res/WireIt_JSON_formats.gif res/WireIt_Objects.gif @@ -14,6 +14,14 @@ Changeset: * inputEx wirable option: make the inputEx fields wirable * LayerMap leave beta (indicate visible region, move layer on click) + * Terminal position switched to {top: , left: , right: , bottom: } + * new options: + - TerminalProxy.proxySize (default 10) size of the proxy element + - Terminal.alwaysSrc : make this terminal the src element in every wires + - Container.preventSelfWiring : prevent to connect 2 terminals of the same container + + * The Builder: a WiringEditor building page ! + * New demo * Switching to git repository (http://github.com/neyric/wireit/) * Switching issue tracking VERSION.txt @@ -6,7 +6,7 @@ class WiringEditor { 'dbhost' => "localhost", 'dbuser' => "root", 'dbpass' => "root", - 'dbname' => "WiringEditor" + 'dbname' => "WireIt" ); private $link = null; backend/php/WiringEditor.php @@ -1,10 +1,10 @@ -CREATE DATABASE `WiringEditor` ; -CREATE TABLE `WiringEditor`.`wirings` ( -`id` int( 11 ) NOT NULL AUTO_INCREMENT , -`name` varchar( 255 ) NOT NULL , -`working` text NOT NULL , -`language` varchar( 255 ) NOT NULL , -PRIMARY KEY ( `id` ) , -KEY `name` ( `name` , `language` ) +CREATE TABLE `wirings` ( + `id` int( 11 ) NOT NULL AUTO_INCREMENT , + `name` varchar( 255 ) NOT NULL , + `working` text NOT NULL , + `language` varchar( 255 ) NOT NULL , + + PRIMARY KEY ( `id` ) , + KEY `name` ( `name` , `language` ) ); \ No newline at end of file backend/php/WiringEditor.sql @@ -5,8 +5,8 @@ var demoLanguage = { smdUrl: '../../backend/php/WiringEditor.smd', propertiesFields: [ - {"type": "string", inputParams: {"name": "name", label: "Title", wirable: false, typeInvite: "Enter a title" } }, - {"type": "text", inputParams: {"name": "description", label: "Description", wirable: false, cols: 30} } + {"type": "string", inputParams: {"name": "name", label: "Title", typeInvite: "Enter a title" } }, + {"type": "text", inputParams: {"name": "description", label: "Description", cols: 30} } ], modules: [ @@ -38,9 +38,9 @@ var demoLanguage = { "image": "../logicGates/images/gate_and.png", "icon": "http://dev.tarpipe.com/img/tumblr.png", "terminals": [ - {"name": "_INPUT1", "direction": [-1,0], "offsetPosition": [-3,2]}, - {"name": "_INPUT2", "direction": [-1,0], "offsetPosition": [-3,37]}, - {"name": "_OUTPUT", "direction": [1,0], "offsetPosition": [103,20]} + {"name": "_INPUT1", "direction": [-1,0], "offsetPosition": {"left": -3, "top": 2 }}, + {"name": "_INPUT2", "direction": [-1,0], "offsetPosition": {"left": -3, "top": 37 }}, + {"name": "_OUTPUT", "direction": [1,0], "offsetPosition": {"left": 103, "top": 20 }} ] } }, @@ -54,10 +54,10 @@ var demoLanguage = { "icon": "http://dev.tarpipe.com/img/photobucket.png", "image": "../images/bubble.png", "terminals": [ - {"direction": [-1,-1], "offsetPosition": [-10,-10], "name": "tl"}, - {"direction": [1,-1], "offsetPosition": [25,-10], "name": "tr"}, - {"direction": [-1,1], "offsetPosition": [-10,25], "name": "bl"}, - {"direction": [1,1], "offsetPosition": [25,25], "name": "br"} + {"direction": [-1,-1], "offsetPosition": {"left": -10, "top": -10 }, "name": "tl"}, + {"direction": [1,-1], "offsetPosition": {"left": 25, "top": -10 }, "name": "tr"}, + {"direction": [-1,1], "offsetPosition": {"left": -10, "top": 25 }, "name": "bl"}, + {"direction": [1,1], "offsetPosition": {"left": 25, "top": 25 }, "name": "br"} ] } }, @@ -104,8 +104,8 @@ var demoLanguage = { ], "terminals": [ - {"name": "SOURCES", "direction": [0,-1], "offsetPosition": [100,-15]}, - {"name": "FOLLOWUPS", "direction": [0,1], "offsetPosition": {left: 100, bottom: -15}} + {"name": "SOURCES", "direction": [0,-1], "offsetPosition": {"left": 100, "top": -15 }}, + {"name": "FOLLOWUPS", "direction": [0,1], "offsetPosition": {"left": 100, "bottom": -15}} ] } } examples/WiringEditor/demo.js @@ -14,26 +14,117 @@ <style> h1 { margin: 20px; - font-size: 14pt; + font-size: 18pt; font-weight: bold; } + +#headbar { + background-image: url(../../res/logo-wireit.jpg); + height: 223px; + margin: 0; + padding: 0; +} + +#navigation { + position: absolute; + margin: 6px 0 0 380px; +} + +#navigation li { + margin: 0; + display: inline; + margin-right: 30px; +} + +#navigation li a { + color: white; + text-decoration: none; + font-size: 14px; +} + +#navigation li a:hover { + color: #cccc33; + text-decoration: underline; +} + + + #mainBox { -background-color:#EEEEFF; -border:1px solid #9999FF; -margin:50px; -padding:10px; + margin: 10px 50px; + padding: 10px; + position: relative; +} + +#toolbar { + left:400px; + position:absolute; + top:31px; } div.inputEx-Group.WireIt-Container-Group { margin-left: 135px; } + +#languageList { + height: 300px; + overflow-y: scroll; +} + +#languageList div.language { + width: 100%; + font-size: 16pt; + cursor: pointer; +} + +#languageList div.language span.languageName { + text-align: left; + font-size: 16pt; + color: #666666; +} + +#languageList div.language span.wiringsCount { + text-align: right; + font-size: 11pt; + color: #AAAAAA; +} + +#languageList div.language:hover { + background-color: white; +} + +#languageList div.language a { + color:blue; + font-size:14px; + position:absolute; + right:50px; +} + </style> </head> <body class='yui-skin-sam'> + + <div id='headbar'> + + <ul id="navigation"> + + <li><a href="http://javascript.neyric.com/wireit">Home</a></li> + <li><a href="http://github.com/neyric/wireit/">GitHub[Git]</a></li> + <li><a href="http://neyric.lighthouseapp.com/projects/25048-wireit/tickets?q=all">Issues</a></li> + <li><a href="doc/index.html">Documentation</a></li> + <li><a href="http://javascript.neyric.com/blog/category/wireit/">Blog</a> + <a href="http://javascript.neyric.com/blog/feed/"><img src="../../doc/rss.png" border="0"/></a></li> + <li><a href="http://groups.google.com/group/wireit/">Forums</a></li> + </ul> + + </div> + <div id='mainBox'> <h1>Language Builder</h1> + + <div id='toolbar'></div> + <div id='formContainer'></div> </div> @@ -44,6 +135,9 @@ div.inputEx-Group.WireIt-Container-Group { <script type='text/javascript' src='../../lib/yui/button/button-min.js'></script> <script type='text/javascript' src='../../lib/yui/calendar/calendar-min.js'></script> + +<script type='text/javascript' src='../../lib/yui-rpc.js'></script> +  <script src='../../lib/inputex/js/inputex.js' type='text/javascript'></script> <script src='../../lib/inputex/js/Visus.js' type='text/javascript'></script> @@ -51,7 +145,6 @@ div.inputEx-Group.WireIt-Container-Group { <script src='../../lib/inputex/js/fields/StringField.js' type='text/javascript'></script> <script src='../../lib/inputex/js/fields/RadioField.js' type='text/javascript'></script> <script src='../../lib/inputex/js/fields/CombineField.js' type='text/javascript'></script> - <script src='../../lib/inputex/js/Group.js' type='text/javascript'></script> <script src='../../lib/inputex/js/Form.js' type='text/javascript'></script> <script src='../../lib/inputex/js/fields/CheckBox.js' type='text/javascript'></script> @@ -61,7 +154,6 @@ div.inputEx-Group.WireIt-Container-Group { <script src='../../lib/inputex/js/fields/PasswordField.js' type='text/javascript'></script> <script src='../../lib/inputex/js/fields/Textarea.js' type='text/javascript'></script> <script src='../../lib/inputex/js/fields/UrlField.js' type='text/javascript'></script> - <script src='../../lib/inputex/js/fields/IntegerField.js' type='text/javascript'></script> <script src='../../lib/inputex/js/fields/NumberField.js' type='text/javascript'></script> <script src='../../lib/inputex/js/fields/ListField.js' type='text/javascript'></script> @@ -71,364 +163,17 @@ div.inputEx-Group.WireIt-Container-Group { <script src='../../lib/inputex/js/fields/PairField.js' type='text/javascript'></script> <script src='../../lib/inputex/js/fields/InPlaceEdit.js' type='text/javascript'></script> <script src='../../lib/inputex/js/fields/SliderField.js' type='text/javascript'></script> - <script src='../../lib/inputex/js/fields/TimeField.js' type='text/javascript'></script> <script src='../../lib/inputex/js/fields/DateField.js' type='text/javascript'></script> <script src='../../lib/inputex/js/fields/DatePickerField.js' type='text/javascript'></script> <script src='../../lib/inputex/js/fields/DateTimeField.js' type='text/javascript'></script> -<script src='../../lib/inputex/js/ext/UpperCaseField/UpperCaseField.js' type='text/javascript'></script> <script src='../../lib/inputex/js/ext/VectorField/VectorField.js' type='text/javascript'></script> <script src='../../lib/inputex/js/fields/TypeField.js' type='text/javascript'></script> - -<script src='../logicGates/logicGates.js' type='text/javascript'></script> -<script src='../WiringEditor/demo.js' type='text/javascript'></script> - -<script> - -YAHOO.inputEx.spacerUrl = "../../lib/inputex/images/space.gif"; - -var WireIt = {}; -WireIt.Builder = { - - form: null, - - init: function() { - try { - formDef.inputParams.parentEl = 'formContainer'; - this.form = inputEx(formDef); - //this.form.setValue(demoLanguage); - this.form.setValue(logicGatesLang); - } catch(ex) { - console.log(ex); - } - }, - - generateWiringEditor: function() { - var html = [ - "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">", - "<html>", - "<head>", - "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>", - "<title>WireIt - WiringEditor</title>", - "", - "", - "<link rel='stylesheet' type='text/css' href='../../lib/yui/reset-fonts-grids/reset-fonts-grids.css' />", - "<link rel='stylesheet' type='text/css' href='../../lib/yui/assets/skins/sam/skin.css' />", - "", - "", - "<link type='text/css' rel='stylesheet' href='../../lib/inputex/css/inputEx.css' />", - "", - "", - "<link rel='stylesheet' type='text/css' href='../../css/WireIt.css' />", - "<link rel='stylesheet' type='text/css' href='../../css/WireItEditor.css' />", - "", - "", - "<scr"+"ipt type='text/javascript' src='../../lib/yui/utilities/utilities.js'></scr"+"ipt>", - "<scr"+"ipt type='text/javascript' src='../../lib/yui/resize/resize-min.js'></scr"+"ipt>", - "<scr"+"ipt type='text/javascript' src='../../lib/yui/layout/layout-min.js'></scr"+"ipt>", - "<scr"+"ipt type='text/javascript' src='../../lib/yui/container/container-min.js'></scr"+"ipt>", - "<scr"+"ipt type='text/javascript' src='../../lib/yui/json/json-min.js'></scr"+"ipt>", - "<scr"+"ipt type='text/javascript' src='../../lib/yui/button/button-min.js'></scr"+"ipt>", - "", - "", - "<scr"+"ipt type='text/javascript' src='../../lib/yui-rpc.js'></scr"+"ipt>", - "", - "", - "<scr"+"ipt src='../../lib/inputex/js/inputex.js' type='text/javascript'></scr"+"ipt>", - "<scr"+"ipt src='../../lib/inputex/js/Field.js' type='text/javascript'></scr"+"ipt>", - "<scr"+"ipt type='text/javascript' src='../../js/util/inputex/WirableField-beta.js'></scr"+"ipt>", - "<scr"+"ipt src='../../lib/inputex/js/Group.js' type='text/javascript'></scr"+"ipt>", - "<scr"+"ipt src='../../lib/inputex/js/Visus.js' type='text/javascript'></scr"+"ipt>", - "<scr"+"ipt src='../../lib/inputex/js/fields/StringField.js' type='text/javascript'></scr"+"ipt>", - "<scr"+"ipt src='../../lib/inputex/js/fields/Textarea.js' type='text/javascript'></scr"+"ipt>", - "<scr"+"ipt src='../../lib/inputex/js/fields/SelectField.js' type='text/javascript'></scr"+"ipt>", - "<scr"+"ipt src='../../lib/inputex/js/fields/EmailField.js' type='text/javascript'></scr"+"ipt>", - "<scr"+"ipt src='../../lib/inputex/js/fields/UrlField.js' type='text/javascript'></scr"+"ipt>", - "<scr"+"ipt src='../../lib/inputex/js/fields/ListField.js' type='text/javascript'></scr"+"ipt>", - "<scr"+"ipt src='../../lib/inputex/js/fields/CheckBox.js' type='text/javascript'></scr"+"ipt>", - "<scr"+"ipt src='../../lib/inputex/js/fields/ColorField.js' type='text/javascript'></scr"+"ipt>", - "<scr"+"ipt src='../../lib/inputex/js/fields/InPlaceEdit.js' type='text/javascript'></scr"+"ipt>", - "<scr"+"ipt src='../../lib/inputex/js/fields/TypeField.js' type='text/javascript'></scr"+"ipt>", - "", - "", - "", - "<scr"+"ipt type='text/javascript' src='../../js/WireIt.js'></scr"+"ipt>", - "<scr"+"ipt type='text/javascript' src='../../js/CanvasElement.js'></scr"+"ipt>", - "<scr"+"ipt type='text/javascript' src='../../js/Wire.js'></scr"+"ipt>", - "<scr"+"ipt type='text/javascript' src='../../js/Terminal.js'></scr"+"ipt>", - "<scr"+"ipt type='text/javascript' src='../../js/util/DD.js'></scr"+"ipt>", - "<scr"+"ipt type='text/javascript' src='../../js/util/DDResize.js'></scr"+"ipt>", - "<scr"+"ipt type='text/javascript' src='../../js/Container.js'></scr"+"ipt>", - "<scr"+"ipt type='text/javascript' src='../../js/Layer.js'></scr"+"ipt>", - "<scr"+"ipt type='text/javascript' src='../../js/util/inputex/FormContainer-beta.js'></scr"+"ipt>", - "<scr"+"ipt type='text/javascript' src='../../js/ImageContainer.js'></scr"+"ipt>", - "<scr"+"ipt type='text/javascript' src='../../js/LayerMap.js'></scr"+"ipt>", - "<scr"+"ipt type='text/javascript' src='../../js/WiringEditor.js'></scr"+"ipt>", - "<scr"+"ipt>", - "// InputEx needs a correct path to this image", - "inputEx.spacerUrl = '/inputex/trunk/images/space.gif';", - - "var myLanguage = "+YAHOO.lang.JSON.stringify(this.form.getValue())+";", - - "YAHOO.util.Event.onDOMReady( function() {", - " new WireIt.WiringEditor(myLanguage); ", - "});", - "</scr"+"ipt>", - "</head>", - - "<body class='yui-skin-sam'>", - - " <div id='top'>", - " <div class='logo'>WiringEditor</a></div>", - " <div id='toolbar'></div>", - " <div class='topright'>", - " <span>Hello there !</span> | ", - " <a href='../..'>back to WireIt</a>", - " </div>", - " </div>", - " <div id='left'>", - " </div>", - " <div id='right'>", - " <h2>Properties</h2>", - " <div id='propertiesForm'></div>", - " <h2>Minimap</h2>", - " <div id='layerMap'></div>", - " </div>", - - " <div id='center'>", - " </div>", - - " <div id='helpPanel'>", - " <div class='hd'>Some help here</div>", - " <div class='bd'>", - " You asked for some help ?", - " Hello !", - " </div>", - " </div>", - "</body>", - "</html>" - ]; - - // Center popup - var Posx = screen.width /2; - var Posy = screen.height /2; - Posx -= (this.windowWidth/2); - Posy -= (this.windowHeight/2); - - var formPage = window.open("",'InputExForm','left='+Posx+',top='+Posy+ - ',width=850,height=600,toolbar=no,scrollbars,resizable=yes'); - - formPage.document.write(html.join("\n")); - formPage.document.close(); - } - -}; -YAHOO.util.Event.onDOMReady(WireIt.Builder.init, WireIt.Builder, true); - + +<script src='../../js/wireit.js' type='text/javascript'></script> +<script>YAHOO.inputEx.spacerUrl = "../../lib/inputex/images/space.gif";</script> +<script src='builder.js' type='text/javascript'></script> -var formDef = { - "type": "form", - "inputParams": { - - "buttons": [ - {"type":"button", "value": "Create !", "onClick": (function() { WireIt.Builder.generateWiringEditor(); }) } - ], - - "fields" : [ - { - "type": "string", - "inputParams": { - "label": "Language Name", - "name": "languageName" - } - }, - { - "type": "string", - "inputParams": { - "label": "SMD url", - "name": "smdUrl", - "value": "../../backend/php/WiringEditor.smd" - } - }, - { - "type": "list", - "inputParams": { - "name": "propertiesFields", - "label": "Properties", - "elementType": { - "type": "type", - "inputParams": { - } - } - } - }, - { - "type" : "list", - "inputParams" : { - "label" : "Modules", - "name" : "modules", - "listAddLabel": "Add a new module", - "elementType" : { - "type" : "group", - "inputParams" : { - "legend" : "", - "fields" : [ - { - "type" : "string", - "inputParams" : { - "label" : "Name", - "name" : "name", - "typeInvite" : "name", - "value" : "" - } - }, - { - "type" : "group", - "inputParams" : { - "className": "inputEx-Group WireIt-Container-Group", - "legend" : "Container options", - "collapsible": true, - "collapsed": true, - "name": "container", - "fields" : [ - { - "type" : "select", - "inputParams" : { - "label" : "Type", - "name" : "xtype", - "selectValues" : [ - "WireIt.Container", - "WireIt.ImageContainer", - "WireIt.FormContainer" - ], - "selectOptions" : [ - - ], - "value" : "WireIt.Container" - } - }, - { - "type" : "string", - "inputParams" : { - "label" : "Image", - "name" : "image", - "value" : "" - } - }, - { - "type" : "url", - "inputParams" : { - "label" : "Icon", - "name" : "icon" - } - }, - { - "type" : "list", - "inputParams" : { - "label" : "Fields", - "name" : "fields", - "elementType": { - "type": "type", - "inputParams": { - } - } - } - }, - { - "type" : "list", - "inputParams" : { - "label" : "Terminals", - "name" : "terminals", - "elementType" : { - "type" : "group", - "inputParams" : { - "legend" : "Terminal", - "collapsible": true, - "fields" : [ - { - "type" : "string", - "inputParams" : { - "label" : "Name", - "name" : "name" - } - }, - { - "type" : "vector", - "inputParams" : { - "label" : "Direction", - "name" : "direction" - } - }, - { - "type" : "vector", - "inputParams" : { - "label" : "Position", - "name" : "offsetPosition" - } - }, - { - "type": "group", - "inputParams": { - "name": "ddConfig", - "fields": [ - { - "type": "string", - "inputParams": { - "name": "type", - "label": "Terminal type" - } - }, - { - "type": "list", - "inputParams": { - "name": "allowedTypes", - "label": "Allowed types", - "elementType": { - "type":"string", - "inputParams":{} - } - } - }, - { - "type": "integer", - "inputParams": { - "name": "nMaxWires", - "label": "Maximum wire number" - } - } - ] - } - } - ], - "value" : { - "name" : "", - "direction" : ["",""], - "offsetPosition" : ["",""] - } - } - }, - "value" : [] - } - } - ], - "value" : { - "xtype" : "WireIt.Container", - "image" : "", - "terminals" : [] - } - } - } - ] - } - }, - "value" : [] - } - } - ] - } -}; - -</script> </body> </html> \ No newline at end of file examples/builder/index.html @@ -7,8 +7,8 @@ var jsBox = { languageName: "jsBox", smdUrl: '../../backend/php/WiringEditor.smd', propertiesFields: [ - {"type": "string", inputParams: {"name": "name", label: "Title", wirable: false, typeInvite: "Enter a title" } }, - {"type": "text", inputParams: {"name": "description", label: "Description", wirable: false, cols: 30} } + {"type": "string", inputParams: {"name": "name", label: "Title", typeInvite: "Enter a title" } }, + {"type": "text", inputParams: {"name": "description", label: "Description", cols: 30} } ], modules: [ { @@ -59,7 +59,7 @@ var jsBox = { {"type": "string", "inputParams": {"label": "name", "name": "name", "wirable": false}} ], "terminals": [ - {"name": "in", "direction": [0,-1], "offsetPosition": [82,-15], "ddConfig": { + {"name": "in", "direction": [0,-1], "offsetPosition": {"left": 82, "top": -15 }, "ddConfig": { "type": "input", "allowedTypes": ["output"] }, @@ -234,7 +234,7 @@ YAHOO.extend(jsBox.Container, WireIt.Container, { } // Input terminals : - var sParamList = (this.textarea.value).match(/^[ ]*function[ ]*$(.*)$[ ]*{/)[1]; + var sParamList = (this.textarea.value).match((/^[ ]*function[ ]*$(.*)$[ ]*\{/))[1]; var params = sParamList.split(','); var nParams = (sParamList=="") ? 0 : params.length; examples/jsBox/jsBox.js @@ -19,9 +19,9 @@ var logicGatesLang = { "xtype":"WireIt.ImageContainer", "image": "../logicGates/images/gate_and.png", "terminals": [ - {"name": "_INPUT1", "direction": [-1,0], "offsetPosition": [-3,2],"ddConfig": {"type": "input","allowedTypes": ["output"]}, "nMaxWires": 1 }, - {"name": "_INPUT2", "direction": [-1,0], "offsetPosition": [-3,37],"ddConfig": {"type": "input","allowedTypes": ["output"]}}, - {"name": "_OUTPUT", "direction": [1,0], "offsetPosition": [103,20],"ddConfig": {"type": "output","allowedTypes": ["input"]}} + {"name": "_INPUT1", "direction": [-1,0], "offsetPosition": {"left": -3, "top": 2 },"ddConfig": {"type": "input","allowedTypes": ["output"]}, "nMaxWires": 1 }, + {"name": "_INPUT2", "direction": [-1,0], "offsetPosition": {"left": -3, "top": 37 },"ddConfig": {"type": "input","allowedTypes": ["output"]}}, + {"name": "_OUTPUT", "direction": [1,0], "offsetPosition": {"left": 103, "top": 20 },"ddConfig": {"type": "output","allowedTypes": ["input"]}} ] } @@ -34,9 +34,9 @@ var logicGatesLang = { "xtype":"WireIt.ImageContainer", "image": "../logicGates/images/gate_or.png", "terminals": [ - {"name": "_INPUT1", "direction": [-1,0], "offsetPosition": [-3,2],"ddConfig": {"type": "input","allowedTypes": ["output"]}, "nMaxWires": 1 }, - {"name": "_INPUT2", "direction": [-1,0], "offsetPosition": [-3,37],"ddConfig": {"type": "input","allowedTypes": ["output"]}}, - {"name": "_OUTPUT", "direction": [1,0], "offsetPosition": [103,20],"ddConfig": {"type": "output","allowedTypes": ["input"]}} + {"name": "_INPUT1", "direction": [-1,0], "offsetPosition": {"left": -3, "top": 2 },"ddConfig": {"type": "input","allowedTypes": ["output"]}, "nMaxWires": 1 }, + {"name": "_INPUT2", "direction": [-1,0], "offsetPosition": {"left": -3, "top": 37 },"ddConfig": {"type": "input","allowedTypes": ["output"]}}, + {"name": "_OUTPUT", "direction": [1,0], "offsetPosition": {"left": 103, "top": 20 },"ddConfig": {"type": "output","allowedTypes": ["input"]}} ] } }, @@ -47,8 +47,8 @@ var logicGatesLang = { "xtype":"WireIt.ImageContainer", "image": "../logicGates/images/gate_not.png", "terminals": [ - {"name": "_INPUT", "direction": [-1,0], "offsetPosition": [-12,23],"ddConfig": {"type": "input","allowedTypes": ["output"]}, "nMaxWires": 1 }, - {"name": "_OUTPUT", "direction": [1,0], "offsetPosition": [117,23],"ddConfig": {"type": "output","allowedTypes": ["input"]}} + {"name": "_INPUT", "direction": [-1,0], "offsetPosition": {"left": -12, "top": 23 },"ddConfig": {"type": "input","allowedTypes": ["output"]}, "nMaxWires": 1 }, + {"name": "_OUTPUT", "direction": [1,0], "offsetPosition": {"left": 117, "top": 23 },"ddConfig": {"type": "output","allowedTypes": ["input"]}} ] } }, @@ -59,9 +59,9 @@ var logicGatesLang = { "xtype":"WireIt.ImageContainer", "image": "../logicGates/images/gate_nand.png", "terminals": [ - {"name": "_INPUT1", "direction": [-1,0], "offsetPosition": [-3,2],"ddConfig": {"type": "input","allowedTypes": ["output"]}, "nMaxWires": 1 }, - {"name": "_INPUT2", "direction": [-1,0], "offsetPosition": [-3,37],"ddConfig": {"type": "input","allowedTypes": ["output"]}, "nMaxWires": 1 }, - {"name": "_OUTPUT", "direction": [1,0], "offsetPosition": [103,20], "ddConfig": {"type": "output","allowedTypes": ["input"]}} + {"name": "_INPUT1", "direction": [-1,0], "offsetPosition": {"left": -3, "top": 2 },"ddConfig": {"type": "input","allowedTypes": ["output"]}, "nMaxWires": 1 }, + {"name": "_INPUT2", "direction": [-1,0], "offsetPosition": {"left": -3, "top": 37 },"ddConfig": {"type": "input","allowedTypes": ["output"]}, "nMaxWires": 1 }, + {"name": "_OUTPUT", "direction": [1,0], "offsetPosition": {"left": 103, "top": 20 }, "ddConfig": {"type": "output","allowedTypes": ["input"]}} ] } }, @@ -72,9 +72,9 @@ var logicGatesLang = { "xtype":"WireIt.ImageContainer", "image": "../logicGates/images/gate_xor.png", "terminals": [ - {"name": "_INPUT1", "direction": [-1,0], "offsetPosition": [-3,2],"ddConfig": {"type": "input","allowedTypes": ["output"]}, "nMaxWires": 1 }, - {"name": "_INPUT2", "direction": [-1,0], "offsetPosition": [-3,37],"ddConfig": {"type": "input","allowedTypes": ["output"]}, "nMaxWires": 1 }, - {"name": "_OUTPUT", "direction": [1,0], "offsetPosition": [103,20],"ddConfig": {"type": "output","allowedTypes": ["input"]}} + {"name": "_INPUT1", "direction": [-1,0], "offsetPosition": {"left": -3, "top": 2 },"ddConfig": {"type": "input","allowedTypes": ["output"]}, "nMaxWires": 1 }, + {"name": "_INPUT2", "direction": [-1,0], "offsetPosition": {"left": -3, "top": 37 },"ddConfig": {"type": "input","allowedTypes": ["output"]}, "nMaxWires": 1 }, + {"name": "_OUTPUT", "direction": [1,0], "offsetPosition": {"left": 103, "top": 20 },"ddConfig": {"type": "output","allowedTypes": ["input"]}} ] } }, @@ -85,7 +85,7 @@ var logicGatesLang = { "xtype":"WireIt.ImageContainer", "image": "../logicGates/images/A.png", "terminals": [ - {"name": "_OUTPUT", "direction": [1,0], "offsetPosition": [94,18],"ddConfig": {"type": "output","allowedTypes": ["input"]}} + {"name": "_OUTPUT", "direction": [1,0], "offsetPosition": {"left": 94, "top": 18 },"ddConfig": {"type": "output","allowedTypes": ["input"]}} ] } }, @@ -96,7 +96,7 @@ var logicGatesLang = { "xtype":"WireIt.ImageContainer", "image": "../logicGates/images/B.png", "terminals": [ - {"name": "_OUTPUT", "direction": [1,0], "offsetPosition": [94,18],"ddConfig": {"type": "output","allowedTypes": ["input"]}} + {"name": "_OUTPUT", "direction": [1,0], "offsetPosition": {"left": 94, "top": 18 },"ddConfig": {"type": "output","allowedTypes": ["input"]}} ] } }, @@ -107,7 +107,7 @@ var logicGatesLang = { "xtype":"WireIt.ImageContainer", "image": "../logicGates/images/C.png", "terminals": [ - {"name": "_OUTPUT", "direction": [1,0], "offsetPosition": [94,18],"ddConfig": {"type": "output","allowedTypes": ["input"]}} + {"name": "_OUTPUT", "direction": [1,0], "offsetPosition": {"left": 94, "top": 18 },"ddConfig": {"type": "output","allowedTypes": ["input"]}} ] } } examples/logicGates/logicGates.js @@ -574,7 +574,7 @@ WireIt.Terminal.prototype = { // New version: {top: 32, left: 23} else if( lang.isObject(pos) ) { for(var key in pos) { - if(pos.hasOwnProperty(key)){ + if(pos.hasOwnProperty(key) && pos[key] != ""){ this.el.style[key] = pos[key]+"px"; } } js/Terminal.js 2abf4a49185fea03190abdc0db055240420a8555 Eric Abouaf eric.abouaf@gmail.com http://github.com/LeifW/wireit/commit/300703d5f81f58ad039d6e2851de163859924275 300703d5f81f58ad039d6e2851de163859924275

2009-03-03T10:57:26-08:00

WiringEditor Builder: now comes with a backend ! 51c263f228b5f4eb04772a9087ffa483af59c9a8 Eric Abouaf eric.abouaf@gmail.com