diff --git a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js index 0c8c48ff3..a82614246 100644 --- a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js +++ b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js @@ -7,30 +7,14 @@ function fnLibraryTableRowCallback( nRow, aData, iDisplayIndex, iDisplayIndexFul [{get:"/Library/context-menu/format/json/id/#id#/type/#type#"}], {id: aData["id"], type: aData["ftype"]}, {xposition: "mouse", yposition: "mouse"}); - - return nRow; } function fnLibraryTableDrawCallback() { - addLibraryItemEvents(); -} - -function addLibraryItemEvents() { - - $('#library_display tr[id ^= "au"]') - .draggable({ - helper: 'clone', - cursor: 'pointer' - }); - - /* - $('#library_display tbody tr td').not('[class=library_checkbox]') - .jjmenu("click", - [{get:"/Library/context-menu/format/json/id/#id#/type/#type#"}], - {id: getId, type: getType}, - {xposition: "mouse", yposition: "mouse"}); - */ - + + $('#library_display tr[id ^= "au"]').draggable({ + helper: 'clone', + cursor: 'pointer' + }); } /* diff --git a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js index d445fbd00..9ef94f183 100644 --- a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js +++ b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js @@ -6,22 +6,15 @@ function fnLibraryTableRowCallback( nRow, aData, iDisplayIndex, iDisplayIndexFul //save some info for reordering purposes. jRow.data({"aData": aData}); - - return nRow; } function fnLibraryTableDrawCallback() { - addLibraryItemEvents(); -} - -function addLibraryItemEvents() { - - $('#library_display tr:not(:first)') - .draggable({ - helper: 'clone', - cursor: 'pointer', - connectToSortable: '#show_builder_table' - }); + + $('#library_display tr:not(:first)').draggable({ + helper: 'clone', + cursor: 'pointer', + connectToSortable: '#show_builder_table' + }); } function setupLibraryToolbar() {