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

Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder

Browse source
This commit is contained in:
Albert Santoni 2015-08-10 12:23:30 -04:00
commit 974f979bef
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);

18
airtime_mvc/public/js/airtime/library/events/_library_showbuilder.js
View file

@ -102,10 +102,11 @@ var AIRTIME = (function(AIRTIME) {
return container;
},
cursor: 'pointer',
cursorAt: {
top: 30,
left: 100
},
//cursorAt: {
// top: 30,
// right: 10
//},
distance: 25, // min-distance for dragging
connectToSortable: '#show_builder_table'
});
} else {
@ -142,10 +143,11 @@ var AIRTIME = (function(AIRTIME) {
return container;
},
cursor: 'pointer',
cursorAt: {
top: 30,
left: 100
},
//cursorAt: {
// top: 30,
// right: 10
//},
distance: 25, // min-distance for dragging
connectToSortable: '.active-tab .spl_sortable'
});
}

45
airtime_mvc/public/js/airtime/showbuilder/_builder.js
View file

@ -775,51 +775,6 @@ var AIRTIME = (function(AIRTIME){
"bScrollCollapseY": false
});
//$sbTable.find("tbody").on("mousedown", "tr:not(.sb-past, .sb-empty)", function(ev) {
//
// var $tr = $(this),
// // Get the ID of the selected row
// $rowId = $tr.attr("id");
//
// if (ev.shiftKey && $previouslySelected !== undefined) {
// if ($previouslySelected.attr("id") == $rowId) {
// return;
// }
//
// // If the selected row comes before the previously selected row,
// // we want to select previous rows, otherwise we select next
// if ($previouslySelected.prevAll("#"+$rowId).length !== 0) {
// $previouslySelected.prevUntil($tr).each(function(i, el){
// $(el).addClass(SB_SELECTED_CLASS);
// });
// } else {
// $previouslySelected.nextUntil($tr).each(function(i, el){
// $(el).addClass(SB_SELECTED_CLASS);
// });
// }
// $tr.addClass(SB_SELECTED_CLASS);
// } else if (ev.ctrlKey && $previouslySelected !== undefined) {
// $tr.addClass(SB_SELECTED_CLASS);
// } else {
// if (!$tr.hasClass(SB_SELECTED_CLASS)) {
// $("."+SB_SELECTED_CLASS).removeClass(SB_SELECTED_CLASS);
// }
// $tr.addClass(SB_SELECTED_CLASS);
// }
//
// // Remember this row so we can properly multiselect
// $previouslySelected = $tr;
//
// mod.checkToolBarIcons();
//});
//
//$sbTable.find("tbody").on("click", "tr:not(.sb-past, .sb-empty)", function(ev) {
// if (!ev.ctrlKey && !ev.shiftKey) {
// $("."+SB_SELECTED_CLASS).removeClass(SB_SELECTED_CLASS);
// $(this).addClass(SB_SELECTED_CLASS);
// }
//});
$sbTable.find("tbody").on("mousedown", "tr:not(.sb-past, .sb-empty)", function(ev) {
var $tr = $(this),
// Get the ID of the selected row