Merge 9fdc6b0 into 50a94dc

src/js/molecules/equation.js

@@ -54,20 +54,24 @@ export default class Equation extends Atom {
             var re = /[a-zA-Z]/g
             const variables = this.currentEquation.match(re)
 
+            //Remove any inputs which are not needed
+            const deleteExtraInputs = () => {
+                this.inputs.forEach( input => {
+                    if( !variables.includes(input.name) ){
+                        this.removeIO('input', input.name, this)
+                        deleteExtraInputs() //This needs to be called recursively to make sure all the inputs are deleted
+                    }
+                })
+            }
+            deleteExtraInputs()
+
             //Add any inputs which are needed
             for (var variable in variables){
                 if(!this.inputs.some(input => input.Name === variables[variable])){
                     this.addIO('input', variables[variable], this, 'number', 1)
                 }
             }
 
-            //Remove any inputs which are not needed
-            for (var input in this.inputs){
-                if( !variables.includes(this.inputs[input].name) ){
-                    this.removeIO('input', this.inputs[input].name, this)
-                }
-            }
-
             if(this.inputs.every(x => x.ready)){
 
                 //Substitute numbers into the string

src/js/prototypes/attachmentpoint.js

@@ -360,12 +360,10 @@ export default class AttachmentPoint {
      */ 
     deleteSelf(){
         //remove any connectors which were attached to this attachment point
-
-        this.connectors.forEach( connector => {
+        var connectorsList = this.connectors //Make a copy of the list so that we can delete elements without having issues with forEach as we remove things from the list
+        connectorsList.forEach( connector => {
             connector.deleteSelf()
-            this.deleteSelf()  //This is a bit of a hack. It calls itself recursively until there are no connectors left because a single call will fail for multiple connectors. Each time one is removed from the list it messes up the forEach...There must be a better way
         })
-
     }
 
     /**

src/js/prototypes/connector.js

@@ -145,6 +145,7 @@ export default class Connector {
 
         //Free up the input to which this was attached
         this.attachmentPoint2.deleteConnector(this)
+        this.attachmentPoint2.setDefault()
     }
 
     /**