Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x

This commit is contained in:
James 2012-06-29 16:07:17 -04:00
parent 06ac33b130 7ea106e0d3
commit 32350c5246
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
airtime_mvc/application/controllers/ApiController.php
View File

@ -134,8 +134,9 @@ class ApiController extends Zend_Controller_Action
*/ */
if (!$file_base_name) { if (!$file_base_name) {
$file_base_name = $full_path; $file_base_name = $full_path;
} } else {
$file_base_name = substr($file_base_name, 1); $file_base_name = substr($file_base_name, 1);
}
// possibly use fileinfo module here in the future. // possibly use fileinfo module here in the future.
// http://www.php.net/manual/en/book.fileinfo.php // http://www.php.net/manual/en/book.fileinfo.php
$ext = pathinfo($fileID, PATHINFO_EXTENSION); $ext = pathinfo($fileID, PATHINFO_EXTENSION);

10
airtime_mvc/public/js/airtime/showbuilder/builder.js
View File

@ -679,7 +679,15 @@ var AIRTIME = (function(AIRTIME){
//re-highlight selected cursors before draw took place //re-highlight selected cursors before draw took place
for (i = 0; i < cursorIds.length; i++) { for (i = 0; i < cursorIds.length; i++) {
$tr = $table.find("tr[id="+cursorIds[i]+"][si_id="+showInstanceIds[i]+"]"); $tr = $table.find("tr[id="+cursorIds[i]+"][si_id="+showInstanceIds[i]+"]");
mod.selectCursor($tr);
/* If the currently playing track's cursor is selected,
* and that track is deleted, the cursor position becomes
* unavailble. We have to check the position is available
* before re-highlighting it.
*/
if ($tr.find(".sb-checkbox").children().hasClass("innerWrapper")) {
mod.selectCursor($tr);
}
} }
//if there is only 1 cursor on the page highlight it by default. //if there is only 1 cursor on the page highlight it by default.