Releasing: 1.1.1

meenie · Jul 16, 2014 · 781af90 · 781af90
1 parent 977e5d8
commit 781af90
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 21 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "BandJS",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "main": "dist/band.min.js",
   "ignore": [
     "**/.*",

diff --git a/dist/band.js b/dist/band.js
@@ -94,44 +94,44 @@ function Conductor(tuning, rhythm) {
             throw new Error('JSON is required for this method to work.');
         }
         // Need to have at least instruments and notes
-        if (typeof json['instruments'] === 'undefined') {
+        if (typeof json.instruments === 'undefined') {
             throw new Error('You must define at least one instrument');
         }
-        if (typeof json['notes'] === 'undefined') {
+        if (typeof json.notes === 'undefined') {
             throw new Error('You must define notes for each instrument');
         }
 
         // Shall we set a time signature?
-        if (typeof json['timeSignature'] !== 'undefined') {
-            conductor.setTimeSignature(json['timeSignature'][0], json['timeSignature'][1]);
+        if (typeof json.timeSignature !== 'undefined') {
+            conductor.setTimeSignature(json.timeSignature[0], json.timeSignature[1]);
         }
 
         // Maybe some tempo?
-        if (typeof json['tempo'] !== 'undefined') {
-            conductor.setTempo(json['tempo']);
+        if (typeof json.tempo !== 'undefined') {
+            conductor.setTempo(json.tempo);
         }
 
         // Lets create some instruments
         var instrumentList = {};
-        for (var instrument in json['instruments']) {
-            if (! json['instruments'].hasOwnProperty(instrument)) {
+        for (var instrument in json.instruments) {
+            if (! json.instruments.hasOwnProperty(instrument)) {
                 continue;
             }
 
             instrumentList[instrument] = conductor.createInstrument(
-                json['instruments'][instrument].name,
-                json['instruments'][instrument].pack
+                json.instruments[instrument].name,
+                json.instruments[instrument].pack
             );
         }
 
         // Now lets add in each of the notes
-        for (var inst in json['notes']) {
-            if (! json['notes'].hasOwnProperty(inst)) {
+        for (var inst in json.notes) {
+            if (! json.notes.hasOwnProperty(inst)) {
                 continue;
             }
             var index = -1;
-            while (++ index < json['notes'][inst].length) {
-                var note = json['notes'][inst][index];
+            while (++ index < json.notes[inst].length) {
+                var note = json.notes[inst][index];
                 // Use shorthand if it's a string
                 if (typeof note === 'string') {
                     var noteParts = note.split('|');
@@ -305,7 +305,7 @@ function Conductor(tuning, rhythm) {
 
 Conductor.loadPack = function(type, name, data) {
     if (['tuning', 'rhythm', 'instrument'].indexOf(type) === -1) {
-        throw new Error(type = ' is not a valid Pack Type.');
+        throw new Error(type + ' is not a valid Pack Type.');
     }
 
     if (typeof packs[type][name] !== 'undefined') {
@@ -529,10 +529,14 @@ function Instrument(name, pack, conductor) {
      * @returns {copy}
      */
     function clone(obj) {
-        if (null == obj || "object" != typeof obj) return obj;
+        if (null === obj || "object" != typeof obj) {
+            return obj;
+        }
         var copy = obj.constructor();
         for (var attr in obj) {
-            if (obj.hasOwnProperty(attr)) copy[attr] = obj[attr];
+            if (obj.hasOwnProperty(attr)) {
+                copy[attr] = obj[attr];
+            }
         }
 
         return copy;