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

CC-3174 : showbuilder/library

Browse source 
playlist fades are working again, still need more error checking to be done.
This commit is contained in:
Naomi Aro 2012-02-05 23:38:12 +01:00
parent fbec92cb0d
commit 16863ee95e
7 changed files with 105 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -215,7 +215,6 @@ function fnCreatedRow( nRow, aData, iDataIndex ) {
//call the context menu so we can prevent the event from propagating.
$(nRow).find('td:not(.library_checkbox):not(.library_type)').click(function(e){
var x;
$(this).contextMenu();
@ -390,7 +389,7 @@ $(document).ready(function() {
setInterval( checkSCUploadStatus, 5000 );
addQtipToSCIcons();
$.contextMenu({
selector: '#library_display td:not(.library_checkbox):not(.library_type)',
trigger: "left",

38
airtime_mvc/public/js/airtime/library/spl.js
View file

@ -114,10 +114,10 @@ var AIRTIME = (function(AIRTIME){
function changeFadeIn(event) {
event.stopPropagation();
var pos, url, fadeIn, li, unqid;
var id, url, fadeIn, li, unqid;
span = $(this);
pos = span.parent().attr("id").split("_").pop();
id = span.parent().attr("id").split("_").pop();
url = "/Playlist/set-fade";
fadeIn = $.trim(span.text());
li = span.parent().parent().parent().parent();
@ -128,7 +128,7 @@ var AIRTIME = (function(AIRTIME){
return;
}
$.post(url, {format: "json", fadeIn: fadeIn, pos: pos}, function(json){
$.post(url, {format: "json", fadeIn: fadeIn, id: id}, function(json){
if(json.response !== undefined && json.response.error) {
showError(span, json.response.error);
@ -146,10 +146,10 @@ var AIRTIME = (function(AIRTIME){
function changeFadeOut(event) {
event.stopPropagation();
var pos, url, fadeOut, li, unqid;
var id, url, fadeOut, li, unqid;
span = $(this);
pos = span.parent().attr("id").split("_").pop();
id = span.parent().attr("id").split("_").pop();
url = "/Playlist/set-fade";
fadeOut = $.trim(span.text());
li = span.parent().parent().parent().parent();
@ -160,7 +160,7 @@ var AIRTIME = (function(AIRTIME){
return;
}
$.post(url, {format: "json", fadeOut: fadeOut, pos: pos}, function(json){
$.post(url, {format: "json", fadeOut: fadeOut, id: id}, function(json){
if(json.response !== undefined && json.response.error) {
showError(span, json.response.error);
return;
@ -341,7 +341,7 @@ var AIRTIME = (function(AIRTIME){
else {
$(this).addClass("ui-state-active");
var url = '/Playlist/set-playlist-fades';
var url = '/Playlist/get-playlist-fades';
$.get(url, {format: "json"}, function(json){
if(json.playlist_error == true){
@ -425,21 +425,15 @@ var AIRTIME = (function(AIRTIME){
}
$.post(url, {format: "json", fadeIn: fadeIn}, function(json){
if(json.playlist_error == true){
alertPlaylistErrorAndReload();
}
if(json.response.error) {
return;
}
hideError(span);
hideError(span);
});
});
playlist.find("#spl_fade_out_main span:first").on("blur", function(event){
playlist.find("#spl_fade_out_main span:last").on("blur", function(event){
event.stopPropagation();
var url, fadeIn, span;
var url, fadeOut, span;
span = $(this);
url = "/Playlist/set-playlist-fades";
@ -451,14 +445,8 @@ var AIRTIME = (function(AIRTIME){
}
$.post(url, {format: "json", fadeOut: fadeOut}, function(json){
if(json.playlist_error == true){
alertPlaylistErrorAndReload();
}
if(json.response.error) {
return;
}
hideError(span);
hideError(span);
});
});