Merge pull request #195 from aiannacc/flexible-rating-criteria-parsing

Allow whitespace after rating ranges
aiannacc · Apr 24, 2014 · 7bf6b2f · 7bf6b2f
2 parents 7ee4140 + 8590dcb
commit 7bf6b2f
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/src/ext/utils.js b/src/ext/utils.js
@@ -128,17 +128,14 @@
     GS.parseProRange = function (tablename) {
         var m, range = {};
 
-        if ((m = tablename.match(/^(.* |)(\d+(.\d+)?([kK])?)\+(?!\S)/)) !== null) {
+        if ((m = tablename.match(/^(.* |)(\d+(.\d+)?([kK])?)\+/)) !== null) {
             range.min = GS.parseNum(m[2]);
-        }
-        if ((m = tablename.match(/^(.* |)(\d+(.\d+)?([kK])?)\-(?!\S)/)) !== null) {
-            range.max = GS.parseNum(m[2]);
-        }
-        if ((m = tablename.match(/^(.* |)(\d+(.\d+)?([kK])?)-(\d+(.\d+)?([kK])?)(?!\S)/)) !== null) {
+        } else if ((m = tablename.match(/^(.* |)(\d+(.\d+)?([kK])?)-(\d+(.\d+)?([kK])?)/)) !== null) {
             range.min = GS.parseNum(m[2]);
             range.max = GS.parseNum(m[5]);
-        }
-        if ((m = tablename.match(/^(.* |)\+\/\-(\d+(.\d+)?([kK])?)(?!\S)/)) !== null) {
+        } else if ((m = tablename.match(/^(.* |)(\d+(.\d+)?([kK])?)\-/)) !== null) {
+            range.max = GS.parseNum(m[2]);
+        } else if ((m = tablename.match(/^(.* |)\+\/\-(\d+(.\d+)?([kK])?)/)) !== null) {
             range.difference = GS.parseNum(m[2]);
         }
         return range;