merging from my fork

This commit is contained in:
Dominick Pham 2009-08-11 17:16:09 -04:00
parent 2fa4fb4414
commit 905a03075c
3 changed files with 213 additions and 13 deletions

View file

@ -15,8 +15,29 @@
img_input = document.getElementById("img_input");
$("#franz_form").submit(function() {
franz.loadImg(img_input.value);
$("#hsv").removeClass("hideme");
return false;
});
$("#try_these a").click(function(event){
img_input.value = this.innerHTML;
return false;
});
$("#sort_hue").click(function(event){
franz.displayHue();
return false;
});
$("#sort_sat").click(function(event){
franz.displaySat();
return false;
});
$("#sort_val").click(function(event){
franz.displayVal();
return false;
});
});
</script>
</head>
@ -35,7 +56,9 @@
<input type="text" id="img_input" value="lol.png">
<input type="submit" id="img_submit" value="Go for it!">
</form>
<p><strong>Try out:</strong> lol.png, testjubs.jpg, stars.jpg, 1600.jpg, fallout.jpg</p>
<p id="hsv" class="hideme"><a href="#" id="sort_hue">Sort Hue</a> <a href="#" id="sort_sat">Sort Saturation</a> <a href="#" id="sort_val">Sort Value</a> </p>
<p id="try_these"><strong>Try out:</strong> <a href="#">lol.png</a>, <a href="#">testjubs.jpg</a>, <a href="#">stars.jpg</a>, <a href="#">1600.jpg</a>, <a href="#">fallout.jpg</a></p>
</div>
</div>