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

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

This commit is contained in:
drigato 2015-11-16 11:44:30 -05:00
parent 03e90cdd3f 610d860d6a
commit 08afb54f89
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
airtime_mvc/public/js/airtime/library/library.js
View File

@ -1379,6 +1379,15 @@ var AIRTIME = (function(AIRTIME) {
return this.getSelectedRows().length >= 1;
}
});
var openPodcastEpisodeTable = function (podcast) {
mod.podcastEpisodeTableWidget.reload(podcast.id);
mod.podcastTableWidget.clearSelection();
mod.setCurrentTable(mod.DataTableTypeEnum.PODCAST_EPISODES);
mod.podcastEpisodeDataTable.closest(".dataTables_wrapper").find(".dataTables_processing")
.addClass("block-overlay").css("visibility", "visible");
};
podcastToolbarButtons["ViewEpisodes"] = {
title : $.i18n._("View Episodes"),
iconClass : "icon-chevron-right",
@ -1387,9 +1396,7 @@ var AIRTIME = (function(AIRTIME) {
eventHandlers : {
click: function () {
var podcast = mod.podcastTableWidget.getSelectedRows()[0];
mod.podcastEpisodeTableWidget.reload(podcast.id);
mod.podcastTableWidget.clearSelection();
mod.setCurrentTable(mod.DataTableTypeEnum.PODCAST_EPISODES);
openPodcastEpisodeTable(podcast);
}
},
validateConstraints: function () {
@ -1429,9 +1436,7 @@ var AIRTIME = (function(AIRTIME) {
// in the left-hand pane.
mod.podcastTableWidget.assignDblClickHandler(function () {
var podcast = mod.podcastDataTable.fnGetData(this);
mod.podcastEpisodeTableWidget.reload(podcast.id);
mod.podcastTableWidget.clearSelection();
mod.setCurrentTable(mod.DataTableTypeEnum.PODCAST_EPISODES);
openPodcastEpisodeTable(podcast);
});
mod.podcastDataTable = mod.podcastTableWidget.getDatatable();

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

@ -483,6 +483,7 @@ var AIRTIME = (function (AIRTIME) {
*/
mod.importSelectedEpisodes = function (episodes, dt) {
$.each(episodes, function () {
// remainingDiskSpace is defined in layout.phtml
if (this.enclosure.length > remainingDiskSpace) {
alert("You don't have enough disk space to import " + this.title);
return false;
@ -569,6 +570,9 @@ var AIRTIME = (function (AIRTIME) {
},
fnDrawCallback: function () {
AIRTIME.library.drawEmptyPlaceholder(this);
// Hide the processing div
var dt = this.getDatatable();
!dt || dt.closest(".dataTables_wrapper").find(".dataTables_processing").css("visibility", "hidden");
}
}
);