Merge pull request #110 from imgix/fix-64-params-from-ix-src

Properly encode Base64 variant params from ix-src.
imgix · Sep 12, 2016 · 666aa1e · 666aa1e
2 parents e5b72fc + f68fb2a
commit 666aa1e
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/dist/imgix.js b/dist/imgix.js
@@ -43,13 +43,6 @@ var ImgixTag = (function() {
 
     if (this.ixPathVal) {
       params = JSON.parse(this.ixParamsVal) || {};
-
-      // Encode any passed Base64 variant params
-      for (var key in params) {
-        if (key.substr(-2) === '64') {
-          params[key] = util.encode64(params[key]);
-        }
-      }
     } else {
       // If the user used `ix-src`, we have to extract the base params
       // from that string URL.
@@ -65,6 +58,13 @@ var ImgixTag = (function() {
       }
     }
 
+    // Encode any passed Base64 variant params
+    for (var key in params) {
+      if (key.substr(-2) === '64') {
+        params[key] = util.encode64(params[key]);
+      }
+    }
+
     if (imgix.config.includeLibraryParam) {
       params.ixlib = 'imgixjs-' + imgix.VERSION;
     }

diff --git a/dist/imgix.min.js b/dist/imgix.min.js
diff --git a/index.html b/index.html
@@ -94,7 +94,7 @@
   <body>
     <div class="wrapper">
       <img
-        ix-src="https://assets.imgix.net/unsplash/hotairballoon.jpg?w=300&amp;h=500&amp;fit=crop&amp;crop=right"
+        ix-src="https://assets.imgix.net/unsplash/hotairballoon.jpg?w=300&amp;h=500&amp;fit=crop&amp;crop=right&amp;auto64=compress,format"
         alt="A lighthouse"
         sizes="(min-width: 300px) 300px, calc(100vw - 20px)"
       >

diff --git a/spec/ImgixTagSpec.js b/spec/ImgixTagSpec.js
@@ -174,7 +174,7 @@ describe('ImgixTag', function() {
     expect(tag._extractBaseParams()).toEqual({
       page: '3',
       w: '600',
-      txt64: 'gibberish'
+      txt64: 'Z2liYmVyaXNo'
     });
   });
 

diff --git a/src/ImgixTag.js b/src/ImgixTag.js
@@ -42,13 +42,6 @@ var ImgixTag = (function() {
 
     if (this.ixPathVal) {
       params = JSON.parse(this.ixParamsVal) || {};
-
-      // Encode any passed Base64 variant params
-      for (var key in params) {
-        if (key.substr(-2) === '64') {
-          params[key] = util.encode64(params[key]);
-        }
-      }
     } else {
       // If the user used `ix-src`, we have to extract the base params
       // from that string URL.
@@ -64,6 +57,13 @@ var ImgixTag = (function() {
       }
     }
 
+    // Encode any passed Base64 variant params
+    for (var key in params) {
+      if (key.substr(-2) === '64') {
+        params[key] = util.encode64(params[key]);
+      }
+    }
+
     if (imgix.config.includeLibraryParam) {
       params.ixlib = 'imgixjs-' + imgix.VERSION;
     }