diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js
index ff5561871..37f1e5253 100644
--- a/airtime_mvc/public/js/airtime/library/library.js
+++ b/airtime_mvc/public/js/airtime/library/library.js
@@ -504,6 +504,8 @@ var AIRTIME = (function(AIRTIME) {
}
chosenItems = {};
+
+ // TODO: correct check whether used to delete episodes
if (oTable == $datatables[mod.DataTableTypeEnum.PODCAST_EPISODES]) {
mod.podcastEpisodeTableWidget.reload();
} else {
@@ -1423,147 +1425,6 @@ var AIRTIME = (function(AIRTIME) {
$datatables[mod.DataTableTypeEnum.PODCAST] = mod.podcastDataTable;
};
- /**
- * Initialize the podcast episode table with working buttons
- */
- mod.initPodcastEpisodeDatatableWithButtonEvents = function (domNode) {
-
- /**
- * Check the import statuses of each selected episode to see which
- * buttons should be enabled or disabled.
- *
- * @param shouldBeImported whether or not the selected item(s)
- * should be imported to obtain a valid result.
- *
- * @returns {boolean} true if all selected episodes are valid and
- * the button should be enabled, otherwise false.
- */
- var checkSelectedEpisodeImportStatus = function (shouldBeImported) {
- var selected = this.getSelectedRows(), isValid = true;
- if (selected.length == 0) return false;
- $.each(selected, function () {
- if (this.ingested < 0) isValid = false;
- var isImported = !$.isEmptyObject(this.file);
- if (shouldBeImported ? !isImported : isImported) {
- isValid = false;
- }
- });
- return isValid;
- };
-
- // Setup the default buttons (new, edit, delete)
- podcastEpisodeButtons = AIRTIME.widgets.Table.getStandardToolbarButtons();
- $.extend(true, podcastEpisodeButtons[AIRTIME.widgets.Table.TOOLBAR_BUTTON_ROLES.NEW],
- {
- title: "Import",
- eventHandlers: {
- click: function () {
- var episodes = mod.podcastEpisodeTableWidget.getSelectedRows();
- AIRTIME.podcast.importSelectedEpisodes(episodes, mod.podcastEpisodeTableWidget);
- }
- },
- validateConstraints: function () {
- return checkSelectedEpisodeImportStatus.call(this, false);
- }
- });
- $.extend(true, podcastEpisodeButtons[AIRTIME.widgets.Table.TOOLBAR_BUTTON_ROLES.EDIT],
- {
- eventHandlers: {
- click: function () {
- var episodes = mod.podcastEpisodeTableWidget.getSelectedRows();
- AIRTIME.podcast.editSelectedEpisodes(episodes);
- }
- },
- validateConstraints: function () {
- return checkSelectedEpisodeImportStatus.call(this, true);
- }
- });
- $.extend(true, podcastEpisodeButtons[AIRTIME.widgets.Table.TOOLBAR_BUTTON_ROLES.DELETE],
- {
- eventHandlers: {
- click: function () {
- var data = [], episodes = mod.podcastEpisodeTableWidget.getSelectedRows();
- $.each(episodes, function () {
- data.push({id: this.file.id, type: this.file.ftype});
- });
- console.log("podcast deletion:", data);
- AIRTIME.podcast.deleteSelectedEpisodes(data, mod.podcastEpisodeTableWidget);
- }
- },
- validateConstraints: function () {
- return checkSelectedEpisodeImportStatus.call(this, true);
- }
- });
-
- // Reassign these because integer keys take precedence in iteration order - we want to order based on insertion
- // FIXME: this is a pretty flimsy way to try to set up iteration order (possibly not xbrowser compatible?)
- podcastEpisodeButtons = {
- newBtn : podcastEpisodeButtons[AIRTIME.widgets.Table.TOOLBAR_BUTTON_ROLES.NEW],
- editBtn: podcastEpisodeButtons[AIRTIME.widgets.Table.TOOLBAR_BUTTON_ROLES.EDIT],
- delBtn : podcastEpisodeButtons[AIRTIME.widgets.Table.TOOLBAR_BUTTON_ROLES.DELETE]
- };
-
- $.extend(true, podcastEpisodeButtons, {
- // addToScheduleBtn: {
- // title : $.i18n._('Add to Schedule'),
- // iconClass : '',
- // extraBtnClass : 'btn-small',
- // elementId : '',
- // eventHandlers : {
- // click: function () {
- // var data = [], selected = mod.podcastEpisodeTableWidget.getSelectedRows();
- // $.each(selected, function () { data.push(this.file); });
- // mod.addToSchedule(data);
- // }
- // },
- // validateConstraints: function () {
- // // TODO: change text + behaviour for playlists, smart blocks, etc.
- // return checkSelectedEpisodeImportStatus.call(this, true);
- // }
- // },
- viewDescBtn: {
- title : $.i18n._("View"),
- iconClass : "icon-globe",
- extraBtnClass : "btn-small",
- elementId : "",
- eventHandlers : {
- click: mod.openPodcastEpisodeDialog
- },
- validateConstraints: function () {
- return this.getSelectedRows().length == 1;
- }
- }
- });
-
- mod.podcastEpisodeTableWidget = AIRTIME.podcast.initPodcastEpisodeDatatable(
- domNode,
- podcastEpisodeButtons,
- {
- hideIngestCheckboxes: false,
- emptyPlaceholder: {
- iconClass: "icon-white icon-th-list",
- html: $.i18n._("This podcast doesn't have any episodes!")
- + "
" + $.i18n._("Make sure the RSS feed contains audio items (with enclosure tags).")
- + "
" + $.i18n._("Learn about podcasts") + ""
- }
- }
- );
-
- mod.podcastEpisodeDataTable = $datatables[mod.DataTableTypeEnum.PODCAST_EPISODES] = mod.podcastEpisodeTableWidget.getDatatable();
- mod.podcastEpisodeTableWidget.assignDblClickHandler(function () {
- var data = mod.podcastEpisodeDataTable.fnGetData(this);
- if (!$.isEmptyObject(data.file)) {
- mod.dblClickAdd(data.file, data.file.ftype);
- } else {
- if (data.ingested >= 0) { // Only import if the file isn't pending
- AIRTIME.podcast.importSelectedEpisodes([data], mod.podcastEpisodeTableWidget);
- }
- }
- });
-
- return mod.podcastEpisodeTableWidget;
- };
-
mod.libraryInit = libraryInit;
return AIRTIME;
diff --git a/airtime_mvc/public/js/airtime/library/podcast.js b/airtime_mvc/public/js/airtime/library/podcast.js
index 6d946b961..9c4965b24 100644
--- a/airtime_mvc/public/js/airtime/library/podcast.js
+++ b/airtime_mvc/public/js/airtime/library/podcast.js
@@ -346,7 +346,7 @@ var AIRTIME = (function (AIRTIME) {
});
// Add podcast episode table in right-side panel below podcast edit form
- var episodeTable = AIRTIME.library.initPodcastEpisodeDatatableWithButtonEvents(
+ var episodeTable = AIRTIME.podcast.initPodcastEpisodeDatatableWithButtonEvents(
$("#podcast_episodes_" + podcast.id),
);
episodeTable.reload(podcast.id);
@@ -568,7 +568,6 @@ var AIRTIME = (function (AIRTIME) {
* @param {PodcastEpisodeTable} dt PodcastEpisode table containing the data
*/
mod.importSelectedEpisodes = function (episodes, dt) {
- console.log("importSelectedEpisodes", episodes, dt);
$.each(episodes, function () {
// remainingDiskSpace is defined in layout.phtml
if (this.enclosure.length > remainingDiskSpace) {
@@ -603,13 +602,153 @@ var AIRTIME = (function (AIRTIME) {
dt.clearSelection();
};
+ /**
+ * Initialize the podcast episode table with working buttons
+ */
+ mod.initPodcastEpisodeDatatableWithButtonEvents = function (domNode) {
+
+ /**
+ * Check the import statuses of each selected episode to see which
+ * buttons should be enabled or disabled.
+ *
+ * @param shouldBeImported whether or not the selected item(s)
+ * should be imported to obtain a valid result.
+ *
+ * @returns {boolean} true if all selected episodes are valid and
+ * the button should be enabled, otherwise false.
+ */
+ var checkSelectedEpisodeImportStatus = function (shouldBeImported) {
+ var selected = this.getSelectedRows(), isValid = true;
+ if (selected.length == 0) return false;
+ $.each(selected, function () {
+ if (this.ingested < 0) isValid = false;
+ var isImported = !$.isEmptyObject(this.file);
+ if (shouldBeImported ? !isImported : isImported) {
+ isValid = false;
+ }
+ });
+ return isValid;
+ };
+
+ // Setup the default buttons (new, edit, delete)
+ podcastEpisodeButtons = AIRTIME.widgets.Table.getStandardToolbarButtons();
+ $.extend(true, podcastEpisodeButtons[AIRTIME.widgets.Table.TOOLBAR_BUTTON_ROLES.NEW],
+ {
+ title: "Import",
+ eventHandlers: {
+ click: function () {
+ var episodes = mod.podcastEpisodeTableWidget.getSelectedRows();
+ AIRTIME.podcast.importSelectedEpisodes(episodes, mod.podcastEpisodeTableWidget);
+ }
+ },
+ validateConstraints: function () {
+ return checkSelectedEpisodeImportStatus.call(this, false);
+ }
+ });
+ $.extend(true, podcastEpisodeButtons[AIRTIME.widgets.Table.TOOLBAR_BUTTON_ROLES.EDIT],
+ {
+ eventHandlers: {
+ click: function () {
+ var episodes = mod.podcastEpisodeTableWidget.getSelectedRows();
+ AIRTIME.podcast.editSelectedEpisodes(episodes);
+ }
+ },
+ validateConstraints: function () {
+ return checkSelectedEpisodeImportStatus.call(this, true);
+ }
+ });
+ $.extend(true, podcastEpisodeButtons[AIRTIME.widgets.Table.TOOLBAR_BUTTON_ROLES.DELETE],
+ {
+ eventHandlers: {
+ click: function () {
+ var data = [], episodes = mod.podcastEpisodeTableWidget.getSelectedRows();
+ $.each(episodes, function () {
+ data.push({id: this.file.id, type: this.file.ftype});
+ });
+ console.log("podcast deletion:", data, mod.podcastEpisodeTableWidget);
+ AIRTIME.podcast.deleteSelectedEpisodes(data, mod.podcastEpisodeTableWidget);
+ }
+ },
+ validateConstraints: function () {
+ return checkSelectedEpisodeImportStatus.call(this, true);
+ }
+ });
+
+ // Reassign these because integer keys take precedence in iteration order - we want to order based on insertion
+ // FIXME: this is a pretty flimsy way to try to set up iteration order (possibly not xbrowser compatible?)
+ podcastEpisodeButtons = {
+ newBtn : podcastEpisodeButtons[AIRTIME.widgets.Table.TOOLBAR_BUTTON_ROLES.NEW],
+ editBtn: podcastEpisodeButtons[AIRTIME.widgets.Table.TOOLBAR_BUTTON_ROLES.EDIT],
+ delBtn : podcastEpisodeButtons[AIRTIME.widgets.Table.TOOLBAR_BUTTON_ROLES.DELETE]
+ };
+
+ $.extend(true, podcastEpisodeButtons, {
+ // addToScheduleBtn: {
+ // title : $.i18n._('Add to Schedule'),
+ // iconClass : '',
+ // extraBtnClass : 'btn-small',
+ // elementId : '',
+ // eventHandlers : {
+ // click: function () {
+ // var data = [], selected = mod.podcastEpisodeTableWidget.getSelectedRows();
+ // $.each(selected, function () { data.push(this.file); });
+ // mod.addToSchedule(data);
+ // }
+ // },
+ // validateConstraints: function () {
+ // // TODO: change text + behaviour for playlists, smart blocks, etc.
+ // return checkSelectedEpisodeImportStatus.call(this, true);
+ // }
+ // },
+ viewDescBtn: {
+ title : $.i18n._("View"),
+ iconClass : "icon-globe",
+ extraBtnClass : "btn-small",
+ elementId : "",
+ eventHandlers : {
+ click: mod.openPodcastEpisodeDialog
+ },
+ validateConstraints: function () {
+ return this.getSelectedRows().length == 1;
+ }
+ }
+ });
+
+ mod.podcastEpisodeTableWidget = AIRTIME.podcast.initPodcastEpisodeDatatable(
+ domNode,
+ podcastEpisodeButtons,
+ {
+ hideIngestCheckboxes: false,
+ emptyPlaceholder: {
+ iconClass: "icon-white icon-th-list",
+ html: $.i18n._("This podcast doesn't have any episodes!")
+ + "
" + $.i18n._("Make sure the RSS feed contains audio items (with enclosure tags).")
+ + "
" + $.i18n._("Learn about podcasts") + ""
+ }
+ }
+ );
+
+ mod.podcastEpisodeDataTable = mod.podcastEpisodeTableWidget.getDatatable();
+ mod.podcastEpisodeTableWidget.assignDblClickHandler(function () {
+ var data = mod.podcastEpisodeDataTable.fnGetData(this);
+ if (!$.isEmptyObject(data.file)) {
+ mod.dblClickAdd(data.file, data.file.ftype);
+ } else {
+ if (data.ingested >= 0) { // Only import if the file isn't pending
+ AIRTIME.podcast.importSelectedEpisodes([data], mod.podcastEpisodeTableWidget);
+ }
+ }
+ });
+
+ return mod.podcastEpisodeTableWidget;
+ };
+
/**
* Initialize the internal datatable for the podcast editor view to hold episode data passed back from the server.
*
* Selection for the internal table represents episodes marked for ingest and is disabled for ingested episodes.
*
* @param {jQuery} domNode the jQuery DOM node to create the table inside.
- * @param {Object} params JSON object containing datatables parameters to override
* @param {Object} buttons JSON object containing datatables button parameters
* @param {Object} config JSON object containing internal PodcastEpisodeTable parameters
* @param {boolean} config.hideIngestCheckboxes flag denoting whether or not to hide checkboxes for ingested items
@@ -684,7 +823,7 @@ var AIRTIME = (function (AIRTIME) {
_initPodcastEpisodeTable();
}
- var podcastEpisodesTableWidget = new PodcastEpisodeTable(
+ var podcastEpisodeTableObj = new PodcastEpisodeTable(
domNode, // DOM node to create the table inside.
true, // Enable item selection
buttons, // Toolbar buttons
@@ -692,8 +831,8 @@ var AIRTIME = (function (AIRTIME) {
config // Internal config
);
- podcastEpisodesTableWidget.getDatatable().addTitles("td");
- return podcastEpisodesTableWidget;
+ podcastEpisodeTableObj.getDatatable().addTitles("td");
+ return podcastEpisodeTableObj;
};
return AIRTIME;