Merge pull request #903 from sendgrid/apisg

Removed the CORS work around
sendgrid · Jan 22, 2015 · 4c5fdce · 4c5fdce
2 parents 77e298f + 3db4347
commit 4c5fdce
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/source/API_Reference/Web_API/timezone.md b/source/API_Reference/Web_API/timezone.md
@@ -14,7 +14,7 @@ get
 
 Get current timezone assigned to the user.
 
-{% apiexample get GET https://sendgrid.com/api/timezone/get api_user=your_sendgrid_username&api_key=your_sendgrid_password %}
+{% apiexample get GET https://api.sendgrid.com/api/timezone/get api_user=your_sendgrid_username&api_key=your_sendgrid_password %}
   {% response json %}
 {
   "name": "Eastern Time, US & Canada",

diff --git a/source/_assets/javascripts/livedocs.js b/source/_assets/javascripts/livedocs.js
@@ -89,15 +89,9 @@ $(function() {
         if (!valid) return;
 
         url = $(this).parent().find('.url').val();
-        // Temporary fix to allow for CORS
-        // Revert, once OPS allows for CORS on sendgrid domains
-        url = url.replace("api.sendgrid.com", "sendgrid.com");
         method = $(this).parent().find('.method').val().toUpperCase().trim();
         creds = "api_user=" + username + "&api_key=" + password;
         format = "." + Livedocs.getResponseFormat();
-        // Temporary fix to allow for CORS
-        // Revert, once OPS allows for CORS on sendgrid domains
-        url = url.replace("api.sendgrid.com", "sendgrid.com");
         data = buildQueryString($(this));
 
         if (method == "GET") {
@@ -235,9 +229,6 @@ $(function() {
       username = $.cookie('username');
 
       url = livedoc.find('.url').val();
-      // Temporary fix to allow for CORS
-      // Revert, once OPS allows for CORS on sendgrid domains
-      url = url.replace("api.sendgrid.com", "sendgrid.com");
       method = livedoc.find('.method').val().toUpperCase().trim();
       creds = "api_user=" + username + "&api_key=XXXXXXXX";
       format = "." + Livedocs.getResponseFormat();