Merge pull request #22 from fourplusone/master

If the bookmarklet is used on https: site w/o jquery, browser complains about unsecure content being injected
hukl · Nov 20, 2011 · 480cfc7 · 480cfc7
2 parents 929bddb + e7703cc
commit 480cfc7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/public/bookmarklet_beta.js b/public/bookmarklet_beta.js
@@ -2,7 +2,8 @@ if (typeof jQuery == 'undefined') {
   var jQ = document.createElement('script');
   jQ.type = 'text/javascript';
   jQ.onload=runthis;
-  jQ.src = 'http://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js';
+  var protocol = (location.protocol == 'https:') ? 'https:' : 'http:';
+  jQ.src = protocol + '//ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js';
   document.body.appendChild(jQ);
 } else {
   runthis();

diff --git a/public/bookmarklet_development.js b/public/bookmarklet_development.js
@@ -2,7 +2,8 @@ if (typeof jQuery == 'undefined') {
   var jQ = document.createElement('script');
   jQ.type = 'text/javascript';
   jQ.onload=runthis;
-  jQ.src = 'http://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js';
+  var protocol = (location.protocol == 'https:') ? 'https:' : 'http:';
+  jQ.src = protocol + '//ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js';
   document.body.appendChild(jQ);
 } else {
   runthis();

diff --git a/public/bookmarklet_production.js b/public/bookmarklet_production.js
@@ -2,7 +2,8 @@ if (typeof jQuery == 'undefined') {
   var jQ = document.createElement('script');
   jQ.type = 'text/javascript';
   jQ.onload=runthis;
-  jQ.src = 'http://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js';
+  var protocol = (location.protocol == 'https:') ? 'https:' : 'http:';
+  jQ.src = protocol + '//ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js';
   document.body.appendChild(jQ);
 } else {
   runthis();