grapple 0.3.2 → 0.3.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/assets/javascripts/grapple-jquery.js +14 -5
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: c1fdb17c60db0a345ed1c02b5a113fd521ed5161f4a46b8dc8ecee1333df11b1
|
|
4
|
+
data.tar.gz: 12a34fb7e706932732d2a45e3d4a8b385218b3e033832c4659b14c76adefb31e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: c2435e03a84bbd0a2739f3eba1bd3d65e59be0c1fbc4b4a65dab0cd45c28bcf24041229e028c792107d269ca67fed7c9e30772eff3c096c9780d836e14d6e0bb
|
|
7
|
+
data.tar.gz: d0de48f319d81ce46af1d1959abacb8697b440bac4950aea50d3ac64756f3daffe6d08af84d01c3912733b7b2981f051b9654a6bc9a8c5857605d7b8904a51af
|
|
@@ -106,17 +106,18 @@ GrappleTable.prototype = {
|
|
|
106
106
|
url += (url.indexOf('?') == -1 ? '?' : '&') + params;
|
|
107
107
|
}
|
|
108
108
|
$.ajax(url, {
|
|
109
|
+
beforeSend: function() {
|
|
110
|
+
var event = jQuery.Event('grapple:before_ajax_send');
|
|
111
|
+
self.element.trigger(event, { url: url });
|
|
112
|
+
return !event.isDefaultPrevented();
|
|
113
|
+
},
|
|
109
114
|
success: function(data) {
|
|
110
115
|
// HACK: handle full page responses
|
|
111
116
|
var nonTableKeyIndex = data.indexOf(GrappleTable.NON_TABLE_RESPONSE);
|
|
112
117
|
if(nonTableKeyIndex > -1 && nonTableKeyIndex < 100) {
|
|
113
118
|
data = "Failed to load table";
|
|
114
119
|
}
|
|
115
|
-
self.
|
|
116
|
-
self.element.html(data);
|
|
117
|
-
self.init();
|
|
118
|
-
self._hideLoading();
|
|
119
|
-
self.element.trigger('grapple:after_load');
|
|
120
|
+
self.loadHtml(data, url);
|
|
120
121
|
},
|
|
121
122
|
error: function(a, b, c) {
|
|
122
123
|
// TODO: handle loading errors
|
|
@@ -125,6 +126,14 @@ GrappleTable.prototype = {
|
|
|
125
126
|
});
|
|
126
127
|
},
|
|
127
128
|
|
|
129
|
+
loadHtml: function(html, url) {
|
|
130
|
+
this.element.addClass(GrappleTable.CSS_AJAX_LOADING);
|
|
131
|
+
this.element.html(html);
|
|
132
|
+
this.init();
|
|
133
|
+
this._hideLoading();
|
|
134
|
+
this.element.trigger('grapple:after_load', { url: url, html: html });
|
|
135
|
+
},
|
|
136
|
+
|
|
128
137
|
initSorting: function() {
|
|
129
138
|
var self = this;
|
|
130
139
|
this.header.find('th.sortable').each(function(i, elem) {
|