From bdc9707052178857e601c4d73ddb1edf5adaca2b Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Sat, 4 Feb 2012 02:07:32 +0100 Subject: [PATCH] CC-2970 : playlist drop indicator looking into customizing the placeholder, connected library to playlist sortable. --- airtime_mvc/application/Bootstrap.php | 3 ++- .../js/airtime/library/events/library_playlistbuilder.js | 6 ++++-- airtime_mvc/public/js/airtime/library/spl.js | 6 ++++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php index 5ba9d7dd5..229ddad0f 100644 --- a/airtime_mvc/application/Bootstrap.php +++ b/airtime_mvc/application/Bootstrap.php @@ -65,7 +65,8 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap $baseUrl = Zend_Controller_Front::getInstance()->getBaseUrl(); $view->headScript()->appendFile($baseUrl.'/js/libs/jquery-1.7.1.min.js','text/javascript'); - $view->headScript()->appendFile($baseUrl.'/js/libs/jquery-ui-1.8.11.custom.min.js','text/javascript'); + //$view->headScript()->appendFile($baseUrl.'/js/libs/jquery-ui-1.8.11.custom.min.js','text/javascript'); + $view->headScript()->appendFile('https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js'); $view->headScript()->appendFile($baseUrl.'/js/libs/jquery.stickyPanel.js','text/javascript'); $view->headScript()->appendFile($baseUrl.'/js/qtip/jquery.qtip.min.js','text/javascript'); $view->headScript()->appendFile($baseUrl.'/js/jplayer/jquery.jplayer.min.js'); 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 4d9a9186b..a2aed00bc 100644 --- a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js +++ b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js @@ -13,8 +13,9 @@ function fnLibraryTableRowCallback( nRow, aData, iDisplayIndex, iDisplayIndexFul function fnLibraryTableDrawCallback() { $('#library_display tr[id ^= "au"]').draggable({ - //helper: 'clone', - helper: function(ev, el) { + helper: 'clone', + /* + helper: function(ev) { var data, li; data = $(ev.currentTarget).data("aData"); @@ -24,6 +25,7 @@ function fnLibraryTableDrawCallback() { return li; }, + */ cursor: 'pointer', connectToSortable: '#spl_sortable' }); diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js index 0a32d92f1..3b2f99fe8 100644 --- a/airtime_mvc/public/js/airtime/library/spl.js +++ b/airtime_mvc/public/js/airtime/library/spl.js @@ -458,6 +458,12 @@ function setUpSPL() { placeholder: "placeholder lib-placeholder ui-state-highlight", forcePlaceholderSize: true, handle: 'div.list-item-container', + start: function(event, ui) { + ui.placeholder.html("PLACE HOLDER") + .width("99.5%") + .height(56) + .append('
'); + }, receive: fnReceive, update: fnUpdate };