Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed a bug with our table widget toolbar not showing up with static data. Also fixed a race condition.

This commit is contained in:
Albert Santoni 2015-10-22 14:28:12 -04:00
parent f94e462fe0
commit 01618b55af
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
airtime_mvc/public/js/airtime/library/podcast.js
View File

@ -57,7 +57,8 @@ var AIRTIME = (function (AIRTIME) {
}); });
if (ids.length > 0) { if (ids.length > 0) {
// Bulk methods should use post because we're sending data in the request body // Bulk methods should use post because we're sending data in the request body. There is no standard
// RESTful way to implement bulk actions, so this is how we do it:
$.post(endpoint + "bulk", {csrf_token: $("#csrf").val(), method: method, ids: ids}, callback); $.post(endpoint + "bulk", {csrf_token: $("#csrf").val(), method: method, ids: ids}, callback);
} }
} }

11
airtime_mvc/public/js/airtime/widgets/table.js
View File

@ -57,6 +57,7 @@ var AIRTIME = (function(AIRTIME) {
"sAjaxSource": baseUrl+"rest/media", //Override me "sAjaxSource": baseUrl+"rest/media", //Override me
"sAjaxDataProp": "aaData", "sAjaxDataProp": "aaData",
"bScrollCollapse": false, "bScrollCollapse": false,
"deferLoading" : 1, //0 tells it there's zero elements loaded and disables the automatic AJAX. We don't want to load until after we bind all our event handlers, to prevent a race condition with the "init" event callback.
"sPaginationType": "full_numbers", "sPaginationType": "full_numbers",
"bJQueryUI": true, "bJQueryUI": true,
"bAutoWidth": false, "bAutoWidth": false,
@ -75,6 +76,7 @@ var AIRTIME = (function(AIRTIME) {
"sDom": 'Rf<"dt-process-rel"r><"H"<"table_toolbar"C>><"dataTables_scrolling"t<"#library_empty"<"#library_empty_image"><"#library_empty_text">>><"F"lip>>', "sDom": 'Rf<"dt-process-rel"r><"H"<"table_toolbar"C>><"dataTables_scrolling"t<"#library_empty"<"#library_empty_image"><"#library_empty_text">>><"F"lip>>',
"fnServerData": self._fetchData, "fnServerData": self._fetchData,
"fnInitComplete" : function() { self._setupEventHandlers(bItemSelection) }
//"fnDrawCallback" : self._tableDrawCallback //"fnDrawCallback" : self._tableDrawCallback
}; };
@ -85,8 +87,7 @@ var AIRTIME = (function(AIRTIME) {
} }
self._datatable = self._$wrapperDOMNode.dataTable(options); self._datatable = self._$wrapperDOMNode.dataTable(options);
self._setupEventHandlers(bItemSelection); self._datatable.fnDraw(); //Load the AJAX data now that our event handlers have been bound.
//return self._datatable; //return self._datatable;
return self; return self;
@ -163,9 +164,9 @@ var AIRTIME = (function(AIRTIME) {
.css('padding-right', f.outerWidth()); .css('padding-right', f.outerWidth());
}); });
$(self._datatable).on('init', function(e) { //Since this function is already called when the datatables initialization is complete, we know the DOM
self._setupToolbarButtons(self._toolbarButtons); //structure for the datatable exists and can just proceed to setup the toolbar DOM elements now.
}); self._setupToolbarButtons(self._toolbarButtons);
}; };