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

Merge branch 'saas-dev-publishing' of github.com:sourcefabric/Airtime into saas-dev-publishing

Browse source
This commit is contained in:
Albert Santoni 2015-11-17 17:34:33 -05:00
commit 4fd61cb088
9 changed files with 26 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/public/css/station_podcast.css
View file

@ -13,6 +13,10 @@
margin: 0;
}
#station_podcast .inner_editor_title button {
margin: 0 0 0 4px;
}
#station_podcast .collapsible-header {
margin: 0 0 20px;
top: 20px;

6
airtime_mvc/public/js/airtime/library/library.js
View file

@ -1301,8 +1301,8 @@ var AIRTIME = (function(AIRTIME) {
}
var dt = $datatables[table],
wrapper = $(dt).closest(".dataTables_wrapper");
if (oTable && typeof oTable.fnClearTable === 'function') {
oTable.fnClearTable(false);
if (dt && typeof dt.fnClearTable === 'function') {
dt.fnClearTable(false);
}
// Don't redraw if we're switching to another hash for the library table
$.when(redraw ? dt.fnDraw() : function () {}).done(function () {
@ -1386,6 +1386,7 @@ var AIRTIME = (function(AIRTIME) {
});
var openPodcastEpisodeTable = function (podcast) {
$("#library_filter").append(" - " + podcast.title);
mod.podcastEpisodeTableWidget.reload(podcast.id);
mod.podcastTableWidget.clearSelection();
mod.setCurrentTable(mod.DataTableTypeEnum.PODCAST_EPISODES);
@ -1427,7 +1428,6 @@ var AIRTIME = (function(AIRTIME) {
// in the left-hand pane.
mod.podcastTableWidget.assignDblClickHandler(function () {
var podcast = mod.podcastDataTable.fnGetData(this);
$("#library_filter").append(" - " + $(this).find(".library_title").text());
openPodcastEpisodeTable(podcast);
});

2
airtime_mvc/public/js/airtime/library/podcast.js
View file

@ -516,6 +516,8 @@ var AIRTIME = (function (AIRTIME) {
remainingDiskSpace -= this.enclosure.length;
});
dt.clearSelection();
};
/**