Clean up js style and remove extra getCookie function (#4123)

rest_framework/static/rest_framework/js/ajax-form.js

@@ -1,15 +1,19 @@
 function replaceDocument(docString) {
   var doc = document.open("text/html");
+
   doc.write(docString);
   doc.close();
 }
 
-
 function doAjaxSubmit(e) {
   var form = $(this);
   var btn = $(this.clk);
-    var method = btn.data('method') || form.data('method') || form.attr('method') || 'GET';
+  var method = (
-    method = method.toUpperCase()
+    btn.data('method') ||
+    form.data('method') ||
+    form.attr('method') || 'GET'
+  ).toUpperCase();
+
   if (method === 'GET') {
     // GET requests can always use standard form submits.
     return;
@@ -18,6 +22,7 @@ function doAjaxSubmit(e) {
   var contentType =
     form.find('input[data-override="content-type"]').val() ||
     form.find('select[data-override="content-type"] option:selected').text();
+
   if (method === 'POST' && !contentType) {
     // POST requests can use standard form submits, unless we have
     // overridden the content type.
@@ -29,15 +34,18 @@ function doAjaxSubmit(e) {
 
   var url = form.attr('action');
   var data;
+
   if (contentType) {
     data = form.find('[data-override="content"]').val() || ''
   } else {
     contentType = form.attr('enctype') || form.attr('encoding')
+
     if (contentType === 'multipart/form-data') {
       if (!window.FormData) {
         alert('Your browser does not support AJAX multipart form submissions');
         return;
       }
+
       // Use the FormData API and allow the content type to be set automatically,
       // so it includes the boundary string.
       // See https://developer.mozilla.org/en-US/docs/Web/API/FormData/Using_FormData_Objects
@@ -55,15 +63,21 @@ function doAjaxSubmit(e) {
     data: data,
     contentType: contentType,
     processData: false,
-        headers: {'Accept': 'text/html; q=1.0, */*'},
+    headers: {
+      'Accept': 'text/html; q=1.0, */*'
+    },
   });
+
   ret.always(function(data, textStatus, jqXHR) {
     if (textStatus != 'success') {
       jqXHR = data;
     }
+
     var responseContentType = jqXHR.getResponseHeader("content-type") || "";
+
     if (responseContentType.toLowerCase().indexOf('text/html') === 0) {
       replaceDocument(jqXHR.responseText);
+
       try {
         // Modify the location and scroll to top, as if after page load.
         history.replaceState({}, '', url);
@@ -77,19 +91,20 @@ function doAjaxSubmit(e) {
       window.location = url;
     }
   });
+
   return ret;
 }
 
-
 function captureSubmittingElement(e) {
   var target = e.target;
   var form = this;
+
   form.clk = target;
 }
 
-
 $.fn.ajaxForm = function() {
   var options = {}
+
   return this
     .unbind('submit.form-plugin  click.form-plugin')
     .bind('submit.form-plugin', options, doAjaxSubmit)

rest_framework/static/rest_framework/js/csrf.js

@@ -1,9 +1,12 @@
 function getCookie(name) {
   var cookieValue = null;
+
   if (document.cookie && document.cookie != '') {
     var cookies = document.cookie.split(';');
+
     for (var i = 0; i < cookies.length; i++) {
       var cookie = jQuery.trim(cookies[i]);
+
       // Does this cookie string begin with the name we want?
       if (cookie.substring(0, name.length + 1) == (name + '=')) {
         cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
@@ -11,6 +14,7 @@ function getCookie(name) {
       }
     }
   }
+
   return cookieValue;
 }
 
@@ -26,6 +30,7 @@ function sameOrigin(url) {
   var protocol = document.location.protocol;
   var sr_origin = '//' + host;
   var origin = protocol + sr_origin;
+
   // Allow absolute or scheme relative URLs to same origin
   return (url == origin || url.slice(0, origin.length + 1) == origin + '/') ||
     (url == sr_origin || url.slice(0, sr_origin.length + 1) == sr_origin + '/') ||

rest_framework/static/rest_framework/js/default.js

@@ -1,24 +1,3 @@
-function getCookie(c_name)
-{
-    // From http://www.w3schools.com/js/js_cookies.asp
-    var c_value = document.cookie;
-    var c_start = c_value.indexOf(" " + c_name + "=");
-    if (c_start == -1) {
-        c_start = c_value.indexOf(c_name + "=");
-    }
-    if (c_start == -1) {
-        c_value = null;
-    } else {
-        c_start = c_value.indexOf("=", c_start) + 1;
-        var c_end = c_value.indexOf(";", c_start);
-        if (c_end == -1) {
-            c_end = c_value.length;
-        }
-        c_value = unescape(c_value.substring(c_start,c_end));
-    }
-    return c_value;
-}
-
 $(document).ready(function() {
   // JSON highlighting.
   prettyPrint();
@@ -33,6 +12,7 @@ $(document).ready(function () {
   $('a[data-toggle="tab"]:first').on('shown', function(e) {
     $(e.target).parents('.tabbable').addClass('first-tab-active');
   });
+
   $('a[data-toggle="tab"]:not(:first)').on('shown', function(e) {
     $(e.target).parents('.tabbable').removeClass('first-tab-active');
   });