Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some behaviour with playlist/smartblock fade button

This commit is contained in:
Duncan Sommerville 2015-09-08 16:39:33 -04:00
parent d18d52a37a
commit 63784d4e6b
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
airtime_mvc/application/views/scripts/playlist/playlist.phtml
View File

@ -43,10 +43,10 @@ if (isset($this->obj)) {
<div class='btn-group'> <div class='btn-group'>
<button class="btn" title='<?php echo _("Shuffle playlist") ?>' type="button" id="playlist_shuffle_button"><?php echo _("Shuffle") ?></button> <button class="btn" title='<?php echo _("Shuffle playlist") ?>' type="button" id="playlist_shuffle_button"><?php echo _("Shuffle") ?></button>
</div> </div>
<div class='btn-group' style="display:<?php echo $count > 0 ?"inherit;":"none;"?>"> <div class='btn-group'>
<a href="#" id="spl_crossfade" class="btn crossfade-main-button"> <button id="spl_crossfade" class="btn crossfade-main-button" <?php if ($count <= 0) echo "disabled=disabled"; ?>>
<i class='crossfade-main-icon'></i><span class="ui-button-text"><?php echo _("Playlist crossfade") ?></span> <i class='crossfade-main-icon'></i><span class="ui-button-text"><?php echo _("Playlist crossfade") ?></span>
</a> </button>
</div> </div>
<div class='btn-group'> <div class='btn-group'>
<button class="btn btn-danger" title='<?php echo _("Empty playlist content") ?>' type="button" id="pl-bl-clear-content"><?php echo _("Clear") ?></button> <button class="btn btn-danger" title='<?php echo _("Empty playlist content") ?>' type="button" id="pl-bl-clear-content"><?php echo _("Clear") ?></button>

4
airtime_mvc/application/views/scripts/playlist/smart-block.phtml
View File

@ -51,8 +51,8 @@ if (isset($this->obj)) {
<div class='btn-group'> <div class='btn-group'>
<?php echo $this->form->getElement('shuffle_button');?> <?php echo $this->form->getElement('shuffle_button');?>
</div> </div>
<div class='btn-group' style="display:<?php echo ($this->obj->isStatic() && $count > 0) ?"inherit;":"none;"?>"> <div class='btn-group'>
<a href="#" id="spl_crossfade" class="btn crossfade-main-button"> <a href="#" id="spl_crossfade" class="btn crossfade-main-button" <?php if (!$this->obj->isStatic() || $count <= 0) echo "disabled=disabled"; ?>>
<i class='crossfade-main-icon'></i><span class="ui-button-text"><?php echo _("Playlist crossfade") ?></span> <i class='crossfade-main-icon'></i><span class="ui-button-text"><?php echo _("Playlist crossfade") ?></span>
</a> </a>
</div> </div>

8
airtime_mvc/public/js/airtime/library/spl.js
View File

@ -406,7 +406,7 @@ var AIRTIME = (function(AIRTIME){
var empty = $pl.find(".spl_empty"); var empty = $pl.find(".spl_empty");
if (!show || empty.length > 0) { if (!show || empty.length > 0) {
$pl.find("#spl_crossfade").hide(); //$pl.find("#spl_crossfade").hide();
} else { } else {
//get list of playlist contents //get list of playlist contents
var list = contents.children(); var list = contents.children();
@ -416,7 +416,7 @@ var AIRTIME = (function(AIRTIME){
var last = list.last(); var last = list.last();
if (first.find(':first-child').children().attr('blockid') !== undefined && if (first.find(':first-child').children().attr('blockid') !== undefined &&
last.find(':first-child').children().attr('blockid') !== undefined) { last.find(':first-child').children().attr('blockid') !== undefined) {
$pl.find("#spl_crossfade").hide(); //$pl.find("#spl_crossfade").hide();
} else { } else {
$pl.find("#spl_crossfade").show(); $pl.find("#spl_crossfade").show();
} }
@ -783,7 +783,7 @@ var AIRTIME = (function(AIRTIME){
fadeIn.parent().prev().hide(); fadeIn.parent().prev().hide();
fadeIn.hide(); fadeIn.hide();
} else { } else {
console.log(json.fadeIn); //console.log(json.fadeIn);
//console.log(fadeIn.val()); //console.log(fadeIn.val());
fadeIn.parent().prev().show(); fadeIn.parent().prev().show();
fadeIn.show(); fadeIn.show();
@ -1095,7 +1095,7 @@ var AIRTIME = (function(AIRTIME){
aSelected = AIRTIME.library.getSelectedData(); aSelected = AIRTIME.library.getSelectedData();
for (i = 0, length = aSelected.length; i < length; i++) { for (i = 0, length = aSelected.length; i < length; i++) {
console.log(aSelected[i]); //console.log(aSelected[i]);
aItems.push(new Array(aSelected[i].id, aSelected[i].ftype)); aItems.push(new Array(aSelected[i].id, aSelected[i].ftype));
} }

1
python_apps/airtime-celery/airtime-celery/tasks.py
View File

@ -38,6 +38,7 @@ def soundcloud_upload(data, token, file_path):
@celery.task(name='soundcloud-download', acks_late=True) @celery.task(name='soundcloud-download', acks_late=True)
def soundcloud_download(token, callback_url, track_id=None): def soundcloud_download(token, callback_url, track_id=None):
""" """
This is in stasis
:param token: OAuth2 client access token :param token: OAuth2 client access token
:param track_id: SoundCloud track identifier :param track_id: SoundCloud track identifier