Merge branch 'feature/OwnCssUnits' of https://github.com/winfinit/angular-mapbox into winfinit-feature/OwnCssUnits

Author: Andrew Sullivan

dist/angular-mapbox.js

@@ -313,8 +313,18 @@
 
         var mapWidth = attrs.width || 500;
         var mapHeight = attrs.height || 500;
-        element.css('width', mapWidth + (/^[0-9]+$/.test(mapWidth)?'px':''));
-        element.css('height', mapHeight + (/^[0-9]+$/.test(mapHeight)?'px':''));
+
+        if ( isNaN(mapWidth) ) {
+          element.css('width', mapWidth);
+        } else {
+          element.css('width', mapWidth + 'px');
+        }
+
+        if ( isNaN(mapHeight) ) {
+          element.css('height', mapHeight);
+        } else {
+          element.css('height', mapHeight + 'px');
+        }
 
         scope.zoom = attrs.zoom || 12;
         if(attrs.lat && attrs.lng) {
@@ -381,7 +391,6 @@
   });
 })();
 
-
 (function() {
   'use strict';
 

dist/angular-mapbox.min.js

@@ -34,8 +34,18 @@
 
         var mapWidth = attrs.width || 500;
         var mapHeight = attrs.height || 500;
-        element.css('width', mapWidth + (/^[0-9]+$/.test(mapWidth)?'px':''));
-        element.css('height', mapHeight + (/^[0-9]+$/.test(mapHeight)?'px':''));
+
+        if ( isNaN(mapWidth) ) {
+          element.css('width', mapWidth);
+        } else {
+          element.css('width', mapWidth + 'px');
+        }
+
+        if ( isNaN(mapHeight) ) {
+          element.css('height', mapHeight);
+        } else {
+          element.css('height', mapHeight + 'px');
+        }
 
         scope.zoom = attrs.zoom || 12;
         if(attrs.lat && attrs.lng) {
@@ -101,4 +111,3 @@
     };
   });
 })();
-