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

This commit is contained in:
Yuchen Wang 2011-12-09 11:12:57 -05:00
commit 8c018a2731
2 changed files with 67 additions and 1 deletions

View file

@ -99,7 +99,40 @@ $(document).ready(function(){
$('.toggle legend').live('click',function() {
$('.toggle').toggleClass('closed');
return false;
});
});
$("#Logo").live('change', function(ev){
var content, res, logoEl;
content = $(this).val();
res = content.match(/(jpg|jpeg|png|gif)$/gi);
logoEl = $("#Logo-element");
//not an accepted image extension.
if (!res) {
var ul, li;
ul = logoEl.find('.errors');
li = $("<li/>").append("Image must be one of jpg, jpeg, png, or gif");
//errors ul has already been created.
if (ul.length > 0) {
ul.empty()
.append(li);
}
else {
logoEl
.append('<ul class="errors"></ul>')
.find(".errors")
.append(li);
}
$(this).val("");
}
else {
logoEl.find(".errors").remove();
}
});
});
function resizeImg(ele, targetWidth, targetHeight){

View file

@ -48,4 +48,37 @@ $(document).ready(function() {
$('.toggle').toggleClass('closed');
return false;
});
$("#Logo").change(function(ev){
var content, res, logoEl;
content = $(this).val();
res = content.match(/(jpg|jpeg|png|gif)$/gi);
logoEl = $("#Logo-element");
//not an accepted image extension.
if (!res) {
var ul, li;
ul = logoEl.find('.errors');
li = $("<li/>").append("Image must be one of jpg, jpeg, png, or gif");
//errors ul has already been created.
if (ul.length > 0) {
ul.empty()
.append(li);
}
else {
logoEl
.append('<ul class="errors"></ul>')
.find(".errors")
.append(li);
}
$(this).val("");
}
else {
logoEl.find(".errors").remove();
}
});
});