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

CC-3724 : Now Playing -> Timeline view: to drag and drop single file very fast will block adding the same file

Browse source
This commit is contained in:
Naomi Aro 2012-05-04 11:50:51 +02:00
parent 4a7f52e22a
commit 12a5f17ff5
3 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js
View file

@ -28,6 +28,13 @@ var AIRTIME = (function(AIRTIME){
mod.fnRowCallback = function( nRow, aData, iDisplayIndex, iDisplayIndexFull ) { mod.fnRowCallback = function( nRow, aData, iDisplayIndex, iDisplayIndexFull ) {
var $nRow = $(nRow); var $nRow = $(nRow);
if (aData.ftype === "audioclip") {
$nRow.addClass("lib-audio");
}
else {
$nRow.addClass("lib-pl");
}
$nRow.attr("id", aData["tr_id"]) $nRow.attr("id", aData["tr_id"])
.data("aData", aData) .data("aData", aData)
.data("screen", "playlist"); .data("screen", "playlist");
@ -38,7 +45,7 @@ var AIRTIME = (function(AIRTIME){
mod.redrawChosen(); mod.redrawChosen();
mod.checkToolBarIcons(); mod.checkToolBarIcons();
$('#library_display tr[id ^= "au"]').draggable({ $('#library_display tr.lib-audio').draggable({
helper: function(){ helper: function(){
mod.selectItem($(this)); mod.selectItem($(this));

9
airtime_mvc/public/js/airtime/library/events/library_showbuilder.js
View file

@ -28,6 +28,13 @@ var AIRTIME = (function(AIRTIME){
mod.fnRowCallback = function( nRow, aData, iDisplayIndex, iDisplayIndexFull ) { mod.fnRowCallback = function( nRow, aData, iDisplayIndex, iDisplayIndexFull ) {
var $nRow = $(nRow); var $nRow = $(nRow);
if (aData.ftype === "audioclip") {
$nRow.addClass("lib-audio");
}
else {
$nRow.addClass("lib-pl");
}
$nRow.attr("id", aData["tr_id"]) $nRow.attr("id", aData["tr_id"])
.data("aData", aData) .data("aData", aData)
.data("screen", "timeline"); .data("screen", "timeline");
@ -38,7 +45,7 @@ var AIRTIME = (function(AIRTIME){
mod.redrawChosen(); mod.redrawChosen();
mod.checkToolBarIcons(); mod.checkToolBarIcons();
$('#library_display tr:not(:first)').draggable({ $('#library_display tr.lib-audio, tr.lib-pl').draggable({
helper: function(){ helper: function(){
mod.selectItem($(this)); mod.selectItem($(this));

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

@ -241,10 +241,7 @@ var AIRTIME = (function(AIRTIME) {
"bServerSide": true, "bServerSide": true,
"aLengthMenu": [[5, 10, 15, 20, 25, 50, 100], [5, 10, 15, 20, 25, 50, 100]], "aLengthMenu": [[5, 10, 15, 20, 25, 50, 100], [5, 10, 15, 20, 25, 50, 100]],
//"sScrollX": "100%",
//"sScrollXInner": "110%",
"bStateSave": true, "bStateSave": true,
"fnStateSaveParams": function (oSettings, oData) { "fnStateSaveParams": function (oSettings, oData) {
//remove oData components we don't want to save. //remove oData components we don't want to save.