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

Merge branch 'saas-dev' into soundcloud

Browse source 
Conflicts:
	airtime_mvc/application/configs/constants.php
This commit is contained in:
Duncan Sommerville 2015-06-24 16:35:06 -04:00
commit 8fcaf7fc74
4 changed files with 116 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

22
airtime_mvc/public/js/airtime/library/library.js
View file

@ -711,17 +711,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: {
@ -744,7 +746,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();
}
}
},