CatalogUtils.expandNumbers(): expand numbers that are separated by slash.

Author: php-coder

src/main/javascript/CatalogUtils.js

@@ -6,11 +6,11 @@ var CatalogUtils = {
 			return input;
 		}
 
-		if (input.indexOf('-') < 0) {
+		if (input.indexOf('-') < 0 && input.indexOf('/') < 0) {
 			return input;
 		}
 
-		if (! /^\s*[0-9]+-[0-9]+(,[ ]*[0-9]+(-[0-9]+)?)*\s*$/.test(input)) {
+		if (! /^\s*[0-9]+[-\/][0-9]+(,[ ]*[0-9]+([-\/][0-9]+)?)*\s*$/.test(input)) {
 			return input;
 		}
 
@@ -27,7 +27,7 @@ var CatalogUtils = {
 
 	/** @private */
 	expandRange: function(range) {
-		var parts = range.split('-');
+		var parts = range.split(/[-\/]/);
 		if (parts.length != 2) {
 			return range;
 		}

src/test/javascript/CatlogUtilsSpec.js

@@ -80,4 +80,12 @@ describe("CatalogUtils.expandNumbers()", function() {
 		expect(CatalogUtils.expandNumbers("4596-8 ")).toEqual("4596,4597,4598");
 	});
 
+	it("should return '1,2,3' for '1/3'", function() {
+		expect(CatalogUtils.expandNumbers("1/3")).toEqual("1,2,3");
+	});
+	
+	it("should return '1,2,3,4,5,6' for '1/3, 4-6'", function() {
+		expect(CatalogUtils.expandNumbers("1/3, 4-6")).toEqual("1,2,3,4,5,6");
+	});
+	
 });