From dfc6ae6273770db2110d4e819aa838d2e1efe7c9 Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Tue, 27 Mar 2012 15:46:25 +0200 Subject: [PATCH] CC-3463 : Usability improvements for timeline started to add cursor options to context menu. --- .../controllers/ShowbuilderController.php | 9 +++++++-- .../public/js/airtime/showbuilder/builder.js | 20 +++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/controllers/ShowbuilderController.php b/airtime_mvc/application/controllers/ShowbuilderController.php index fe6caad4f..ab16fdea9 100644 --- a/airtime_mvc/application/controllers/ShowbuilderController.php +++ b/airtime_mvc/application/controllers/ShowbuilderController.php @@ -99,7 +99,7 @@ class ShowbuilderController extends Zend_Controller_Action public function contextMenuAction() { $id = $this->_getParam('id'); - $now = time(); + $now = floatval(microtime(true)); $request = $this->getRequest(); $baseUrl = $request->getBaseUrl(); @@ -111,7 +111,12 @@ class ShowbuilderController extends Zend_Controller_Action $item = CcScheduleQuery::create()->findPK($id); $instance = $item->getCcShowInstances(); - if ($now < intval($item->getDbEnds("U")) && $user->canSchedule($instance->getDbShowId())) { + if ($now < floatval($item->getDbEnds("U.u")) && $user->canSchedule($instance->getDbShowId())) { + + //select the cursor + $menu["selCurs"] = array("name"=> "Select Cursor"); + $menu["delCurs"] = array("name"=> "Remove Cursor"); + //remove/truncate the item from the schedule $menu["del"] = array("name"=> "Delete", "icon" => "delete", "url" => "/showbuilder/schedule-remove"); } diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js index ff766f381..7ee39aa00 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js @@ -792,6 +792,26 @@ var AIRTIME = (function(AIRTIME){ data = $tr.data("aData"); function processMenuItems(oItems) { + + //define a select cursor. + if (oItems.selCurs !== undefined) { + + callback = function() { + $(this).parents('tr').next().addClass("cursor-selected-row"); + }; + + oItems.selCurs.callback = callback; + } + + //define a remove cursor. + if (oItems.delCurs !== undefined) { + + callback = function() { + $(this).parents('tr').next().removeClass("cursor-selected-row"); + }; + + oItems.delCurs.callback = callback; + } //define a delete callback. if (oItems.del !== undefined) {