Merge pull request gridstack#370 from krema/master

troolee · troolee · commit 156b8e40cbd6 · 2016-02-29T23:59:28.000-08:00
Allow negative numbers to be passed to parseHeight function
diff --git a/dist/gridstack.js b/dist/gridstack.js
@@ -99,7 +99,7 @@
             var height = val;
             var heightUnit = 'px';
             if (height && _.isString(height)) {
-                var match = height.match(/^([0-9]*\.[0-9]+|[0-9]+)(px|em|rem|vh|vw)?$/);
+                var match = height.match(/^(-[0-9]+\.[0-9]+|[0-9]*\.[0-9]+|-[0-9]+|[0-9]+)(px|em|rem|vh|vw)?$/);
                 if (!match) {
                     throw new Error('Invalid height');
                 }
diff --git a/spec/utils-spec.js b/spec/utils-spec.js
@@ -91,7 +91,19 @@ describe('gridstack utils', function() {
             expect(utils.parseHeight('12.3vw')).toEqual(jasmine.objectContaining({height: 12.3, unit: 'vw'}));
             expect(utils.parseHeight('12.5')).toEqual(jasmine.objectContaining({height: 12.5, unit: 'px'}));
             expect(function() { utils.parseHeight('12.5 df'); }).toThrowError('Invalid height');
+
         });
 
+        it('should parse negative height value', function() {
+            expect(utils.parseHeight(-12)).toEqual(jasmine.objectContaining({height: -12, unit: 'px'}));
+            expect(utils.parseHeight('-12px')).toEqual(jasmine.objectContaining({height: -12, unit: 'px'}));
+            expect(utils.parseHeight('-12.3px')).toEqual(jasmine.objectContaining({height: -12.3, unit: 'px'}));
+            expect(utils.parseHeight('-12.3em')).toEqual(jasmine.objectContaining({height: -12.3, unit: 'em'}));
+            expect(utils.parseHeight('-12.3rem')).toEqual(jasmine.objectContaining({height: -12.3, unit: 'rem'}));
+            expect(utils.parseHeight('-12.3vh')).toEqual(jasmine.objectContaining({height: -12.3, unit: 'vh'}));
+            expect(utils.parseHeight('-12.3vw')).toEqual(jasmine.objectContaining({height: -12.3, unit: 'vw'}));
+            expect(utils.parseHeight('-12.5')).toEqual(jasmine.objectContaining({height: -12.5, unit: 'px'}));
+            expect(function() { utils.parseHeight('-12.5 df'); }).toThrowError('Invalid height');
+        });
     });
 });
diff --git a/src/gridstack.js b/src/gridstack.js
@@ -99,7 +99,7 @@
             var height = val;
             var heightUnit = 'px';
             if (height && _.isString(height)) {
-                var match = height.match(/^([0-9]*\.[0-9]+|[0-9]+)(px|em|rem|vh|vw)?$/);
+                var match = height.match(/^(-[0-9]+\.[0-9]+|[0-9]*\.[0-9]+|-[0-9]+|[0-9]+)(px|em|rem|vh|vw)?$/);
                 if (!match) {
                     throw new Error('Invalid height');
                 }

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@`
`99`	`99`	`var height = val;`
`100`	`100`	`var heightUnit = 'px';`
`101`	`101`	`if (height && _.isString(height)) {`
`102`		`- var match = height.match(/^([0-9]*\.[0-9]+\|[0-9]+)(px\|em\|rem\|vh\|vw)?$/);`
	`102`	`+ var match = height.match(/^(-[0-9]+\.[0-9]+\|[0-9]*\.[0-9]+\|-[0-9]+\|[0-9]+)(px\|em\|rem\|vh\|vw)?$/);`
`103`	`103`	`if (!match) {`
`104`	`104`	`throw new Error('Invalid height');`
`105`	`105`	`}`