Merge pull request #237 from clef/stop-using-json

Stop using json for ajax requests
clef · Mar 9, 2016 · b2ddbf8 · b2ddbf8
2 parents c025167 + 2ea85f3
commit b2ddbf8
Show file tree

Hide file tree

Showing 17 changed files with 66 additions and 83 deletions.
diff --git a/assets/dist/js/badge.js b/assets/dist/js/badge.js
@@ -20,7 +20,7 @@
       data.enable = 'badge';
       $.extend(data, ajaxData);
       $prompt.slideUp();
-      return $.post(ajaxurl, data, (function() {}), "json");
+      return $.post(ajaxurl, data, (function() {}));
     });
     return $prompt.find(".no-badge, .dismiss").click(function(e) {
       var data;
@@ -35,7 +35,7 @@
       });
       data.disable = true;
       $.extend(data, ajaxData);
-      $.post(ajaxurl, data, (function() {}), "json");
+      $.post(ajaxurl, data, (function() {}));
       return $prompt.slideUp();
     });
   });

diff --git a/assets/dist/js/badge.min.js b/assets/dist/js/badge.min.js
diff --git a/assets/dist/js/connect.js b/assets/dist/js/connect.js
@@ -4,6 +4,11 @@
     function Utils() {}
 
     Utils.getErrorMessage = function(data) {
+      try {
+        data = JSON.parse(data);
+      } catch (_error) {
+
+      }
       if (data.error) {
         return data.error;
       } else if (data.data && data.data.error) {
@@ -117,7 +122,9 @@
         action: this.connectClefAction
       };
       failure = (function(_this) {
-        return function(msg) {
+        return function(data) {
+          var msg;
+          msg = ClefUtils.getErrorMessage(data);
           return _this.showMessage({
             message: _.template(clefTranslations.messages.error.connect)({
               error: msg
@@ -132,7 +139,7 @@
             return cb(data);
           }
         } else {
-          return failure(ClefUtils.getErrorMessage(data));
+          return failure(data);
         }
       }).fail(function(res) {
         return failure(res.responseText);
@@ -258,7 +265,6 @@
     }
   });
   ConnectTutorialView = TutorialView.extend({
-    connectClefAction: "connect_clef_account_oauth_code",
     render: function() {
       this.addButton();
       return this.constructor.__super__.render.call(this);
@@ -319,7 +325,9 @@
       var data, failure;
       e.preventDefault();
       failure = (function(_this) {
-        return function(msg) {
+        return function(data) {
+          var msg;
+          msg = ClefUtils.getErrorMessage(data);
           return _this.showMessage({
             message: _.template(clefTranslations.messages.error.disconnect)({
               error: msg
@@ -344,7 +352,7 @@
               type: "updated"
             });
           } else {
-            return failure(ClefUtils.getErrorMessage(data));
+            return failure(data);
           }
         };
       })(this)).fail(function(res) {

diff --git a/assets/dist/js/connect.min.js b/assets/dist/js/connect.min.js