Merge branch 'master' of github.com:jquery/jquery-mobile

This commit is contained in:
scottjehl 2010-10-12 14:28:00 -04:00
commit c92e9f3eea
4 changed files with 7 additions and 5 deletions

View file

@ -21,7 +21,6 @@ $(function() {
var self = conversion;
var url = "http://query.yahooapis.com/v1/public/yql?q=select%20rate%2Cname%20from%20csv%20where%20url%3D'http%3A%2F%2Fdownload.finance.yahoo.com%2Fd%2Fquotes%3Fs%3D" + conversion.from + conversion.to + "%253DX%26f%3Dl1n'%20and%20columns%3D'rate%2Cname'&format=json&diagnostics=true&callback=?";
$.getJSON( url, function( result ) {
console.log( "results", result );
self.rate = parseFloat( result.query.results.row.rate );
// TODO trigger a custom event instead of keyup?
$( "#term" ).keyup();

View file

@ -27,9 +27,6 @@ function get() {
return JSON.parse( localStorage.getItem( "conversions" ) );
}
function set( value ) {
if ( window.console && console.log ) {
console.log( "storing conversion: "+ JSON.stringify( value ) );
}
localStorage.setItem( "conversions", JSON.stringify( value ) );
}

View file

@ -59,7 +59,6 @@
//consistent string escaping for urls and IDs
function idStringEscape(str){
console.log(str);
return str.replace(/[^a-zA-Z0-9]/, '-');
}

View file

@ -16,6 +16,13 @@
})
.taphold(function() {
$( this ).css( "color", "#0f0" );
})
.click(function() {
var elem = this;
$( elem ).css( "background-color", "#00f" );
setTimeout(function() {
$( elem ).css( "background-color", "transparent" );
}, 500 );
});
});</script>
</head>