Got rid of unnessary use strict, added a new file which will contain all relevant neuron type info

rdsilver · rdsilver · commit c018d6a96a39 · 2016-03-24T01:22:49.000-07:00
diff --git a/actionPotential.js b/actionPotential.js
@@ -1,5 +1,3 @@
-'use strict';
-
 class ActionPotential {
   constructor(sourceNeuron, destinyNeuron, skew, id, charge, neuronSize) {
     this.sourceNeuron = sourceNeuron;
diff --git a/characterNeuron.js b/characterNeuron.js
@@ -1,5 +1,3 @@
-'use strict';
-
 class CharacterNeuron extends Neuron {
   constructor(x, y, neuronSize, actlvl) {
     super(x, y, neuronSize, actlvl);
diff --git a/exampleNeuronNets.js b/exampleNeuronNets.js
diff --git a/index.html b/index.html
@@ -14,6 +14,7 @@
       <script src='exampleNeuronNets.js'></script>
       <script src='sketch.js'></script>
       <script src='userDomInteractions.js'></script>
+      <script src='neuronInfo.js'></script>
     <link rel='shortcut icon' type='image/x-icon' href='favicon.ico' />
     <link rel='stylesheet' type='text/css' href='style.css'>
     <link href='https://fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'>
@@ -22,7 +23,7 @@
 
   <body>
     <div id='control-panel'>
-      <div id='neuron-placement' class='column-left active' data-state='neuronPlacement'>
+      <div id='neuron-placement' class='column-left active grey' data-state='neuronPlacement'>
         <p>Place/Delete Neurons</p>
         Neuron Type:
         <select id='neuronType'>
@@ -52,18 +53,18 @@
         </span>
       </div>
 
-      <div id='connection-placement' class='column-center' data-state='connectionPlacement'>
+      <div id='connection-placement' class='column-center grey' data-state='connectionPlacement'>
         <p>Place/Delete Connections</p>
         <input type="radio" name="connection" value="one" checked> One-way connections<br>
           <input type="radio" name="connection" value="two"> Two-way connections
       </div>
 
-      <div id='live-mode' class='column-right' data-state='live'>
+      <div id='live-mode' class='column-right grey' data-state='live'>
         <p>Live Mode</p>
       </div>
     </div>
 
-    <span id='loadExamples'>
+    <span class='grey' id='loadExamples'>
       Load Example:
       <select placeholder='Select Example' id='exampleInput'>
         <option value="" disabled selected>Select Example</option>
diff --git a/jasmine/spec/neuron_spec.js b/jasmine/spec/neuron_spec.js
@@ -1,5 +1,3 @@
-'use strict';
-
 describe('Neuron Class Methods', () => {
 	beforeEach(() => {
 		this.neuron = new Neuron(1, 1, 5, 5);
@@ -46,4 +44,4 @@ describe('Neuron Class Methods', () => {
 		this.neuron.inBoundConnection(this.otherNeuron);
 		expect(this.neuron.inBoundConnections['2 2']).toEqual(this.otherNeuron);
 	});
-});
+});
diff --git a/negativeNeuron.js b/negativeNeuron.js
@@ -1,5 +1,3 @@
-'use strict';
-
 class NegativeNeuron extends Neuron {
   constructor(x, y, neuronSize, actlvl) {
     super(x, y, neuronSize, actlvl);
diff --git a/neuron.js b/neuron.js
@@ -1,5 +1,3 @@
-'use strict';
-
 class Neuron {
   constructor(x, y, neuronSize, actlvl) {
     this.xCoord = x;
diff --git a/neuronInfo.js b/neuronInfo.js
@@ -0,0 +1,5 @@
+// Will hold all neurony info
+var neuronTypes = {
+
+};
+
diff --git a/noteNeuron.js b/noteNeuron.js
@@ -1,13 +1,12 @@
-'use strict';
-
 // Oscillator
 var osc;
 osc = new p5.Oscillator();
 osc.setType('triangle');
-var twelveTones = ['C','C#','D','D#','E','F','F#','G','G#','A','A#','B'];
 osc.start();
 osc.amp(0);
 
+var twelveTones = ['C','C#','D','D#','E','F','F#','G','G#','A','A#','B'];
+
 class NoteNeuron extends Neuron {
   constructor(x, y, neuronSize, actlvl, note) {
     super(x, y, neuronSize, actlvl);
diff --git a/sketch.js b/sketch.js
@@ -1,5 +1,3 @@
-'use strict';
-
 var neuronList = {};
 var actionPotentialList = {};
 var state = 'neuronPlacement';
@@ -133,4 +131,4 @@ function live(x, y) {
 function windowResized() {
   resizeCanvas(window.innerWidth, window.innerHeight - 100);
   clearScreen();
-}
+}
diff --git a/style.css b/style.css
@@ -26,7 +26,6 @@ a:visited {
 }
 
 #control-panel div{
-  background-color: rgb(110, 110, 110);
   box-sizing: border-box;
   border-right: 2px solid black;
   text-align: center;
@@ -68,6 +67,10 @@ a:visited {
   background-color: rgb(200, 200, 200);
 }
 
+.grey {
+  background-color: rgb(110, 110, 110);
+}
+
 .column-left{
   float: left;
   width: 33.33%;
diff --git a/timerNeuron.js b/timerNeuron.js
@@ -1,5 +1,3 @@
-'use strict';
-
 class TimerNeuron extends Neuron {
   constructor(x, y, neuronSize, actlvl, timeInSeconds, maxSteps) {
     super(x, y, neuronSize, actlvl);
diff --git a/userDomInteractions.js b/userDomInteractions.js
@@ -1,5 +1,3 @@
-'use strict';
-
 var prevState;
 var controlPanel = {
   onControlPanelClick: function() {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-'use strict';`
`2`		`-`
`3`	`1`	`class ActionPotential {`
`4`	`2`	`constructor(sourceNeuron, destinyNeuron, skew, id, charge, neuronSize) {`
`5`	`3`	`this.sourceNeuron = sourceNeuron;`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-'use strict';`
`2`		`-`
`3`	`1`	`class CharacterNeuron extends Neuron {`
`4`	`2`	`constructor(x, y, neuronSize, actlvl) {`
`5`	`3`	`super(x, y, neuronSize, actlvl);`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-'use strict';`
`2`		`-`
`3`	`1`	`class NegativeNeuron extends Neuron {`
`4`	`2`	`constructor(x, y, neuronSize, actlvl) {`
`5`	`3`	`super(x, y, neuronSize, actlvl);`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-'use strict';`
`2`		`-`
`3`	`1`	`class Neuron {`
`4`	`2`	`constructor(x, y, neuronSize, actlvl) {`
`5`	`3`	`this.xCoord = x;`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +// Will hold all neurony info
 +var neuronTypes = {
++
 +};
++
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-'use strict';`
`2`		`-`
`3`	`1`	`class TimerNeuron extends Neuron {`
`4`	`2`	`constructor(x, y, neuronSize, actlvl, timeInSeconds, maxSteps) {`
`5`	`3`	`super(x, y, neuronSize, actlvl);`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-'use strict';`
`2`		`-`
`3`	`1`	`var prevState;`
`4`	`2`	`var controlPanel = {`
`5`	`3`	`onControlPanelClick: function() {`