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

Merge branch 'devel' into cc-1960-internationalize-airtime

Browse source 
Conflicts:
	airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
This commit is contained in:
denise 2012-11-21 11:44:40 -05:00
commit 10b6dd202e
24 changed files with 370 additions and 393 deletions
Download patch file Download diff file Expand all files Collapse all files

1
airtime_mvc/public/js/airtime/library/spl.js
View file

@ -655,6 +655,7 @@ var AIRTIME = (function(AIRTIME){
$pl.find('.success').show();
}
disableLoadingIcon();
setTimeout(removeSuccessMsg, 5000);
});
})

2
airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
View file

@ -400,7 +400,7 @@ function setupUI() {
$(".repeat_tracks_help_icon").qtip({
content: {
text: $.i18n._("If your criteria is too strict, Airtime may not be able to fill up the desired smart block length. Hence, if you check this option, tracks will be used more than once.")
text: $.i18n._("The desired block length will not be reached if Airtime cannot find enough unique tracks to match your criteria. Enable this option if you wish to allow tracks to be added multiple times to the smart block.")
},
hide: {
delay: 500,