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

SAAS-948

Browse source
This commit is contained in:
Duncan Sommerville 2015-08-07 19:20:29 -04:00
parent cdc9f88c1c
commit bf6244c835
7 changed files with 39 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

28
airtime_mvc/public/js/airtime/library/_spl.js
View file

@ -34,8 +34,8 @@ var AIRTIME = (function(AIRTIME){
function playlistError(json) {
alert(json.error);
closeTab();
openPlaylist(json);
//closeTab();
//openPlaylist(json);
}
function stopAudioPreview() {
@ -827,7 +827,10 @@ var AIRTIME = (function(AIRTIME){
if (json.error !== undefined) {
alert(json.error);
}
$pl.find(".editor_pane_wrapper").empty().append(json.html);
if (json.html !== undefined) {
closeTab();
openPlaylist(json);
}
if (json.result == "0") {
$pl.find('.success').text($.i18n._('Playlist shuffled'));
$pl.find('.success').show();
@ -964,7 +967,8 @@ var AIRTIME = (function(AIRTIME){
alert(json.error);
}
if (json.html !== undefined) {
AIRTIME.playlist.fnOpenPlaylist(json);
closeTab();
openPlaylist(json);
}
setModified(json.modified);
if (obj_type == "block") {
@ -981,7 +985,7 @@ var AIRTIME = (function(AIRTIME){
);
});
$pl.find("#pl-bl-clear-content").live("click", function(event) {
$pl.find("#pl-bl-clear-content").unbind().on("click", function(event) {
var sUrl = baseUrl+"new-playlist/empty-content",
oData = {};
playlistRequest(sUrl, oData);
@ -1483,13 +1487,13 @@ var AIRTIME = (function(AIRTIME){
mod.init = function() {
AIRTIME.playlist.setAsActive();
$pl.delegate("#spl_delete", {"click": function(ev){
AIRTIME.playlist.fnDelete();
}});
$pl.delegate("#ws_delete", {"click": function(ev){
AIRTIME.playlist.fnWsDelete();
}});
//$pl.delegate("#spl_delete", {"click": function(ev){
// AIRTIME.playlist.fnDelete();
//}});
//
//$pl.delegate("#ws_delete", {"click": function(ev){
// AIRTIME.playlist.fnWsDelete();
//}});
$pl.delegate(".pl-waveform-cues-btn", {"click": function(ev){
AIRTIME.playlist.showCuesWaveform(ev);