Merge remote-tracking branch 'origin/unstable'

imazen · Mar 11, 2015 · b932252 · b932252
2 parents 7ff6dbd + bcb8bb2
commit b932252
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/slimmage.js b/slimmage.js
@@ -186,8 +186,8 @@
                 if (k.match(/^format$/i) && data['webp']) { return d + "format=webp"; }
                 if (k.match(/^quality/i)) { return d + "quality=" + data['quality']; }
 
-                if (k.match(/^w|width|maxwidth$/i)) { return d + k + "=" + c.w;}
-                if (k.match(/^h|height|maxheight$/i)) { return d + k + "=" + c.h;}
+                if (k.match(/^(w|width|maxwidth)$/i)) { return d + k + "=" + c.w;}
+                if (k.match(/^(h|height|maxheight)$/i)) { return d + k + "=" + c.h;}
 
                 return p;
               }, 

diff --git a/test/spec/tests.js b/test/spec/tests.js
@@ -181,6 +181,12 @@ describe('slimmage', function () {
       expect(result.src).to.be("im?width=80&height=45&zoom=2"); //But only because how zoom is interpreted.
     });
 
+    it('should not change the william and harry querystring variables', function(){
+      var dpr = window.devicePixelRatio || 1;
+      var result = s.getImageInfo(100/dpr,"im?width=16&william=130&harry=90",0);
+      expect(result.src).to.be("im?width=160&william=130&harry=90");
+    });
+
   });
 
   var css_ids = ['twenty_px','twenty_per','two_em','two_cm','two_in'];