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

putting back popups in playlist so context menu will still work.

This commit is contained in:
naomiaro 2010-10-18 07:03:48 -04:00
parent 321c698c40
commit 4acc4cf715
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htmlUI/templates/script/collector.js.tpl
View File

@ -30,6 +30,7 @@ function collector_submit(formname, action, script, name, width, height)
else { else {
//alert(action); //alert(action);
/*
if(action === 'PL.removeItem') { if(action === 'PL.removeItem') {
$.post(script + '?act=' + action + href, $.post(script + '?act=' + action + href,
@ -51,6 +52,9 @@ function collector_submit(formname, action, script, name, width, height)
else { else {
hpopup(script + '?act=' + action + href); hpopup(script + '?act=' + action + href);
} }
*/
hpopup(script + '?act=' + action + href);
} }
} }

12
htmlUI/ui_handler.php
View File

@ -319,8 +319,9 @@ switch ($_REQUEST['act']) {
$uiHandler->SCRATCHPAD->addItem($_REQUEST['id']); $uiHandler->SCRATCHPAD->addItem($_REQUEST['id']);
} }
} }
die('{"jsonrpc" : "2.0"}'); $uiHandler->PLAYLIST->setReload();
break;
case "PL.setClipLength": case "PL.setClipLength":
$uiHandler->PLAYLIST->setClipLength($_REQUEST['pos'], $_REQUEST['cueIn'], $_REQUEST['cueOut']); $uiHandler->PLAYLIST->setClipLength($_REQUEST['pos'], $_REQUEST['cueIn'], $_REQUEST['cueOut']);
break; break;
@ -331,10 +332,9 @@ switch ($_REQUEST['act']) {
case "PL.removeItem": case "PL.removeItem":
$uiHandler->PLAYLIST->removeItem($_REQUEST['id']); $uiHandler->PLAYLIST->removeItem($_REQUEST['id']);
//$uiHandler->PLAYLIST->setReload(); $uiHandler->PLAYLIST->setReload();
//break; break;
die('{"jsonrpc" : "2.0"}');
case "PL.release": case "PL.release":
$uiHandler->PLAYLIST->release(); $uiHandler->PLAYLIST->release();
$uiHandler->PLAYLIST->setReload(); $uiHandler->PLAYLIST->setReload();