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

Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev

This commit is contained in:
Duncan Sommerville 2015-09-09 17:25:45 -04:00
parent fb1ee2e284 bd4fc62e04
commit 1649d9db77
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,11 +65,12 @@ if (isset($this->obj)) {
<div id="crossfade_main" class="crossfade-main clearfix" style="display:none;"> <div id="crossfade_main" class="crossfade-main clearfix" style="display:none;">
<span class="ui-icon ui-icon-closethick"></span> <span class="ui-icon ui-icon-closethick"></span>
<dl id="spl_editor-main" class="inline-list"> <dl id="spl_editor-main" class="inline-list">
<dt><?php echo _("Fade in: "); ?><span class='spl_cue_hint'><?php echo _("(ss.t)")?></span></dt> <dt><?php echo _("Fade in: "); ?></dt>
<dd><span contenteditable="true" class="spl_text_input spl_main_fade_in">00</span></dd> <dd>
<input class="spl_main_fade_in playlist_main_fade_input" value="0" /><span class='spl_cue_hint'> seconds</span></dd>
<dd class="edit-error"></dd> <dd class="edit-error"></dd>
<dt><?php echo _("Fade out: "); ?><span class='spl_cue_hint'><?php echo _("(ss.t)")?></span></dt> <dt><?php echo _("Fade out: "); ?></dt>
<dd><span contenteditable="true" class="spl_text_input spl_main_fade_out">00</span></dd> <dd><input class="spl_main_fade_out playlist_main_fade_input" value="0" /><span class='spl_cue_hint'> seconds</span></dd></dd>
<dd class="edit-error"></dd> <dd class="edit-error"></dd>
</dl> </dl>
</div> </div>

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

@ -778,13 +778,11 @@ var AIRTIME = (function(AIRTIME){
} }
else { else {
var fadeIn = $pl.find("input.spl_main_fade_in"); var fadeIn = $pl.find("input.spl_main_fade_in");
var fadeOut = $pl.find("span.spl_main_fade_out"); var fadeOut = $pl.find("input.spl_main_fade_out");
if (json.fadeIn == null) { if (json.fadeIn == null) {
fadeIn.parent().prev().hide(); fadeIn.parent().prev().hide();
fadeIn.hide(); fadeIn.hide();
} else { } else {
//console.log(json.fadeIn);
//console.log(fadeIn.val());
fadeIn.parent().prev().show(); fadeIn.parent().prev().show();
fadeIn.show(); fadeIn.show();
fadeIn.val(json.fadeIn); fadeIn.val(json.fadeIn);
@ -796,7 +794,8 @@ var AIRTIME = (function(AIRTIME){
} else { } else {
fadeOut.parent().prev().show(); fadeOut.parent().prev().show();
fadeOut.show(); fadeOut.show();
fadeOut.empty().append(json.fadeOut); fadeOut.val(json.fadeOut);
fadeOut.text(json.fadeOut);
} }
if (json.fadeIn != null || json.fadeOut != null) { if (json.fadeIn != null || json.fadeOut != null) {
$pl.find("#crossfade_main").show(); $pl.find("#crossfade_main").show();