Bugfix multiple connectors

FPGAwars · Feb 23, 2016 · 8b3126a · 8b3126a
1 parent f137d38
commit 8b3126a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 19 deletions.
diff --git a/icestudio/flowchart/flowchart_viewmodel.js b/icestudio/flowchart/flowchart_viewmodel.js
@@ -519,10 +519,12 @@ var flowchart = {
 			}
 
 			for (var i = 0; i < connectionsViewModel.length; i++) {
-				if ((connectionsViewModel[i].data.dest.nodeID == endNode.data.id &&
-				    connectionsViewModel[i].data.dest.connectorIndex == endConnectorIndex) ||
-					(connectionsViewModel[i].data.dest.nodeID == startNode.data.id &&
-				    connectionsViewModel[i].data.dest.connectorIndex == startConnectorIndex)) {
+				if ((endConnectorType == 'input' &&
+					 connectionsViewModel[i].data.dest.nodeID == endNode.data.id &&
+				     connectionsViewModel[i].data.dest.connectorIndex == endConnectorIndex) ||
+					(startConnectorType == 'input' &&
+	 				 connectionsViewModel[i].data.dest.nodeID == startNode.data.id &&
+	 			     connectionsViewModel[i].data.dest.connectorIndex == startConnectorIndex)) {
 					throw new Error("Multiple input wires not allowed.")
 				}
 			}

diff --git a/icestudio/style/alertify.core.css b/icestudio/style/alertify.core.css
@@ -1,25 +1,25 @@
 .alertify,
 .alertify-show,
 .alertify-log {
-	-webkit-transition: all 500ms cubic-bezier(0.175, 0.885, 0.320, 1.275);
-	   -moz-transition: all 500ms cubic-bezier(0.175, 0.885, 0.320, 1.275);
-	    -ms-transition: all 500ms cubic-bezier(0.175, 0.885, 0.320, 1.275);
-	     -o-transition: all 500ms cubic-bezier(0.175, 0.885, 0.320, 1.275);
-	        transition: all 500ms cubic-bezier(0.175, 0.885, 0.320, 1.275); /* easeOutBack */
+	-webkit-transition: all 500ms cubic-bezier(0.175, 0.0, 0.320, 1.275);
+	   -moz-transition: all 500ms cubic-bezier(0.175, 0.0, 0.320, 1.275);
+	    -ms-transition: all 500ms cubic-bezier(0.175, 0.0, 0.320, 1.275);
+	     -o-transition: all 500ms cubic-bezier(0.175, 0.0, 0.320, 1.275);
+	        transition: all 500ms cubic-bezier(0.175, 0.0, 0.320, 1.275); /* easeOutBack */
 }
 .alertify-hide {
-	-webkit-transition: all 250ms cubic-bezier(0.600, -0.280, 0.735, 0.045);
-	   -moz-transition: all 250ms cubic-bezier(0.600, -0.280, 0.735, 0.045);
-	    -ms-transition: all 250ms cubic-bezier(0.600, -0.280, 0.735, 0.045);
-	     -o-transition: all 250ms cubic-bezier(0.600, -0.280, 0.735, 0.045);
-	        transition: all 250ms cubic-bezier(0.600, -0.280, 0.735, 0.045); /* easeInBack */
+	-webkit-transition: all 250ms cubic-bezier(0.600, 0.0, 0.735, 0.045);
+	   -moz-transition: all 250ms cubic-bezier(0.600, 0.0, 0.735, 0.045);
+	    -ms-transition: all 250ms cubic-bezier(0.600, 0.0, 0.735, 0.045);
+	     -o-transition: all 250ms cubic-bezier(0.600, 0.0, 0.735, 0.045);
+	        transition: all 250ms cubic-bezier(0.600, 0.0, 0.735, 0.045); /* easeInBack */
 }
 .alertify-log-hide {
-	-webkit-transition: all 500ms cubic-bezier(0.600, -0.280, 0.735, 0.045);
-	   -moz-transition: all 500ms cubic-bezier(0.600, -0.280, 0.735, 0.045);
-	    -ms-transition: all 500ms cubic-bezier(0.600, -0.280, 0.735, 0.045);
-	     -o-transition: all 500ms cubic-bezier(0.600, -0.280, 0.735, 0.045);
-	        transition: all 500ms cubic-bezier(0.600, -0.280, 0.735, 0.045); /* easeInBack */
+	-webkit-transition: all 500ms cubic-bezier(0.600, 0.0, 0.735, 0.045);
+	   -moz-transition: all 500ms cubic-bezier(0.600, 0.0, 0.735, 0.045);
+	    -ms-transition: all 500ms cubic-bezier(0.600, 0.0, 0.735, 0.045);
+	     -o-transition: all 500ms cubic-bezier(0.600, 0.0, 0.735, 0.045);
+	        transition: all 500ms cubic-bezier(0.600, 0.0, 0.735, 0.045); /* easeInBack */
 }
 .alertify-cover {
 	position: fixed; z-index: 99999;