Fix issue with an empty name in custom notation

# Conflicts: # javascripts/jtab.js
kurokky · Apr 8, 2018 · a781827 · a781827
1 parent fa1a352
commit a781827
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/javascripts/jtab.js b/javascripts/jtab.js
@@ -410,7 +410,7 @@ function jtabChord (token) {
     this.chordName = parts[0];
     this.cagedPos = parts[1];
   } else if (this.isCustom){
-    var parts = this.fullChordName.match( /\[(.+?)\]/ );
+    var parts = this.fullChordName.match( /\[(.*?)\]/ );
     if(parts){
       this.chordName = parts[1];
     } else {
@@ -447,7 +447,7 @@ jtabChord.prototype.setCustomChordArray = function(){
 };
 
 jtabChord.prototype.parseCustomChordArrayFromToken = function() {
-  notes = this.fullChordName.replace(/(\%|\[.+\])/g, '');
+  notes = this.fullChordName.replace(/(\%|\[.*?\])/g, '');
   pairs = notes.split('.');
   if (pairs.length < 6){
     this.isValid = false;

diff --git a/jtab-unittest.html b/jtab-unittest.html
@@ -422,6 +422,16 @@ <h1>jTab - Unit Tests</h1>
 			assertHashEqual( modelChordArray, c.chordArray, "jtabChord('" + token + "') returned incorrect chordArray" );
 		}},
 
+    testCustomChord_Empty_Name: function() {  with(this) {
+      var token = "%0/0.2/2.3/2.1/1.0/0.0/0[]";
+
+      var modelChordArray = [ 0, [0,0],  [2,2],  [3,2],  [1,1],  [0,0],  [0,0]]
+      var c = new jtabChord(token);
+      assert( c.isValid, "jtabChord('" + token + "') should be valid" );
+      assert( c.isCustom, "jtabChord('" + token + "') should be custom chord" );
+      assertHashEqual( modelChordArray, c.chordArray, "jtabChord('" + token + "') returned incorrect chordArray" );
+    }},
+
 
 		testCustomChord_E_fingering: function() {  with(this) {
 		  var token = "%0/0.2/2.3/2.1/1.0/0.0/0[E]";