From 4acc4cf715a0291f1342cccb82f2a4bdf1693af4 Mon Sep 17 00:00:00 2001
From: naomiaro <naomiaro@gmail.com>
Date: Mon, 18 Oct 2010 07:03:48 -0400
Subject: [PATCH] putting back popups in playlist so context menu will still
 work.

---
 htmlUI/templates/script/collector.js.tpl |  4 ++++
 htmlUI/ui_handler.php                    | 12 ++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/htmlUI/templates/script/collector.js.tpl b/htmlUI/templates/script/collector.js.tpl
index bb0c14cf5..c95d66d29 100644
--- a/htmlUI/templates/script/collector.js.tpl
+++ b/htmlUI/templates/script/collector.js.tpl
@@ -30,6 +30,7 @@ function collector_submit(formname, action, script, name, width, height)
     else {
         //alert(action);
 
+        /*
         if(action === 'PL.removeItem') {
 
     		$.post(script + '?act=' + action + href,
@@ -51,6 +52,9 @@ function collector_submit(formname, action, script, name, width, height)
         else {
         	hpopup(script + '?act=' + action + href);
         }
+        */
+
+        hpopup(script + '?act=' + action + href);
     }
 }
 
diff --git a/htmlUI/ui_handler.php b/htmlUI/ui_handler.php
index 7a0279654..f399c3700 100644
--- a/htmlUI/ui_handler.php
+++ b/htmlUI/ui_handler.php
@@ -319,8 +319,9 @@ switch ($_REQUEST['act']) {
     	    	$uiHandler->SCRATCHPAD->addItem($_REQUEST['id']);
     	    }
         }
-	    die('{"jsonrpc" : "2.0"}');
-
+        $uiHandler->PLAYLIST->setReload();
+        break;
+	   
     case "PL.setClipLength":
 	    $uiHandler->PLAYLIST->setClipLength($_REQUEST['pos'], $_REQUEST['cueIn'], $_REQUEST['cueOut']);
 	    break;
@@ -331,10 +332,9 @@ switch ($_REQUEST['act']) {
 
     case "PL.removeItem":
 	    $uiHandler->PLAYLIST->removeItem($_REQUEST['id']);
-	    //$uiHandler->PLAYLIST->setReload();
-	    //break;
-	    die('{"jsonrpc" : "2.0"}');
-
+	    $uiHandler->PLAYLIST->setReload();
+	    break;
+	   
     case "PL.release":
 	    $uiHandler->PLAYLIST->release();
 	    $uiHandler->PLAYLIST->setReload();