Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
Yuchen Wang 2011-11-16 19:45:48 -05:00
commit d836425931
8 changed files with 30 additions and 10 deletions

View file

@ -2,9 +2,12 @@ function showErrorSections() {
$(".errors").each(function(i){
if($(this).length > 0){
$(window).scrollTop($(this).closest("div").position().top);
$(this).closest("fieldset").removeClass('closed');
return false;
var div = $(this).closest("div")
if(div.attr('class') == "stream-setting-content"){
$(this).closest("div").show();
$(this).closest("fieldset").removeClass('closed');
$(window).scrollTop($(this).closest("div").position().top);
}
}
});
}

View file

@ -40,7 +40,7 @@ function createDateInput(el, onSelect) {
function autoSelect(event, ui) {
$("#add_show_hosts-"+ui.item.value).attr("checked", "checked");
$("#add_show_hosts-"+ui.item.index).attr("checked", "checked");
event.preventDefault();
}
@ -50,11 +50,21 @@ function findHosts(request, callback) {
url = "/User/get-hosts";
search = request.term;
var noResult = new Array();
noResult[0] = new Array();
noResult[0]['value'] = $("#add_show_hosts_autocomplete").val();
noResult[0]['label'] = "No result found";
noResult[0]['index'] = null;
$.post(url,
{format: "json", term: search},
function(json) {
callback(json.hosts);
if(json.hosts.length<1){
callback(noResult);
}else{
callback(json.hosts);
}
});
}
@ -232,6 +242,12 @@ function setAddShowEvents() {
select: autoSelect,
delay: 200
});
form.find("#add_show_hosts_autocomplete").keypress(function(e){
if( e.which == 13 ){
return false;
}
})
form.find("#schedule-show-style input").ColorPicker({
onChange: function (hsb, hex, rgb, el) {