From a3f1cf1d5623ef9e15ae2615aeadf6bc702a3790 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Mon, 22 Jun 2015 10:46:29 -0400 Subject: [PATCH] CC-6060 - Fix breaking tooltips when viewing context menu in library --- .../public/js/airtime/library/library.js | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index fbe7cb5d5..4edf022ad 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -720,17 +720,19 @@ var AIRTIME = (function(AIRTIME) { // icon. $(nRow).find("td:not(.library_checkbox, .library_type)").qtip({ content: { - text: $.i18n._("Loading..."), + text: function(event, api) { + $.get(baseUrl+"library/get-file-metadata", + ({format: "html", id : aData.id, type: aData.ftype}), + function (html) { + api.set('content.text', html); + }, "html") + .fail(function (xhr, status, error) { + api.set('content.text', status + ': ' + error) + }); + return 'Loading...'; + }, title: { text: aData.track_title - }, - ajax: { - url: baseUrl+"Library/get-file-metadata", - type: "get", - data: ({format: "html", id : aData.id, type: aData.ftype}), - success: function(data, status) { - this.set('content.text', data); - } } }, position: { @@ -753,7 +755,7 @@ var AIRTIME = (function(AIRTIME) { show: function(event, api) { // Only show the tooltip if it was a right-click if(event.originalEvent.button !== 2) { - event.preventDefault(); + event.preventDefault(); } } },