From 66d0d4f6276565500ee0f8317dd42034aa4d86e6 Mon Sep 17 00:00:00 2001
From: Max Goodman <max@reddit.com>
Date: Thu, 31 May 2012 17:11:17 -0700
Subject: [PATCH] Move https buttons to S3 for now.

---
 r2/r2/public/static/button/button1.js | 8 ++++++--
 r2/r2/public/static/button/button2.js | 8 ++++++--
 r2/r2/public/static/button/button3.js | 8 ++++++--
 r2/r2/public/static/js/blogbutton.js  | 7 +++++--
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/r2/r2/public/static/button/button1.js b/r2/r2/public/static/button/button1.js
index bb226605b..47a0a8072 100644
--- a/r2/r2/public/static/button/button1.js
+++ b/r2/r2/public/static/button/button1.js
@@ -1,7 +1,11 @@
 (function() {
-  var prefix = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.reddit.com';
+  if ('https:' == document.location.protocol) {
+      var base_url = 'https://redditstatic.s3.amazonaws.com'
+  } else {
+      var base_url = 'http://www.reddit.com/static'
+  }
 
-  var write_string="<iframe src=\"" + prefix + "/static/button/button1.html?width=120&url=";
+  var write_string="<iframe src=\"" + base_url + "/button/button1.html?width=120&url=";
 
   if (window.reddit_url)  { 
       write_string += encodeURIComponent(reddit_url); 
diff --git a/r2/r2/public/static/button/button2.js b/r2/r2/public/static/button/button2.js
index bc5479a03..c633ed369 100644
--- a/r2/r2/public/static/button/button2.js
+++ b/r2/r2/public/static/button/button2.js
@@ -1,7 +1,11 @@
 (function() {
-  var prefix = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.reddit.com';
+  if ('https:' == document.location.protocol) {
+      var base_url = 'https://redditstatic.s3.amazonaws.com'
+  } else {
+      var base_url = 'http://www.reddit.com/static'
+  }
 
-  var write_string="<iframe src=\"" + prefix + "/static/button/button2.html?width=51&url=";
+  var write_string="<iframe src=\"" + base_url + "/button/button2.html?width=51&url=";
 
   if (window.reddit_url)  { 
       write_string += encodeURIComponent(reddit_url); 
diff --git a/r2/r2/public/static/button/button3.js b/r2/r2/public/static/button/button3.js
index 716305a8e..939e86fa3 100644
--- a/r2/r2/public/static/button/button3.js
+++ b/r2/r2/public/static/button/button3.js
@@ -1,7 +1,11 @@
 (function() {
-  var prefix = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.reddit.com';
+  if ('https:' == document.location.protocol) {
+      var base_url = 'https://redditstatic.s3.amazonaws.com'
+  } else {
+      var base_url = 'http://www.reddit.com/static'
+  }
 
-  var write_string="<iframe src=\"" + prefix + "/static/button/button3.html?width=69&url=";
+  var write_string="<iframe src=\"" + base_url + "/button/button3.html?width=69&url=";
 
   if (window.reddit_url)  { 
       write_string += encodeURIComponent(reddit_url); 
diff --git a/r2/r2/public/static/js/blogbutton.js b/r2/r2/public/static/js/blogbutton.js
index a19369dff..0fc9857e5 100644
--- a/r2/r2/public/static/js/blogbutton.js
+++ b/r2/r2/public/static/js/blogbutton.js
@@ -160,11 +160,11 @@ $(function() {
             infoTarget = "/r/" + querydict.sr + infoTarget;
         }
 
+        var secure = 'https:' == document.location.protocol;
         if ($.cookie_read("session", "reddit_").data) {
             options.url = infoTarget;
             options.dataType = "json";
         } else {
-            var secure = 'https:' == document.location.protocol;
             var prefix = secure ? "https://ssl.reddit.com" : "http://buttons.reddit.com";
             options.url = prefix + infoTarget;
             options.dataType = options.jsonp = "jsonp";
@@ -179,7 +179,10 @@ $(function() {
             options.data["id"] = querydict.id;
         }
 
-        $.ajax(options);
+        // Secure button info is disabled for now due to load.
+        if (!secure) {
+            $.ajax(options);
+        }
    }
   );