blazer 1.7.7 → 2.6.4

data/app/assets/javascripts/blazer/queries.js

@@ -3,6 +3,9 @@ var runningQueries = []
 var maxQueries = 3
 
 function runQuery(data, success, error) {
+  if (!data.data_source) {
+    throw new Error("Data source is required to cancel queries")
+  }
   data.run_id = uuid()
   var query = {
     data: data,
@@ -50,8 +53,15 @@ function runQueryHelper(query) {
       queryComplete(query)
     }
   }).fail( function(jqXHR, textStatus, errorThrown) {
-    if (!query.canceled) {
+    // check jqXHR.status instead of query.canceled
+    // so it works for page navigation with Firefox and Safari
+    if (jqXHR.status === 0) {
+      cancelServerQuery(query)
+    } else {
       var message = (typeof errorThrown === "string") ? errorThrown : errorThrown.message
+      if (!message) {
+        message = "An error occurred"
+      }
       query.error(message)
     }
     queryComplete(query)
@@ -80,19 +90,23 @@ function cancelAllQueries() {
   }
 }
 
-$(window).unload(cancelAllQueries)
+// needed for Chrome
+// queries are canceled before unload with Firefox and Safari
+$(window).on("unload", cancelAllQueries)
 
 function cancelQuery(query) {
   query.canceled = true
   if (query.xhr) {
     query.xhr.abort()
   }
+}
 
+function cancelServerQuery(query) {
   // tell server
   var path = Routes.cancel_queries_path()
   var data = {run_id: query.run_id, data_source: query.data_source}
   if (navigator.sendBeacon) {
-    navigator.sendBeacon(path, csrfProtect(data))
+    navigator.sendBeacon(path + "?" + $.param(csrfProtect(data)))
   } else {
     // TODO make sync
     $.post(path, data)
@@ -103,5 +117,5 @@ function csrfProtect(payload) {
   var param = $("meta[name=csrf-param]").attr("content")
   var token = $("meta[name=csrf-token]").attr("content")
   if (param && token) payload[param] = token
-  return new Blob([JSON.stringify(payload)], {type : "application/json; charset=utf-8"})
+  return payload
 }

data/app/assets/javascripts/blazer/routes.js

@@ -8,6 +8,9 @@ var Routes = {
   schema_queries_path: function(params) {
     return rootPath + "queries/schema?" + $.param(params)
   },
+  docs_queries_path: function(params) {
+    return rootPath + "queries/docs?" + $.param(params)
+  },
   tables_queries_path: function(params) {
     return rootPath + "queries/tables?" + $.param(params)
   },