From 94567ed046c7e4244e25bfa4ccfef1056b256fe1 Mon Sep 17 00:00:00 2001
From: Naomi <naomi@naomi-DX4840.(none)>
Date: Tue, 1 Mar 2011 12:25:20 -0500
Subject: [PATCH] CC-1969 made all menus left click activated instead to
 prevent mac problems. metadata for a file can now be seen by hovering over
 the "type" icon

---
 public/js/airtime/library/library.js             | 16 +++++-----------
 .../airtime/schedule/full-calendar-functions.js  |  2 +-
 public/js/contextmenu/jjmenu.js                  |  2 +-
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/public/js/airtime/library/library.js b/public/js/airtime/library/library.js
index e35cd2b1c..6bdc73014 100644
--- a/public/js/airtime/library/library.js
+++ b/public/js/airtime/library/library.js
@@ -52,7 +52,7 @@ function addLibraryItemEvents() {
 		});
 
 	$('#library_display tbody tr')
-		.jjmenu("rightClick", 
+		.jjmenu("click", 
 			[{get:"/Library/context-menu/format/json/id/#id#/type/#type#"}],  
 			{id: getId, type: getType}, 
 			{xposition: "mouse", yposition: "mouse"});
@@ -74,7 +74,7 @@ function dtRowCallback( nRow, aData, iDisplayIndex, iDisplayIndexFull ) {
 
 	$(nRow).attr("id", type+'_'+id);
 
-    $(nRow).qtip({
+    $('td:eq(5) img', nRow).qtip({
 
         content: {
             url: '/Library/get-file-meta-data',
@@ -85,20 +85,14 @@ function dtRowCallback( nRow, aData, iDisplayIndex, iDisplayIndexFull ) {
                button: 'Close' // Show a close link in the title
             }
          },
+        
          position: {
-            corner: {
-               //target: 'leftMiddle'
-               tooltip: 'rightMiddle'
-            },
+        
             adjust: {
                screen: true // Keep the tooltip on-screen at all times
             }
          },
-         show: { 
-            when: 'click', 
-            solo: true // Only show one tooltip at a time
-         },
-         hide: 'click',
+        
          style: {
             border: {
                width: 0,
diff --git a/public/js/airtime/schedule/full-calendar-functions.js b/public/js/airtime/schedule/full-calendar-functions.js
index 6a6aadc5c..164721d92 100644
--- a/public/js/airtime/schedule/full-calendar-functions.js
+++ b/public/js/airtime/schedule/full-calendar-functions.js
@@ -177,7 +177,7 @@ function eventRender(event, element, view) {
 function eventAfterRender( event, element, view ) {
 
     $(element)
-		.jjmenu("rightClick", 
+		.jjmenu("click", 
 			[{get:"/Schedule/make-context-menu/format/json/id/#id#"}],  
 			{id: event.id}, 
 			{xposition: "mouse", yposition: "mouse"});
diff --git a/public/js/contextmenu/jjmenu.js b/public/js/contextmenu/jjmenu.js
index 48f75ea4b..bff93d932 100644
--- a/public/js/contextmenu/jjmenu.js
+++ b/public/js/contextmenu/jjmenu.js
@@ -44,7 +44,7 @@
 		{
 			global.click( 
                     function(event) {
-                        if (this == event.target) {
+                        if (this == event.currentTarget) {
                             global.pageX = event.pageX;
                             global.pageY = event.pageY;
         					event.preventDefault();