diff --git a/async/async-tests.ts b/async/async-tests.ts index de5fbb387f..b724582368 100644 --- a/async/async-tests.ts +++ b/async/async-tests.ts @@ -1,8 +1,12 @@ +/// +import fs = require("fs"); -var fs, path; +var path: { + exists: (path: string, callback?: (err: string, exists: boolean) => any) => void; +}; -function callback() {} +function callback() { } async.map(['file1', 'file2', 'file3'], fs.stat, function (err, results) { }); async.mapSeries(['file1', 'file2', 'file3'], fs.stat, function (err, results) { }); diff --git a/jasmine-ajax/jasmine-ajax-tests.ts b/jasmine-ajax/jasmine-ajax-tests.ts index 8cea33e453..890a724420 100644 --- a/jasmine-ajax/jasmine-ajax-tests.ts +++ b/jasmine-ajax/jasmine-ajax-tests.ts @@ -889,7 +889,7 @@ describe("Jasmine Mock Ajax (for toplevel)", function() { client.send(); request = mockAjax.requests.mostRecent(); - response = { status: 200, statusText: "OK", contentType: "text/html", responseText: "OK!" }; + response = { status: 200, statusText: "OK", contentType: "text/html", responseText: "OK!", responseType: "json" }; request.respondWith(response); sharedContext.responseCallback = success; @@ -1102,7 +1102,7 @@ describe("Jasmine Mock Ajax (for toplevel)", function() { client.send(); request = mockAjax.requests.mostRecent(); - response = { status: 0, statusText: "ABORT", responseText: '{"foo": "whoops!"}' }; + response = { status: 0, statusText: "ABORT", responseText: '{"foo": "whoops!"}', responseType: "json"}; request.respondWith(response); sharedContext.responseCallback = error; @@ -1138,7 +1138,7 @@ describe("Jasmine Mock Ajax (for toplevel)", function() { client.send(); request = mockAjax.requests.mostRecent(); - response = { status: 500, statusText: "SERVER ERROR", contentType: "text/html", responseText: "(._){" }; + response = { status: 500, statusText: "SERVER ERROR", contentType: "text/html", responseText: "(._){",responseType: "json"}; request.respondWith(response); sharedContext.responseCallback = error; @@ -1175,7 +1175,7 @@ describe("Jasmine Mock Ajax (for toplevel)", function() { client.send(); request = mockAjax.requests.mostRecent(); - response = { contentType: "text/html", response: "(._){response", responseText: "(._){", responseType: "text" }; + response = { contentType: "text/html", response: "(._){response", responseText: "(._){", responseType: "text", status: 200, statusText: 'OK' }; request.responseTimeout(response); sharedContext.responseCallback = error; diff --git a/jquery.bbq/jquery.bbq-tests.ts b/jquery.bbq/jquery.bbq-tests.ts index fd49051ed3..baa6c7f42f 100644 --- a/jquery.bbq/jquery.bbq-tests.ts +++ b/jquery.bbq/jquery.bbq-tests.ts @@ -15,7 +15,7 @@ var recursiveEncoded = $.param(myObject); var recursiveDecoded = decodeURIComponent($.param(myObject)); var shallowEncoded = $.param(myObject, true); var shallowDecoded = decodeURIComponent(shallowEncoded); - + var params = { width:1680, height:1050 }; var str = jQuery.param(params); $("#results").text(str); @@ -24,7 +24,7 @@ $("#results").text(str); $.param({ a: [2,3,4] }) // "a=2&a=3&a=4" // >=1.4: $.param({ a: [2,3,4] }) // "a[]=2&a[]=3&a[]=4" - + // <=1.3.2: $.param({ a: { b:1,c:2 }, d: [3,4,{ e:5 }] }) // "a=[object+Object]&d=3&d=4&d=[object+Object]" // >=1.4: @@ -67,7 +67,7 @@ function run_many_tests(...args: any[]) { func_each = $.isFunction( tests[0] ) && tests.shift(), func_done = $.isFunction( tests[0] ) && tests.shift(), result; - + function set_result( i, test ) { result = $.isArray( test ) ? func_each.apply( this, test ) @@ -75,10 +75,10 @@ function run_many_tests(...args: any[]) { ? test( result ) : ''; }; - + if ( delay ) { stop(); - + (function loopy(){ //test && test.func && test.func( result ); if ( tests.length ) { @@ -89,7 +89,7 @@ function run_many_tests(...args: any[]) { start(); } })(); - + } else { $.each( tests, set_result ); func_done && func_done(); @@ -105,7 +105,7 @@ var params_obj = { a:['4','5','6'], b:{x:['7'], y:'8', z:['9','0','true','false' params_obj_coerce = { a:[4,5,6] },//, b:{x:[7], y:8, z:[9,0,true,false,undefined,'']}, c:1 }, params_str = params_init, params_str_old = 'a=4&a=5&a=6&b=[object+Object]&c=1', - + // If a params fragment starts with ! and BBQ is not in ajaxCrawlable mode, // things can get very ugly, very quickly. params_obj_bang = { "!a":['4'], a:['5','6'], b:{x:['7'], y:'8', z:['9','0','true','false','undefined','']}, c:'1' }, @@ -136,7 +136,7 @@ test( 'jQuery.param.sorted', function() { expected_old: 'a=4,5,6&a=7,8,9' // obviously not great, but that's the way jQuery used to roll } ]; - + if ( $.fn.jquery != '1.4.1' ) { // this explodes in jQuery 1.4.1 tests.push({ @@ -146,36 +146,36 @@ test( 'jQuery.param.sorted', function() { expected: 'a[]=3&a[]=2&a[]=1&b[]=6&b[]=5&b[]=4&x=2&z=1' }); } - + expect( tests.length * 2 + 6 ); - + $.each( tests, function(i,test: any){ var unsorted = $.param( test.obj, test.traditional ), sorted = $.param.sorted( test.obj, test.traditional ); - + equal( decodeURIComponent( sorted ), old_jquery && test.expected_old || test.expected, 'params should be sorted' ); deepEqual( $.deparam( unsorted, true ), $.deparam( sorted, true ), 'sorted params should deparam the same as unsorted params' ) }); - + equal( $.param.fragment( 'foo', '#b=2&a=1' ), 'foo#a=1&b=2', 'params should be sorted' ); equal( $.param.fragment( 'foo', '#b=2&a=1', 1 ), 'foo#a=1&b=2', 'params should be sorted' ); equal( $.param.fragment( 'foo', '#b=2&a=1', 2 ), 'foo#b=2&a=1', 'params should NOT be sorted' ); equal( $.param.fragment( 'foo#c=3&a=4', '#b=2&a=1' ), 'foo#a=1&b=2&c=3', 'params should be sorted' ); equal( $.param.fragment( 'foo#c=3&a=4', '#b=2&a=1', 1 ), 'foo#a=4&b=2&c=3', 'params should be sorted' ); equal( $.param.fragment( 'foo#c=3&a=4', '#b=2&a=1', 2 ), 'foo#b=2&a=1', 'params should NOT be sorted' ); - + }); test( 'jQuery.param.querystring', function() { expect( 11 ); - + equal( $.param.querystring( 'http://example.com/' ), '', 'properly identifying params' ); equal( $.param.querystring( 'http://example.com/?foo' ),'foo', 'properly identifying params' ); equal( $.param.querystring( 'http://example.com/?foo#bar' ),'foo', 'properly identifying params' ); equal( $.param.querystring( 'http://example.com/?foo#bar?baz' ),'foo', 'properly identifying params' ); equal( $.param.querystring( 'http://example.com/#foo' ),'', 'properly identifying params' ); equal( $.param.querystring( 'http://example.com/#foo?bar' ),'', 'properly identifying params' ); - + equal( $.param.querystring(), params_str, 'params string from window.location' ); equal( $.param.querystring( '?' + params_str ), params_str, 'params string from url' ); equal( $.param.querystring( 'foo.html?' + params_str ), params_str, 'params string from url' ); @@ -185,276 +185,276 @@ test( 'jQuery.param.querystring', function() { test( 'jQuery.param.querystring - build URL', function() { expect( 10 ); - + function fake_encode( params_str ) { return '?' + $.map( params_str.split('&'), encodeURIComponent ).join('&').replace( /%3D/g, '=' ).replace( /%2B/g, '+' ); } - + var pre = 'http://a:b@example.com:1234/foo.html', post = '#get-on-the-floor', current_url = pre + post; - + run_many_tests( - + // execute this for each array item function(){ current_url = $.param.querystring.apply( this, [ current_url ].concat( aps.call( arguments ) ) ); }, - + // tests: - + [ { a:'2' } ], - + function(result){ equal( current_url, pre + '?a=2' + post, '$.param.querystring( url, Object )' ); }, - + [ { b:'2' } ], - + function(result){ equal( current_url, pre + '?a=2&b=2' + post, '$.param.querystring( url, Object )' ); }, - + [ { c:true, d:false, e:'undefined', f:'' } ], - + function(result){ equal( current_url, pre + '?a=2&b=2&c=true&d=false&e=undefined&f=' + post, '$.param.querystring( url, Object )' ); }, - + [ { a:[4,5,6]}],//, b:{x:[7], y:8, z:[9,0,'true','false','undefined','']} }, 2 ], - + function(result){ var params = old_jquery ? 'a=4&a=5&a=6&b=[object+Object]' : 'a[]=4&a[]=5&a[]=6&b[x][]=7&b[y]=8&b[z][]=9&b[z][]=0&b[z][]=true&b[z][]=false&b[z][]=undefined&b[z][]='; - + equal( current_url, pre + fake_encode( params ) + post, '$.param.querystring( url, Object, 2 )' ); }, - + [ { a:'1', c:'2' }, 1 ], - + function(result){ var params = old_jquery ? 'a=4&a=5&a=6&b=[object+Object]&c=2' : 'a[]=4&a[]=5&a[]=6&b[x][]=7&b[y]=8&b[z][]=9&b[z][]=0&b[z][]=true&b[z][]=false&b[z][]=undefined&b[z][]=&c=2'; - + equal( current_url, pre + fake_encode( params ) + post, '$.param.querystring( url, Object, 1 )' ); }, - + [ 'foo=1' ], - + function(result){ var params = old_jquery ? 'a=4&a=5&a=6&b=[object+Object]&c=2&foo=1' : 'a[]=4&a[]=5&a[]=6&b[x][]=7&b[y]=8&b[z][]=9&b[z][]=0&b[z][]=true&b[z][]=false&b[z][]=undefined&b[z][]=&c=2&foo=1'; - + equal( current_url, pre + fake_encode( params ) + post, '$.param.querystring( url, String )' ); }, - + [ 'foo=2&bar=3', 1 ], - + function(result){ var params = old_jquery ? 'a=4&a=5&a=6&b=[object+Object]&bar=3&c=2&foo=1' : 'a[]=4&a[]=5&a[]=6&b[x][]=7&b[y]=8&b[z][]=9&b[z][]=0&b[z][]=true&b[z][]=false&b[z][]=undefined&b[z][]=&bar=3&c=2&foo=1'; - + equal( current_url, pre + fake_encode( params ) + post, '$.param.querystring( url, String, 1 )' ); }, - + [ 'http://example.com/test.html?/path/to/file.php#the-cow-goes-moo', 2 ], - + function(result){ equal( current_url, pre + '?/path/to/file.php' + post, '$.param.querystring( url, String, 2 )' ); }, - + [ '?another-example', 2 ], - + function(result){ equal( current_url, pre + '?another-example' + post, '$.param.querystring( url, String, 2 )' ); }, - + [ 'i_am_out_of_witty_strings', 2 ], - + function(result){ equal( current_url, pre + '?i_am_out_of_witty_strings' + post, '$.param.querystring( url, String, 2 )' ); } - + ); - + }); test( 'jQuery.param.fragment', function() { expect( 29 ); - + equal( $.param.fragment( 'http://example.com/' ), '', 'properly identifying params' ); equal( $.param.fragment( 'http://example.com/?foo' ),'', 'properly identifying params' ); equal( $.param.fragment( 'http://example.com/?foo#bar' ),'bar', 'properly identifying params' ); equal( $.param.fragment( 'http://example.com/?foo#bar?baz' ),'bar?baz', 'properly identifying params' ); equal( $.param.fragment( 'http://example.com/#foo' ),'foo', 'properly identifying params' ); equal( $.param.fragment( 'http://example.com/#foo?bar' ),'foo?bar', 'properly identifying params' ); - + equal( $.param.fragment( 'http://example.com/' ), '', 'properly identifying params' ); equal( $.param.fragment( 'http://example.com/?foo' ),'', 'properly identifying params' ); equal( $.param.fragment( 'http://example.com/?foo#!bar' ),'!bar', 'properly identifying params' ); equal( $.param.fragment( 'http://example.com/?foo#!bar?baz' ),'!bar?baz', 'properly identifying params' ); equal( $.param.fragment( 'http://example.com/#!foo' ),'!foo', 'properly identifying params' ); equal( $.param.fragment( 'http://example.com/#!foo?bar' ),'!foo?bar', 'properly identifying params' ); - + equal( $.param.fragment(), params_str, 'params string from window.location' ); equal( $.param.fragment( '#' + params_str ), params_str, 'params string from url' ); equal( $.param.fragment( 'foo.html#' + params_str ), params_str, 'params string from url' ); equal( $.param.fragment( 'http://a:b@example.com:1234/foo.html#' + params_str ), params_str, 'params string from url' ); equal( $.param.fragment( 'http://a:b@example.com:1234/foo.html?bippity-boppity-boo#' + params_str ), params_str, 'params string from url' ); - + $.param.fragment.ajaxCrawlable( true ); - + equal( $.param.fragment( 'http://example.com/' ), '', 'properly identifying params' ); equal( $.param.fragment( 'http://example.com/?foo' ),'', 'properly identifying params' ); equal( $.param.fragment( 'http://example.com/?foo#bar' ),'bar', 'properly identifying params' ); equal( $.param.fragment( 'http://example.com/?foo#bar?baz' ),'bar?baz', 'properly identifying params' ); equal( $.param.fragment( 'http://example.com/#foo' ),'foo', 'properly identifying params' ); equal( $.param.fragment( 'http://example.com/#foo?bar' ),'foo?bar', 'properly identifying params' ); - + equal( $.param.fragment( 'http://example.com/' ), '', 'properly identifying params' ); equal( $.param.fragment( 'http://example.com/?foo' ),'', 'properly identifying params' ); equal( $.param.fragment( 'http://example.com/?foo#!bar' ),'bar', 'properly identifying params' ); equal( $.param.fragment( 'http://example.com/?foo#!bar?baz' ),'bar?baz', 'properly identifying params' ); equal( $.param.fragment( 'http://example.com/#!foo' ),'foo', 'properly identifying params' ); equal( $.param.fragment( 'http://example.com/#!foo?bar' ),'foo?bar', 'properly identifying params' ); - + $.param.fragment.ajaxCrawlable( false ); - + }); test( 'jQuery.param.fragment - build URL', function() { expect( 40 ); - + function fake_encode( params_str ) { return '#' + $.map( params_str.split('&'), encodeURIComponent ).join('&').replace( /%3D/g, '=' ).replace( /%2B/g, '+' ); } - + var pre = 'http://a:b@example.com:1234/foo.html?and-dance-with-me', current_url = pre; - + run_many_tests( - + // execute this for each array item function(){ current_url = $.param.fragment.apply( this, [ current_url ].concat( aps.call( arguments ) ) ); }, - + // tests: - + [ { a:'2' } ], - + function(result){ equal( current_url, pre + '#a=2', '$.param.fragment( url, Object )' ); }, - + [ { b:'2' } ], - + function(result){ equal( current_url, pre + '#a=2&b=2', '$.param.fragment( url, Object )' ); }, - + [ { c:true, d:false, e:'undefined', f:'' } ], - + function(result){ equal( current_url, pre + '#a=2&b=2&c=true&d=false&e=undefined&f=', '$.param.fragment( url, Object )' ); }, - + [ { a:[4,5,6]}],//, b:{x:[7], y:8, z:[9,0,'true','false','undefined','']} }, 2 ], - + function(result){ var params = old_jquery ? 'a=4&a=5&a=6&b=[object+Object]' : 'a[]=4&a[]=5&a[]=6&b[x][]=7&b[y]=8&b[z][]=9&b[z][]=0&b[z][]=true&b[z][]=false&b[z][]=undefined&b[z][]='; - + equal( current_url, pre + fake_encode( params ), '$.param.fragment( url, Object, 2 )' ); }, - + [ { a:'1', c:'2' }, 1 ], - + function(result){ var params = old_jquery ? 'a=4&a=5&a=6&b=[object+Object]&c=2' : 'a[]=4&a[]=5&a[]=6&b[x][]=7&b[y]=8&b[z][]=9&b[z][]=0&b[z][]=true&b[z][]=false&b[z][]=undefined&b[z][]=&c=2'; - + equal( current_url, pre + fake_encode( params ), '$.param.fragment( url, Object, 1 )' ); }, - + [ 'foo=1' ], - + function(result){ var params = old_jquery ? 'a=4&a=5&a=6&b=[object+Object]&c=2&foo=1' : 'a[]=4&a[]=5&a[]=6&b[x][]=7&b[y]=8&b[z][]=9&b[z][]=0&b[z][]=true&b[z][]=false&b[z][]=undefined&b[z][]=&c=2&foo=1'; - + equal( current_url, pre + fake_encode( params ), '$.param.fragment( url, String )' ); }, - + [ 'foo=2&bar=3', 1 ], - + function(result){ var params = old_jquery ? 'a=4&a=5&a=6&b=[object+Object]&bar=3&c=2&foo=1' : 'a[]=4&a[]=5&a[]=6&b[x][]=7&b[y]=8&b[z][]=9&b[z][]=0&b[z][]=true&b[z][]=false&b[z][]=undefined&b[z][]=&bar=3&c=2&foo=1'; - + equal( current_url, pre + fake_encode( params ), '$.param.fragment( url, String, 1 )' ); }, - + [ 'http://example.com/test.html?the-cow-goes-moo#/path/to/file.php', 2 ], - + function(result){ equal( current_url, pre + '#/path/to/file.php', '$.param.fragment( url, String, 2 )' ); }, - + [ '#another-example', 2 ], - + function(result){ equal( current_url, pre + '#another-example', '$.param.fragment( url, String, 2 )' ); }, - + [ 'i_am_out_of_witty_strings', 2 ], - + function(result){ equal( current_url, pre + '#i_am_out_of_witty_strings', '$.param.fragment( url, String, 2 )' ); } - + ); - + $.param.fragment.ajaxCrawlable( true ); - + equal( $.param.fragment( 'foo', {} ) , 'foo#!', '$.param.fragment( url, Object )' ); equal( $.param.fragment( 'foo', { b:2, a:1 } ) , 'foo#!a=1&b=2', '$.param.fragment( url, Object )' ); equal( $.param.fragment( 'foo#', { b:2, a:1 } ) , 'foo#!a=1&b=2', '$.param.fragment( url, Object )' ); equal( $.param.fragment( 'foo#!', { b:2, a:1 } ) , 'foo#!a=1&b=2', '$.param.fragment( url, Object )' ); equal( $.param.fragment( 'foo#c=3&a=4', { b:2, a:1 } ) , 'foo#!a=1&b=2&c=3', '$.param.fragment( url, Object )' ); equal( $.param.fragment( 'foo#!c=3&a=4', { b:2, a:1 } ) , 'foo#!a=1&b=2&c=3', '$.param.fragment( url, Object )' ); - + equal( $.param.fragment( 'foo', '' ) , 'foo#!', '$.param.fragment( url, String )' ); equal( $.param.fragment( 'foo', 'b=2&a=1' ) , 'foo#!a=1&b=2', '$.param.fragment( url, String )' ); equal( $.param.fragment( 'foo#', 'b=2&a=1' ) , 'foo#!a=1&b=2', '$.param.fragment( url, String )' ); equal( $.param.fragment( 'foo#!', 'b=2&a=1' ) , 'foo#!a=1&b=2', '$.param.fragment( url, String )' ); equal( $.param.fragment( 'foo#c=3&a=4', 'b=2&a=1' ) , 'foo#!a=1&b=2&c=3', '$.param.fragment( url, String )' ); equal( $.param.fragment( 'foo#!c=3&a=4', 'b=2&a=1' ) , 'foo#!a=1&b=2&c=3', '$.param.fragment( url, String )' ); - + equal( $.param.fragment( 'foo', '#' ) , 'foo#!', '$.param.fragment( url, String )' ); equal( $.param.fragment( 'foo', '#b=2&a=1' ) , 'foo#!a=1&b=2', '$.param.fragment( url, String )' ); equal( $.param.fragment( 'foo#', '#b=2&a=1' ) , 'foo#!a=1&b=2', '$.param.fragment( url, String )' ); equal( $.param.fragment( 'foo#!', '#b=2&a=1' ) , 'foo#!a=1&b=2', '$.param.fragment( url, String )' ); equal( $.param.fragment( 'foo#c=3&a=4', '#b=2&a=1' ) , 'foo#!a=1&b=2&c=3', '$.param.fragment( url, String )' ); equal( $.param.fragment( 'foo#!c=3&a=4', '#b=2&a=1' ) , 'foo#!a=1&b=2&c=3', '$.param.fragment( url, String )' ); - + equal( $.param.fragment( 'foo', '#!' ) , 'foo#!', '$.param.fragment( url, String )' ); equal( $.param.fragment( 'foo', '#!b=2&a=1' ) , 'foo#!a=1&b=2', '$.param.fragment( url, String )' ); equal( $.param.fragment( 'foo#', '#!b=2&a=1' ) , 'foo#!a=1&b=2', '$.param.fragment( url, String )' ); equal( $.param.fragment( 'foo#!', '#!b=2&a=1' ) , 'foo#!a=1&b=2', '$.param.fragment( url, String )' ); equal( $.param.fragment( 'foo#c=3&a=4', '#!b=2&a=1' ) , 'foo#!a=1&b=2&c=3', '$.param.fragment( url, String )' ); equal( $.param.fragment( 'foo#!c=3&a=4', '#!b=2&a=1' ) , 'foo#!a=1&b=2&c=3', '$.param.fragment( url, String )' ); - + $.param.fragment.ajaxCrawlable( false ); - + // If a params fragment starts with ! and BBQ is not in ajaxCrawlable mode, // things can get very ugly, very quickly. equal( $.param.fragment( 'foo', '#!' ) , 'foo#!=', '$.param.fragment( url, String )' ); @@ -463,12 +463,12 @@ test( 'jQuery.param.fragment - build URL', function() { equal( $.param.fragment( 'foo#!', '#!b=2&a=1' ) , 'foo#!=&!b=2&a=1', '$.param.fragment( url, String )' ); equal( $.param.fragment( 'foo#c=3&a=4', '#!b=2&a=1' ) , 'foo#!b=2&a=1&c=3', '$.param.fragment( url, String )' ); equal( $.param.fragment( 'foo#!c=3&a=4', '#!b=2&a=1' ) , 'foo#!b=2&!c=3&a=1', '$.param.fragment( url, String )' ); - + }); test( 'jQuery.param.fragment.ajaxCrawlable', function() { expect( 5 ); - + equal( ajaxcrawlable_init, false, 'ajaxCrawlable is disabled by default' ); equal( $.param.fragment.ajaxCrawlable( true ), true, 'enabling ajaxCrawlable should return true' ); equal( $.param.fragment.ajaxCrawlable(), true, 'ajaxCrawlable is now enabled' ); @@ -478,13 +478,13 @@ test( 'jQuery.param.fragment.ajaxCrawlable', function() { test( 'jQuery.param.fragment.noEscape', function() { expect( 2 ); - + equal( $.param.fragment( '#', { foo: '/a,b@c$d+e&f=g h!' } ), '#foo=/a,b%40c%24d%2Be%26f%3Dg+h!', '/, should be unescaped, everything else but space (+) should be urlencoded' ); - + $.param.fragment.ajaxCrawlable( true ); - + equal( $.param.fragment( '#', { foo: '/a,b@c$d+e&f=g h!' } ), '#!foo=/a,b%40c%24d%2Be%26f%3Dg+h!', '/, should be unescaped, everything else but ! and space (+) should be urlencoded' ); - + $.param.fragment.ajaxCrawlable( false ); }); @@ -505,7 +505,7 @@ test( 'jQuery.deparam - pre-1.4-style params', function() { var params_str = 'a=1&a=2&a=3&b=4&c=5&c=6&c=true&c=false&c=undefined&c=&d=7', params_obj = { a:['1','2','3'], b:'4', c:['5','6','true','false','undefined',''], d:'7' }, params_obj_coerce = { a:[1,2,3], b:4, c:[5,6,true,false,undefined,''], d:7 }; - + expect( 2 ); deepEqual( $.deparam( params_str ), params_obj, '$.deparam( String )' ); deepEqual( $.deparam( params_str, true ), params_obj_coerce, '$.deparam( String, true )' ); @@ -513,7 +513,7 @@ test( 'jQuery.deparam - pre-1.4-style params', function() { test( 'jQuery.deparam.querystring', function() { expect( 12 ); - + deepEqual( $.deparam.querystring(), params_obj, 'params obj from window.location' ); deepEqual( $.deparam.querystring( /*true*/ ), params_obj_coerce, 'params obj from window.location, coerced' ); deepEqual( $.deparam.querystring( params_str ), params_obj, 'params obj from string' ); @@ -530,12 +530,12 @@ test( 'jQuery.deparam.querystring', function() { test( 'jQuery.deparam.fragment', function() { expect( 36 ); - + deepEqual( $.deparam.fragment(), params_obj, 'params obj from window.location' ); deepEqual( $.deparam.fragment( /*true*/ ), params_obj_coerce, 'params obj from window.location, coerced' ); deepEqual( $.deparam.fragment( params_str ), params_obj, 'params obj from string' ); deepEqual( $.deparam.fragment( params_str, true ), params_obj_coerce, 'params obj from string, coerced' ); - + deepEqual( $.deparam.fragment( '#' + params_str ), params_obj, 'params obj from string' ); deepEqual( $.deparam.fragment( '#' + params_str, true ), params_obj_coerce, 'params obj from string, coerced' ); deepEqual( $.deparam.fragment( 'foo.html#' + params_str ), params_obj, 'params obj from string' ); @@ -544,7 +544,7 @@ test( 'jQuery.deparam.fragment', function() { deepEqual( $.deparam.fragment( 'http://a:b@example.com:1234/foo.html#' + params_str, true ), params_obj_coerce, 'params obj from string, coerced' ); deepEqual( $.deparam.fragment( 'http://a:b@example.com:1234/foo.html?bippity-boppity-boo#' + params_str ), params_obj, 'params obj from string' ); deepEqual( $.deparam.fragment( 'http://a:b@example.com:1234/foo.html?bippity-boppity-boo#' + params_str, true ), params_obj_coerce, 'params obj from string, coerced' ); - + // If a params fragment starts with ! and BBQ is not in ajaxCrawlable mode, // things can get very ugly, very quickly. deepEqual( $.deparam.fragment( '#!' + params_str ), params_obj_bang, 'params obj from string' ); @@ -555,9 +555,9 @@ test( 'jQuery.deparam.fragment', function() { deepEqual( $.deparam.fragment( 'http://a:b@example.com:1234/foo.html#!' + params_str, true ), params_obj_bang_coerce, 'params obj from string, coerced' ); deepEqual( $.deparam.fragment( 'http://a:b@example.com:1234/foo.html?bippity-boppity-boo#!' + params_str ), params_obj_bang, 'params obj from string' ); deepEqual( $.deparam.fragment( 'http://a:b@example.com:1234/foo.html?bippity-boppity-boo#!' + params_str, true ), params_obj_bang_coerce, 'params obj from string, coerced' ); - + $.param.fragment.ajaxCrawlable( true ); - + deepEqual( $.deparam.fragment( '#' + params_str ), params_obj, 'params obj from string' ); deepEqual( $.deparam.fragment( '#' + params_str, true ), params_obj_coerce, 'params obj from string, coerced' ); deepEqual( $.deparam.fragment( 'foo.html#' + params_str ), params_obj, 'params obj from string' ); @@ -566,7 +566,7 @@ test( 'jQuery.deparam.fragment', function() { deepEqual( $.deparam.fragment( 'http://a:b@example.com:1234/foo.html#' + params_str, true ), params_obj_coerce, 'params obj from string, coerced' ); deepEqual( $.deparam.fragment( 'http://a:b@example.com:1234/foo.html?bippity-boppity-boo#' + params_str ), params_obj, 'params obj from string' ); deepEqual( $.deparam.fragment( 'http://a:b@example.com:1234/foo.html?bippity-boppity-boo#' + params_str, true ), params_obj_coerce, 'params obj from string, coerced' ); - + deepEqual( $.deparam.fragment( '#!' + params_str ), params_obj, 'params obj from string' ); deepEqual( $.deparam.fragment( '#!' + params_str, true ), params_obj_coerce, 'params obj from string, coerced' ); deepEqual( $.deparam.fragment( 'foo.html#!' + params_str ), params_obj, 'params obj from string' ); @@ -575,7 +575,7 @@ test( 'jQuery.deparam.fragment', function() { deepEqual( $.deparam.fragment( 'http://a:b@example.com:1234/foo.html#!' + params_str, true ), params_obj_coerce, 'params obj from string, coerced' ); deepEqual( $.deparam.fragment( 'http://a:b@example.com:1234/foo.html?bippity-boppity-boo#!' + params_str ), params_obj, 'params obj from string' ); deepEqual( $.deparam.fragment( 'http://a:b@example.com:1234/foo.html?bippity-boppity-boo#!' + params_str, true ), params_obj_coerce, 'params obj from string, coerced' ); - + $.param.fragment.ajaxCrawlable( false ); }); @@ -599,7 +599,7 @@ function init_url_attr( _, url ) { function test_url_attr( container ) { var url; - + $.each( test_elems, function(i,v){ var val = container.children( v ).attr( $.elemUrlAttr()[ v ] ); if ( !url ) { @@ -608,277 +608,277 @@ function test_url_attr( container ) { url = -1; } }); - + return url; }; test( 'jQuery.fn.querystring', function() { expect( 60 ); - + function fake_encode( params_str ) { return '?' + $.map( params_str.split('&'), encodeURIComponent ).join('&').replace( /%3D/g, '=' ).replace( /%2B/g, '+' ); } - + var pre = 'http://a:b@example.com:1234/foo.html', post = '#get-on-the-floor', current_url = pre + post; - + run_many_tests( - + // execute this for each array item function(){ var container, elems; - + container = init_url_attr( container, current_url ); elems = container.children('span'); equal( elems.length, 1, 'select the correct elements' ); equal( elems.querystring.apply( elems, [ 'arbitrary_attr' ].concat( aps.call( arguments ) ) ), elems, 'pass query string' ); - + container = init_url_attr( container, current_url ); elems = container.children('a, link'); equal( elems.length, 2, 'select the correct elements' ); equal( elems.querystring.apply( elems, [ 'href' ].concat( aps.call( arguments ) ) ), elems, 'pass query string' ); - + container = init_url_attr( container, current_url ); elems = container.children(); equal( elems.querystring.apply( elems, aps.call( arguments ) ), elems, 'pass query string' ); - + current_url = test_url_attr( container ); }, - + // tests: - + [ { a:'2' } ], - + function(result){ equal( current_url, pre + '?a=2' + post, '$.fn.querystring( url, Object )' ); }, - + [ { b:'2' } ], - + function(result){ equal( current_url, pre + '?a=2&b=2' + post, '$.fn.querystring( url, Object )' ); }, - + [ { c:true, d:false, e:'undefined', f:'' } ], - + function(result){ equal( current_url, pre + '?a=2&b=2&c=true&d=false&e=undefined&f=' + post, '$.fn.querystring( url, Object )' ); }, - + [ { a:[4,5,6]}],//, b:{x:[7], y:8, z:[9,0,'true','false','undefined','']} }, 2 ], - + function(result){ var params = old_jquery ? 'a=4&a=5&a=6&b=[object+Object]' : 'a[]=4&a[]=5&a[]=6&b[x][]=7&b[y]=8&b[z][]=9&b[z][]=0&b[z][]=true&b[z][]=false&b[z][]=undefined&b[z][]='; - + equal( current_url, pre + fake_encode( params ) + post, '$.fn.querystring( url, Object, 2 )' ); }, - + [ { a:'1', c:'2' }, 1 ], - + function(result){ var params = old_jquery ? 'a=4&a=5&a=6&b=[object+Object]&c=2' : 'a[]=4&a[]=5&a[]=6&b[x][]=7&b[y]=8&b[z][]=9&b[z][]=0&b[z][]=true&b[z][]=false&b[z][]=undefined&b[z][]=&c=2'; - + equal( current_url, pre + fake_encode( params ) + post, '$.fn.querystring( url, Object, 1 )' ); }, - + [ 'foo=1' ], - + function(result){ var params = old_jquery ? 'a=4&a=5&a=6&b=[object+Object]&c=2&foo=1' : 'a[]=4&a[]=5&a[]=6&b[x][]=7&b[y]=8&b[z][]=9&b[z][]=0&b[z][]=true&b[z][]=false&b[z][]=undefined&b[z][]=&c=2&foo=1'; - + equal( current_url, pre + fake_encode( params ) + post, '$.fn.querystring( url, String )' ); }, - + [ 'foo=2&bar=3', 1 ], - + function(result){ var params = old_jquery ? 'a=4&a=5&a=6&b=[object+Object]&bar=3&c=2&foo=1' : 'a[]=4&a[]=5&a[]=6&b[x][]=7&b[y]=8&b[z][]=9&b[z][]=0&b[z][]=true&b[z][]=false&b[z][]=undefined&b[z][]=&bar=3&c=2&foo=1'; - + equal( current_url, pre + fake_encode( params ) + post, '$.fn.querystring( url, String, 1 )' ); }, - + [ 'http://example.com/test.html?/path/to/file.php#the-cow-goes-moo', 2 ], - + function(result){ equal( current_url, pre + '?/path/to/file.php' + post, '$.fn.querystring( url, String, 2 )' ); }, - + [ '?another-example', 2 ], - + function(result){ equal( current_url, pre + '?another-example' + post, '$.fn.querystring( url, String, 2 )' ); }, - + [ 'i_am_out_of_witty_strings', 2 ], - + function(result){ equal( current_url, pre + '?i_am_out_of_witty_strings' + post, '$.fn.querystring( url, String, 2 )' ); } - + ); - + }); test( 'jQuery.fn.fragment', function() { expect( 240 ); - + function fake_encode( params_str ) { return '#' + $.map( params_str.split('&'), encodeURIComponent ).join('&').replace( /%3D/g, '=' ).replace( /%2B/g, '+' ); } - + var pre = 'http://a:b@example.com:1234/foo.html?and-dance-with-me', current_url = pre; - + run_many_tests( - + // execute this for each array item function( params, merge_mode ){ current_url = test_fn_fragment( current_url, params, merge_mode ); }, - + // tests: - + [ { a:'2' } ], - + function(result){ equal( current_url, pre + '#a=2', '$.fn.fragment( url, Object )' ); }, - + [ { b:'2' } ], - + function(result){ equal( current_url, pre + '#a=2&b=2', '$.fn.fragment( url, Object )' ); }, - + [ { c:true, d:false, e:'undefined', f:'' } ], - + function(result){ equal( current_url, pre + '#a=2&b=2&c=true&d=false&e=undefined&f=', '$.fn.fragment( url, Object )' ); }, - + [ { a:[4,5,6]}],//, b:{x:[7], y:8, z:[9,0,'true','false','undefined','']} }, 2 ], - + function(result){ var params = old_jquery ? 'a=4&a=5&a=6&b=[object+Object]' : 'a[]=4&a[]=5&a[]=6&b[x][]=7&b[y]=8&b[z][]=9&b[z][]=0&b[z][]=true&b[z][]=false&b[z][]=undefined&b[z][]='; - + equal( current_url, pre + fake_encode( params ), '$.fn.fragment( url, Object, 2 )' ); }, - + [ { a:'1', c:'2' }, 1 ], - + function(result){ var params = old_jquery ? 'a=4&a=5&a=6&b=[object+Object]&c=2' : 'a[]=4&a[]=5&a[]=6&b[x][]=7&b[y]=8&b[z][]=9&b[z][]=0&b[z][]=true&b[z][]=false&b[z][]=undefined&b[z][]=&c=2'; - + equal( current_url, pre + fake_encode( params ), '$.fn.fragment( url, Object, 1 )' ); }, - + [ 'foo=1' ], - + function(result){ var params = old_jquery ? 'a=4&a=5&a=6&b=[object+Object]&c=2&foo=1' : 'a[]=4&a[]=5&a[]=6&b[x][]=7&b[y]=8&b[z][]=9&b[z][]=0&b[z][]=true&b[z][]=false&b[z][]=undefined&b[z][]=&c=2&foo=1'; - + equal( current_url, pre + fake_encode( params ), '$.fn.fragment( url, String )' ); }, - + [ 'foo=2&bar=3', 1 ], - + function(result){ var params = old_jquery ? 'a=4&a=5&a=6&b=[object+Object]&bar=3&c=2&foo=1' : 'a[]=4&a[]=5&a[]=6&b[x][]=7&b[y]=8&b[z][]=9&b[z][]=0&b[z][]=true&b[z][]=false&b[z][]=undefined&b[z][]=&bar=3&c=2&foo=1'; - + equal( current_url, pre + fake_encode( params ), '$.fn.fragment( url, String, 1 )' ); }, - + [ 'http://example.com/test.html?the-cow-goes-moo#/path/to/file.php', 2 ], - + function(result){ equal( current_url, pre + '#/path/to/file.php', '$.fn.fragment( url, String, 2 )' ); }, - + [ '#another-example', 2 ], - + function(result){ equal( current_url, pre + '#another-example', '$.fn.fragment( url, String, 2 )' ); }, - + [ 'i_am_out_of_witty_strings', 2 ], - + function(result){ equal( current_url, pre + '#i_am_out_of_witty_strings', '$.fn.fragment( url, String, 2 )' ); } - + ); - + $.param.fragment.ajaxCrawlable( true ); - + function test_fn_fragment( url, params, merge_mode? ) { var container, elems; - + container = init_url_attr( container, url ); elems = container.children('span'); equal( elems.length, 1, 'select the correct elements' ); equal( elems.fragment( 'arbitrary_attr', params, merge_mode ), elems, 'pass fragment' ); - + container = init_url_attr( container, url ); elems = container.children('a, link'); equal( elems.length, 2, 'select the correct elements' ); equal( elems.fragment( params, merge_mode ), elems, 'pass fragment' ); - + container = init_url_attr( container, url ); elems = container.children(); equal( elems.fragment( params, merge_mode ), elems, 'pass fragment' ); - + return test_url_attr( container ); }; - + equal( test_fn_fragment( 'foo', {} ) , 'foo#!', '$.fn.fragment( url, Object )' ); equal( test_fn_fragment( 'foo', { b:2, a:1 } ) , 'foo#!a=1&b=2', '$.fn.fragment( url, Object )' ); equal( test_fn_fragment( 'foo#', { b:2, a:1 } ) , 'foo#!a=1&b=2', '$.fn.fragment( url, Object )' ); equal( test_fn_fragment( 'foo#!', { b:2, a:1 } ) , 'foo#!a=1&b=2', '$.fn.fragment( url, Object )' ); equal( test_fn_fragment( 'foo#c=3&a=4', { b:2, a:1 } ) , 'foo#!a=1&b=2&c=3', '$.fn.fragment( url, Object )' ); equal( test_fn_fragment( 'foo#!c=3&a=4', { b:2, a:1 } ) , 'foo#!a=1&b=2&c=3', '$.fn.fragment( url, Object )' ); - + equal( test_fn_fragment( 'foo', '' ) , 'foo#!', '$.fn.fragment( url, String )' ); equal( test_fn_fragment( 'foo', 'b=2&a=1' ) , 'foo#!a=1&b=2', '$.fn.fragment( url, String )' ); equal( test_fn_fragment( 'foo#', 'b=2&a=1' ) , 'foo#!a=1&b=2', '$.fn.fragment( url, String )' ); equal( test_fn_fragment( 'foo#!', 'b=2&a=1' ) , 'foo#!a=1&b=2', '$.fn.fragment( url, String )' ); equal( test_fn_fragment( 'foo#c=3&a=4', 'b=2&a=1' ) , 'foo#!a=1&b=2&c=3', '$.fn.fragment( url, String )' ); equal( test_fn_fragment( 'foo#!c=3&a=4', 'b=2&a=1' ) , 'foo#!a=1&b=2&c=3', '$.fn.fragment( url, String )' ); - + equal( test_fn_fragment( 'foo', '#' ) , 'foo#!', '$.fn.fragment( url, String )' ); equal( test_fn_fragment( 'foo', '#b=2&a=1' ) , 'foo#!a=1&b=2', '$.fn.fragment( url, String )' ); equal( test_fn_fragment( 'foo#', '#b=2&a=1' ) , 'foo#!a=1&b=2', '$.fn.fragment( url, String )' ); equal( test_fn_fragment( 'foo#!', '#b=2&a=1' ) , 'foo#!a=1&b=2', '$.fn.fragment( url, String )' ); equal( test_fn_fragment( 'foo#c=3&a=4', '#b=2&a=1' ) , 'foo#!a=1&b=2&c=3', '$.fn.fragment( url, String )' ); equal( test_fn_fragment( 'foo#!c=3&a=4', '#b=2&a=1' ) , 'foo#!a=1&b=2&c=3', '$.fn.fragment( url, String )' ); - + equal( test_fn_fragment( 'foo', '#!' ) , 'foo#!', '$.fn.fragment( url, String )' ); equal( test_fn_fragment( 'foo', '#!b=2&a=1' ) , 'foo#!a=1&b=2', '$.fn.fragment( url, String )' ); equal( test_fn_fragment( 'foo#', '#!b=2&a=1' ) , 'foo#!a=1&b=2', '$.fn.fragment( url, String )' ); equal( test_fn_fragment( 'foo#!', '#!b=2&a=1' ) , 'foo#!a=1&b=2', '$.fn.fragment( url, String )' ); equal( test_fn_fragment( 'foo#c=3&a=4', '#!b=2&a=1' ) , 'foo#!a=1&b=2&c=3', '$.fn.fragment( url, String )' ); equal( test_fn_fragment( 'foo#!c=3&a=4', '#!b=2&a=1' ) , 'foo#!a=1&b=2&c=3', '$.fn.fragment( url, String )' ); - + $.param.fragment.ajaxCrawlable( false ); - + // If a params fragment starts with ! and BBQ is not in ajaxCrawlable mode, // things can get very ugly, very quickly. equal( test_fn_fragment( 'foo', '#!' ) , 'foo#!=', '$.fn.fragment( url, String )' ); @@ -887,7 +887,7 @@ test( 'jQuery.fn.fragment', function() { equal( test_fn_fragment( 'foo#!', '#!b=2&a=1' ) , 'foo#!=&!b=2&a=1', '$.fn.fragment( url, String )' ); equal( test_fn_fragment( 'foo#c=3&a=4', '#!b=2&a=1' ) , 'foo#!b=2&a=1&c=3', '$.fn.fragment( url, String )' ); equal( test_fn_fragment( 'foo#!c=3&a=4', '#!b=2&a=1' ) , 'foo#!b=2&!c=3&a=1', '$.fn.fragment( url, String )' ); - + }); //////////////////////////////////////////////////////////////////////////////// @@ -897,21 +897,21 @@ QUnit.module( 'jQuery.bbq' ); test( 'jQuery.bbq.pushState(), jQuery.bbq.getState(), jQuery.bbq.removeState(), window.onhashchange', function() { expect( old_jquery ? 95 : 167 ); - - var a, b, c, d, e, f, x, y, hash, hash_actual, obj, event, msg = 'Testing window.onhashchange and history'; - + + var a:{ str: string, coerce: boolean }, b:{ str: string, coerce: boolean }, c, d, e, f, x, y, hash, hash_actual, obj: { str: string, coerce: boolean }, event:JQueryBbq.EventObject, msg = 'Testing window.onhashchange and history'; + $.bbq.pushState(); equal( window.location.hash.replace( /^#/, ''), '', 'window.location hash should be empty' ); - + $.bbq.pushState({ a:'1', b:'1' }); deepEqual( $.deparam.fragment(), { a:'1', b:'1' }, 'hash should be set properly' ); - + $(window).bind( 'hashchange', function(evt) { var hash_str = $.param.fragment(), param_obj = $.bbq.getState(), param_val = $.bbq.getState( 'param_name' ); - - event = evt; + + //event = evt; hash = $.param.fragment(); hash_actual = location.hash; obj = { str: $.bbq.getState(), coerce: $.bbq.getState( true ) }; @@ -921,40 +921,40 @@ test( 'jQuery.bbq.pushState(), jQuery.bbq.getState(), jQuery.bbq.removeState(), d = { str: $.bbq.getState( 'd' ), coerce: $.bbq.getState( 'd', true ) }; e = { str: $.bbq.getState( 'e' ), coerce: $.bbq.getState( 'e', true ) }; f = { str: $.bbq.getState( 'f' ), coerce: $.bbq.getState( 'f', true ) }; - + }).trigger( 'hashchange' ); - + deepEqual( obj.str, { a:'1', b:'1' }, 'hashchange triggered manually: $.bbq.getState()' ); deepEqual( obj.coerce, { a:1, b:1 }, 'hashchange triggered manually: $.bbq.getState( true )' ); equal( a.str, '1', 'hashchange triggered manually: $.bbq.getState( "a" )' ); equal( a.coerce, 1, 'hashchange triggered manually: $.bbq.getState( "a", true )' ); - + if ( !old_jquery ) { deepEqual( event.getState(), { a:'1', b:'1' }, 'hashchange triggered manually: event.getState()' ); - deepEqual( event.getState(true), { a:1, b:1 }, 'hashchange triggered manually: event.getState( true )' ); + deepEqual( event.getState('a'), { a:1, b:1 }, 'hashchange triggered manually: event.getState( true )' ); equal( event.getState('a'), '1', 'hashchange triggered manually: event.getState( "a" )' ); equal( event.getState('a',true), 1, 'hashchange triggered manually: event.getState( "a", true )' ); } - + run_many_tests( // run asynchronously 250, - + // execute this for each array item function(){ notice( msg += '.' ); $.bbq.pushState.apply( this, aps.call( arguments ) ); }, - + // execute this at the end function(){ notice(); }, - + // tests: - + [ { a:'2' } ], - + function(result){ equal( hash_actual, '#' + hash, 'hash should begin with #!' ); deepEqual( obj.str, { a:'2', b:'1' }, '$.bbq.getState()' ); @@ -963,14 +963,14 @@ test( 'jQuery.bbq.pushState(), jQuery.bbq.getState(), jQuery.bbq.removeState(), equal( a.coerce, 2, '$.bbq.getState( "a", true )' ); if ( !old_jquery ) { deepEqual( event.getState(), { a:'2', b:'1' }, 'event.getState()' ); - deepEqual( event.getState(true), { a:2, b:1 }, 'event.getState( true )' ); + deepEqual( event.getState('a'), { a:2, b:1 }, 'event.getState( true )' ); equal( event.getState('a'), '2', 'event.getState( "a" )' ); equal( event.getState('a',true), 2, 'event.getState( "a", true )' ); } }, - + [ { b:'2' } ], - + function(result){ equal( hash_actual, '#' + hash, 'hash should begin with #!' ); deepEqual( obj.str, { a:'2', b:'2' }, '$.bbq.getState()' ); @@ -979,14 +979,14 @@ test( 'jQuery.bbq.pushState(), jQuery.bbq.getState(), jQuery.bbq.removeState(), equal( b.coerce, 2, '$.bbq.getState( "b", true )' ); if ( !old_jquery ) { deepEqual( event.getState(), { a:'2', b:'2' }, 'event.getState()' ); - deepEqual( event.getState(true), { a:2, b:2 }, 'event.getState( true )' ); + deepEqual( event.getState('a'), { a:2, b:2 }, 'event.getState( true )' ); equal( event.getState('b'), '2', 'event.getState( "b" )' ); equal( event.getState('b',true), 2, 'event.getState( "b", true )' ); } }, - + [ { c:true, d:false, e:'undefined', f:'' } ], - + function(result){ equal( hash_actual, '#' + hash, 'hash should begin with #!' ); deepEqual( obj.str, { a:'2', b:'2', c:'true', d:'false', e:'undefined', f:'' }, '$.bbq.getState()' ); @@ -1001,7 +1001,7 @@ test( 'jQuery.bbq.pushState(), jQuery.bbq.getState(), jQuery.bbq.removeState(), equal( f.coerce, '', '$.bbq.getState( "f", true )' ); if ( !old_jquery ) { deepEqual( event.getState(), { a:'2', b:'2', c:'true', d:'false', e:'undefined', f:'' }, 'event.getState()' ); - deepEqual( event.getState(true), { a:2, b:2, c:true, d:false, e:undefined, f:'' }, 'event.getState( true )' ); + deepEqual( event.getState('a'), { a:2, b:2, c:true, d:false, e:undefined, f:'' }, 'event.getState( true )' ); equal( event.getState('c'), 'true', 'event.getState( "c" )' ); equal( event.getState('c',true), true, 'event.getState( "c", true )' ); equal( event.getState('d'), 'false', 'event.getState( "d" )' ); @@ -1012,15 +1012,15 @@ test( 'jQuery.bbq.pushState(), jQuery.bbq.getState(), jQuery.bbq.removeState(), equal( event.getState('f',true), '', 'event.getState( "f", true )' ); } }, - + function(result){ $.param.fragment.ajaxCrawlable( true ); }, - + function(result){ $.bbq.removeState( 'c' ); }, - + function(result){ equal( hash_actual, '#!' + hash, 'hash should begin with #!' ); deepEqual( obj.str, { a:'2', b:'2', d:'false', e:'undefined', f:'' }, '$.bbq.getState()' ); @@ -1039,7 +1039,7 @@ test( 'jQuery.bbq.pushState(), jQuery.bbq.getState(), jQuery.bbq.removeState(), equal( f.coerce, '', '$.bbq.getState( "f", true )' ); if ( !old_jquery ) { deepEqual( event.getState(), { a:'2', b:'2', d:'false', e:'undefined', f:'' }, 'event.getState()' ); - deepEqual( event.getState(true), { a:2, b:2, d:false, e:undefined, f:'' }, 'event.getState( true )' ); + deepEqual( event.getState('a'), { a:2, b:2, d:false, e:undefined, f:'' }, 'event.getState( true )' ); equal( event.getState('a'), '2', 'event.getState( "a" )' ); equal( event.getState('a',true), 2, 'event.getState( "a", true )' ); equal( event.getState('b'), '2', 'event.getState( "b" )' ); @@ -1054,11 +1054,11 @@ test( 'jQuery.bbq.pushState(), jQuery.bbq.getState(), jQuery.bbq.removeState(), equal( event.getState('f',true), '', 'event.getState( "f", true )' ); } }, - + function(result){ $.bbq.removeState( [ 'd', 'e', 'f', 'nonexistent' ] ); }, - + function(result){ equal( hash_actual, '#!' + hash, 'hash should begin with #!' ); deepEqual( obj.str, { a:'2', b:'2' }, '$.bbq.getState()' ); @@ -1077,7 +1077,7 @@ test( 'jQuery.bbq.pushState(), jQuery.bbq.getState(), jQuery.bbq.removeState(), equal( f.coerce, undefined, '$.bbq.getState( "f", true )' ); if ( !old_jquery ) { deepEqual( event.getState(), { a:'2', b:'2' }, 'event.getState()' ); - deepEqual( event.getState(true), { a:2, b:2 }, 'event.getState( true )' ); + deepEqual( event.getState('a'), { a:2, b:2 }, 'event.getState( true )' ); equal( event.getState('a'), '2', 'event.getState( "a" )' ); equal( event.getState('a',true), 2, 'event.getState( "a", true )' ); equal( event.getState('b'), '2', 'event.getState( "b" )' ); @@ -1092,11 +1092,11 @@ test( 'jQuery.bbq.pushState(), jQuery.bbq.getState(), jQuery.bbq.removeState(), equal( event.getState('f',true), undefined, 'event.getState( "f", true )' ); } }, - + function(result){ $.bbq.removeState(); }, - + function(result){ equal( hash_actual, '#!', 'hash should just be #!' ); deepEqual( obj.str, {}, '$.bbq.getState()' ); @@ -1115,7 +1115,7 @@ test( 'jQuery.bbq.pushState(), jQuery.bbq.getState(), jQuery.bbq.removeState(), equal( f.coerce, undefined, '$.bbq.getState( "f", true )' ); if ( !old_jquery ) { deepEqual( event.getState(), {}, 'event.getState()' ); - deepEqual( event.getState(true), {}, 'event.getState( true )' ); + deepEqual( event.getState('a'), {}, 'event.getState( true )' ); equal( event.getState('a'), undefined, 'event.getState( "a" )' ); equal( event.getState('a',true), undefined, 'event.getState( "a", true )' ); equal( event.getState('b'), undefined, 'event.getState( "b" )' ); @@ -1130,11 +1130,11 @@ test( 'jQuery.bbq.pushState(), jQuery.bbq.getState(), jQuery.bbq.removeState(), equal( event.getState('f',true), undefined, 'event.getState( "f", true )' ); } }, - + [ { a:'2', b:'2', c:true, d:false, e:'undefined', f:'' } ], - + [ { a:[4,5,6]}],//, b:{x:[7], y:8, z:[9,0,'true','false','undefined','']} }, 2 ], - + function(result){ var b_str = old_jquery ? '[object Object]' @@ -1142,7 +1142,7 @@ test( 'jQuery.bbq.pushState(), jQuery.bbq.getState(), jQuery.bbq.removeState(), b_coerce = old_jquery ? '[object Object]' : {x:[7], y:8};//z:[9,0,true,false,undefined,'']}; - + equal( hash_actual, '#!' + hash, 'hash should begin with #!' ); deepEqual( obj.str, { a:['4','5','6'], b:b_str }, '$.bbq.getState()' ); deepEqual( obj.coerce, { a:[4,5,6], b:b_coerce }, '$.bbq.getState( true )' ); @@ -1150,14 +1150,14 @@ test( 'jQuery.bbq.pushState(), jQuery.bbq.getState(), jQuery.bbq.removeState(), deepEqual( a.coerce, [4,5,6], '$.bbq.getState( "a", true )' ); if ( !old_jquery ) { deepEqual( event.getState(), { a:['4','5','6'], b:b_str }, 'event.getState()' ); - deepEqual( event.getState(true), { a:[4,5,6], b:b_coerce }, 'event.getState( true )' ); + deepEqual( event.getState('a'), { a:[4,5,6], b:b_coerce }, 'event.getState( true )' ); deepEqual( event.getState('a'), ['4','5','6'], 'event.getState( "a" )' ); deepEqual( event.getState('a',true), [4,5,6], 'event.getState( "a", true )' ); } }, - + [ { a:'1', c:'2' }, 1 ], - + function(result){ var b_str = old_jquery ? '[object Object]' @@ -1165,18 +1165,18 @@ test( 'jQuery.bbq.pushState(), jQuery.bbq.getState(), jQuery.bbq.removeState(), b_coerce = old_jquery ? '[object Object]' : {x:[7], y:8};//, z:[9,0,true,false,undefined,'']}; - + equal( hash_actual, '#!' + hash, 'hash should begin with #!' ); deepEqual( obj.str, { a:['4','5','6'], b:b_str, c:'2' }, '$.bbq.getState()' ); deepEqual( obj.coerce, { a:[4,5,6], b:b_coerce, c:2 }, '$.bbq.getState( true )' ); if ( !old_jquery ) { deepEqual( event.getState(), { a:['4','5','6'], b:b_str, c:'2' }, 'event.getState()' ); - deepEqual( event.getState(true), { a:[4,5,6], b:b_coerce, c:2 }, 'event.getState( true )' ); + deepEqual( event.getState('a'), { a:[4,5,6], b:b_coerce, c:2 }, 'event.getState( true )' ); } }, - + [ '#/path/to/file.php', 2 ], - + function(result){ equal( hash_actual, '#!' + hash, 'hash should begin with #!' ); equal( hash, '/path/to/file.php', '$.param.fragment()' ); @@ -1184,9 +1184,9 @@ test( 'jQuery.bbq.pushState(), jQuery.bbq.getState(), jQuery.bbq.removeState(), equal( event.fragment, '/path/to/file.php', 'event.fragment' ); } }, - + [], - + function(result){ equal( hash_actual, '#!', 'hash should just be #!' ); equal( hash, '', '$.param.fragment()' ); @@ -1194,67 +1194,67 @@ test( 'jQuery.bbq.pushState(), jQuery.bbq.getState(), jQuery.bbq.removeState(), equal( event.fragment, '', 'event.fragment' ); } }, - + function(result){ $(window).bind( 'hashchange', function(evt){ x = $.param.fragment(); }); }, - + [ '#omg_ponies', 2 ], - + function(result){ equal( hash, 'omg_ponies', 'event handler 1: $.param.fragment()' ); equal( x, 'omg_ponies', 'event handler 2: $.param.fragment()' ); - + hash = x = ''; equal( hash + x, '', 'vars reset' ); - + $(window).triggerHandler( 'hashchange' ); equal( hash, 'omg_ponies', 'event handler 1: $.param.fragment()' ); equal( x, 'omg_ponies', 'event handler 2: $.param.fragment()' ); - + hash = x = ''; equal( hash + x, '', 'vars reset' ); - + $(window).unbind( 'hashchange' ); }, - + [ '#almost_done?not_search', 2 ], - + function(result){ equal( hash, '', 'event handler 1: $.param.fragment()' ); equal( x, '', 'event handler 2: $.param.fragment()' ); - + var events:any;// = $.data( window, 'events' ); ok( !events || !events.hashchange, 'hashchange event unbound' ); }, - + [ '#' ], - + function(result){ x = []; $(window).bind( 'hashchange', function(evt){ x.push( $.param.fragment() ); }); }, - + function(result){ !is_chrome && window.history.go( -1 ); }, - + function(result){ !is_chrome && window.history.go( -1 ); }, - + function(result){ !is_chrome && window.history.go( -1 ); }, - + function(result){ !is_chrome && window.history.go( -1 ); }, - + function(result){ if ( is_chrome ) { // Read about this issue here: http://benalman.com/news/2009/09/chrome-browser-history-buggine/ @@ -1262,20 +1262,20 @@ test( 'jQuery.bbq.pushState(), jQuery.bbq.getState(), jQuery.bbq.removeState(), } else { deepEqual( x, ['almost_done?not_search', 'omg_ponies', '', '/path/to/file.php'], 'back button and window.bbq.go(-1) should work' ); } - + $(window).unbind( 'hashchange' ); var events: any;// = $.data( window, 'events' ); ok( !events || !events.hashchange, 'hashchange event unbound' ); }, - + function(result){ $.param.fragment.ajaxCrawlable( false ); }, - + [ '#all_done' ] - + ); - + }); diff --git a/jqueryui/jqueryui-tests.ts b/jqueryui/jqueryui-tests.ts index 0063a6115b..2cce742f86 100644 --- a/jqueryui/jqueryui-tests.ts +++ b/jqueryui/jqueryui-tests.ts @@ -816,11 +816,7 @@ function test_autocomplete() { }, response); }, search: () => { - // custom minLength - var term = null - if (term.length < 2) { - return false; - } + return false; }, focus: () => { return false; diff --git a/knockout/tests/knockout-templatingBehaviors-tests.ts b/knockout/tests/knockout-templatingBehaviors-tests.ts index 29e09f5729..213ee06f15 100644 --- a/knockout/tests/knockout-templatingBehaviors-tests.ts +++ b/knockout/tests/knockout-templatingBehaviors-tests.ts @@ -120,7 +120,7 @@ describe('Templating', function() { }); it('Should be able to access newly rendered/inserted elements in \'afterRender\' callaback', function () { - var passedElement, passedDataItem; + var passedElement:any, passedDataItem; var myCallback = function(elementsArray, dataItem) { expect(elementsArray.length).toEqual(1); passedElement = elementsArray[0]; diff --git a/knockout/tests/knockout-tests.ts b/knockout/tests/knockout-tests.ts index 1f9f52ff47..ba96f6863f 100644 --- a/knockout/tests/knockout-tests.ts +++ b/knockout/tests/knockout-tests.ts @@ -242,7 +242,13 @@ function test_bindings() { } }; - var node, containerElem, nodeToInsert, insertAfter, nodeToPrepend, arrayOfNodes; + var node: Node = {}; + var insertAfter: Node = {}; + var nodeToPrepend: Node = {}; + var arrayOfNodes: Node[] = []; + var containerElem: KnockoutVirtualElement = {}; + var nodeToInsert: Node = {} + ko.virtualElements.emptyNode(containerElem); ko.virtualElements.firstChild(containerElem); ko.virtualElements.insertAfter(containerElem, nodeToInsert, insertAfter); @@ -568,7 +574,7 @@ function test_misc() { var x = ko.observableArray([1, 2, 3]); - var element; + var element: Element = {}; ko.utils.domNodeDisposal.addDisposeCallback(element, function () { $(element).datepicker("destroy"); }); diff --git a/kolite/kolite-tests.ts b/kolite/kolite-tests.ts index 698e915578..539c284861 100644 --- a/kolite/kolite-tests.ts +++ b/kolite/kolite-tests.ts @@ -7,11 +7,11 @@ function test_activityDefaults() { container: 'i', inactiveClass: '' }; - + ko.bindingHandlers.activity.defaultOptions = { activityClass: 'some Value' }; - + ko.bindingHandlers.activity.defaultOptions = { }; } @@ -60,12 +60,12 @@ function test_asyncCommand_isExecuting() { } function test_dirtyFlag() { - var viewModel; + var viewModel: any; viewModel.dirtyFlag = new ko.DirtyFlag(viewModel.model); viewModel.dirtyFlag().isDirty(); viewModel.dirtyFlag().reset(); - var self; + var self: any; this.dirtyFlag = new ko.DirtyFlag( self.firstName, self.lastName); diff --git a/physijs/tests/body.ts b/physijs/tests/body.ts index 83924a9a4d..4cb57a40d9 100644 --- a/physijs/tests/body.ts +++ b/physijs/tests/body.ts @@ -13,20 +13,20 @@ initScene = function() { renderer = new THREE.WebGLRenderer({ antialias: true }); renderer.setSize( window.innerWidth, window.innerHeight ); renderer.shadowMapEnabled = true; - renderer.shadowMapSoft = true; + // // renderer.shadowMapSoft = true; document.getElementById( 'viewport' ).appendChild( renderer.domElement ); render_stats = new Stats(); - render_stats.domElement.style.position = 'absolute'; - render_stats.domElement.style.top = '1px'; - render_stats.domElement.style.zIndex = 100; - document.getElementById( 'viewport' ).appendChild( render_stats.domElement ); + render_stats.dom.style.position = 'absolute'; + render_stats.dom.style.top = '1px'; + render_stats.dom.style.zIndex = '100'; + document.getElementById( 'viewport' ).appendChild( render_stats.dom ); physics_stats = new Stats(); - physics_stats.domElement.style.position = 'absolute'; - physics_stats.domElement.style.top = '50px'; - physics_stats.domElement.style.zIndex = 100; - document.getElementById( 'viewport' ).appendChild( physics_stats.domElement ); + physics_stats.dom.style.position = 'absolute'; + physics_stats.dom.style.top = '50px'; + physics_stats.dom.style.zIndex = '100'; + document.getElementById( 'viewport' ).appendChild( physics_stats.dom ); scene = new Physijs.Scene(); scene.setGravity(new THREE.Vector3( 0, -30, 0 )); @@ -62,7 +62,7 @@ initScene = function() { light.shadowCameraFar = 200; light.shadowBias = -.0001 light.shadowMapWidth = light.shadowMapHeight = 2048; - light.shadowDarkness = .7; + //// light.shadowDarkness = .7; scene.add( light ); // Materials @@ -71,16 +71,16 @@ initScene = function() { .8, // high friction .4 // low restitution ); - ground_material.map.wrapS = ground_material.map.wrapT = THREE.RepeatWrapping; - ground_material.map.repeat.set( 3, 3 ); + // ground_material.map.wrapS = ground_material.map.wrapT = THREE.RepeatWrapping; + // ground_material.map.repeat.set( 3, 3 ); box_material = Physijs.createMaterial( new THREE.MeshLambertMaterial({ map: THREE.ImageUtils.loadTexture( 'images/plywood.jpg' ) }), .4, // low friction .6 // high restitution ); - box_material.map.wrapS = ground_material.map.wrapT = THREE.RepeatWrapping; - box_material.map.repeat.set( .25, .25 ); + // box_material.map.wrapS = ground_material.map.wrapT = THREE.RepeatWrapping; + // box_material.map.repeat.set( .25, .25 ); // Ground ground = new Physijs.BoxMesh( @@ -131,8 +131,8 @@ render = function() { setMousePosition = function( evt ) { // Find where mouse cursor intersects the ground plane var vector = new THREE.Vector3( - ( evt.clientX / renderer.domElement.clientWidth ) * 2 - 1, - -( ( evt.clientY / renderer.domElement.clientHeight ) * 2 - 1 ), + ( evt.clientX / renderer.dom.clientWidth ) * 2 - 1, + -( ( evt.clientY / renderer.dom.clientHeight ) * 2 - 1 ), .5 ); projector.unprojectVector( vector, camera ); diff --git a/physijs/tests/collisions.ts b/physijs/tests/collisions.ts index 82cb9f9589..6946cf8457 100644 --- a/physijs/tests/collisions.ts +++ b/physijs/tests/collisions.ts @@ -12,20 +12,20 @@ initScene = function() { renderer = new THREE.WebGLRenderer({ antialias: true }); renderer.setSize( window.innerWidth, window.innerHeight ); renderer.shadowMapEnabled = true; - renderer.shadowMapSoft = true; + // // renderer.shadowMapSoft = true; document.getElementById( 'viewport' ).appendChild( renderer.domElement ); render_stats = new Stats(); - render_stats.domElement.style.position = 'absolute'; - render_stats.domElement.style.top = '0px'; - render_stats.domElement.style.zIndex = 100; - document.getElementById( 'viewport' ).appendChild( render_stats.domElement ); + render_stats.dom.style.position = 'absolute'; + render_stats.dom.style.top = '0px'; + render_stats.dom.style.zIndex = '100'; + document.getElementById( 'viewport' ).appendChild( render_stats.dom ); physics_stats = new Stats(); - physics_stats.domElement.style.position = 'absolute'; - physics_stats.domElement.style.top = '50px'; - physics_stats.domElement.style.zIndex = 100; - document.getElementById( 'viewport' ).appendChild( physics_stats.domElement ); + physics_stats.dom.style.position = 'absolute'; + physics_stats.dom.style.top = '50px'; + physics_stats.dom.style.zIndex = '100'; + document.getElementById( 'viewport' ).appendChild( physics_stats.dom ); scene = new Physijs.Scene; scene.setGravity(new THREE.Vector3( 0, -30, 0 )); @@ -60,7 +60,7 @@ initScene = function() { light.shadowCameraFar = 200; light.shadowBias = -.0001 light.shadowMapWidth = light.shadowMapHeight = 2048; - light.shadowDarkness = .7; + //// light.shadowDarkness = .7; scene.add( light ); // Ground @@ -69,8 +69,8 @@ initScene = function() { .8, // high friction .3 // low restitution ); - ground_material.map.wrapS = ground_material.map.wrapT = THREE.RepeatWrapping; - ground_material.map.repeat.set( 3, 3 ); + //ground_material.map.wrapS = ground_material.map.wrapT = THREE.RepeatWrapping; + // ground_material.map.repeat.set( 3, 3 ); ground = new Physijs.BoxMesh( new THREE.BoxGeometry(100, 1, 100), @@ -89,7 +89,7 @@ initScene = function() { spawnBox = (function() { var box_geometry = new THREE.BoxGeometry( 4, 4, 4 ), - handleCollision = function( collided_with, linearVelocity, angularVelocity ) { + handleCollision = function( collided_with ) { var target = this; target.collisions = 0; switch (++target.collisions) { @@ -127,8 +127,8 @@ spawnBox = (function() { .6, // medium friction .3 // low restitution ); - material.map.wrapS = material.map.wrapT = THREE.RepeatWrapping; - material.map.repeat.set( .5, .5 ); + // material.map.wrapS = material.map.wrapT = THREE.RepeatWrapping; + // material.map.repeat.set( .5, .5 ); //material = new THREE.MeshLambertMaterial({ map: THREE.ImageUtils.loadTexture( 'images/rocks.jpg' ) }); @@ -137,7 +137,7 @@ spawnBox = (function() { material ); - box.collisions = 0; + // box.collisions = 0; box.position.set( Math.random() * 15 - 7.5, diff --git a/physijs/tests/compound.ts b/physijs/tests/compound.ts index 36e4a48e1a..c5445d7776 100644 --- a/physijs/tests/compound.ts +++ b/physijs/tests/compound.ts @@ -12,20 +12,20 @@ initScene = function() { renderer = new THREE.WebGLRenderer({ antialias: true }); renderer.setSize( window.innerWidth, window.innerHeight ); renderer.shadowMapEnabled = true; - renderer.shadowMapSoft = true; + // renderer.shadowMapSoft = true; document.getElementById( 'viewport' ).appendChild( renderer.domElement ); render_stats = new Stats(); - render_stats.domElement.style.position = 'absolute'; - render_stats.domElement.style.top = '0px'; - render_stats.domElement.style.zIndex = 100; - document.getElementById( 'viewport' ).appendChild( render_stats.domElement ); + render_stats.dom.style.position = 'absolute'; + render_stats.dom.style.top = '0px'; + render_stats.dom.style.zIndex = '100'; + document.getElementById( 'viewport' ).appendChild( render_stats.dom ); physics_stats = new Stats(); - physics_stats.domElement.style.position = 'absolute'; - physics_stats.domElement.style.top = '50px'; - physics_stats.domElement.style.zIndex = 100; - document.getElementById( 'viewport' ).appendChild( physics_stats.domElement ); + physics_stats.dom.style.position = 'absolute'; + physics_stats.dom.style.top = '50px'; + physics_stats.dom.style.zIndex = '100'; + document.getElementById( 'viewport' ).appendChild( physics_stats.dom ); scene = new Physijs.Scene; scene.setGravity(new THREE.Vector3( 0, -50, 0 )); @@ -60,7 +60,7 @@ initScene = function() { light.shadowCameraFar = 200; light.shadowBias = -.0001 light.shadowMapWidth = light.shadowMapHeight = 2048; - light.shadowDarkness = .7; + // light.shadowDarkness = .7; scene.add( light ); // Materials @@ -69,16 +69,16 @@ initScene = function() { .8, // high friction .4 // low restitution ); - ground_material.map.wrapS = ground_material.map.wrapT = THREE.RepeatWrapping; - ground_material.map.repeat.set( 3, 3 ); + // ground_material.map.wrapS = ground_material.map.wrapT = THREE.RepeatWrapping; + // ground_material.map.repeat.set( 3, 3 ); chair_material = Physijs.createMaterial( new THREE.MeshLambertMaterial({ map: THREE.ImageUtils.loadTexture( 'images/wood.jpg' ) }), .6, // medium friction .2 // low restitution ); - chair_material.map.wrapS = chair_material.map.wrapT = THREE.RepeatWrapping; - chair_material.map.repeat.set( .25, .25 ); + // chair_material.map.wrapS = chair_material.map.wrapT = THREE.RepeatWrapping; + // chair_material.map.repeat.set( .25, .25 ); // Ground ground = new Physijs.BoxMesh( diff --git a/physijs/tests/constraints_car.ts b/physijs/tests/constraints_car.ts index 4e343c06d1..2863253d63 100644 --- a/physijs/tests/constraints_car.ts +++ b/physijs/tests/constraints_car.ts @@ -14,20 +14,20 @@ initScene = function() { renderer = new THREE.WebGLRenderer({ antialias: true }); renderer.setSize( window.innerWidth, window.innerHeight ); renderer.shadowMapEnabled = true; - renderer.shadowMapSoft = true; + // // renderer.shadowMapSoft = true; document.getElementById( 'viewport' ).appendChild( renderer.domElement ); render_stats = new Stats(); - render_stats.domElement.style.position = 'absolute'; - render_stats.domElement.style.top = '0px'; - render_stats.domElement.style.zIndex = 100; - document.getElementById( 'viewport' ).appendChild( render_stats.domElement ); + render_stats.dom.style.position = 'absolute'; + render_stats.dom.style.top = '0px'; + render_stats.dom.style.zIndex = '100'; + document.getElementById( 'viewport' ).appendChild( render_stats.dom ); physics_stats = new Stats(); - physics_stats.domElement.style.position = 'absolute'; - physics_stats.domElement.style.top = '50px'; - physics_stats.domElement.style.zIndex = 100; - document.getElementById( 'viewport' ).appendChild( physics_stats.domElement ); + physics_stats.dom.style.position = 'absolute'; + physics_stats.dom.style.top = '50px'; + physics_stats.dom.style.zIndex = '100'; + document.getElementById( 'viewport' ).appendChild( physics_stats.dom ); scene = new Physijs.Scene; scene.setGravity(new THREE.Vector3( 0, -30, 0 )); @@ -62,7 +62,7 @@ initScene = function() { light.shadowCameraFar = 200; light.shadowBias = -.0001 light.shadowMapWidth = light.shadowMapHeight = 2048; - light.shadowDarkness = .7; + //// light.shadowDarkness = .7; scene.add( light ); // Materials @@ -71,8 +71,8 @@ initScene = function() { .8, // high friction .4 // low restitution ); - ground_material.map.wrapS = ground_material.map.wrapT = THREE.RepeatWrapping; - ground_material.map.repeat.set( 3, 3 ); + // ground_material.map.wrapS = ground_material.map.wrapT = THREE.RepeatWrapping; + // ground_material.map.repeat.set( 3, 3 ); // Ground ground = new Physijs.BoxMesh( diff --git a/physijs/tests/heightfield.ts b/physijs/tests/heightfield.ts index 30caf48398..d184d705ea 100644 --- a/physijs/tests/heightfield.ts +++ b/physijs/tests/heightfield.ts @@ -17,20 +17,20 @@ initScene = function() { renderer = new THREE.WebGLRenderer({ antialias: true }); renderer.setSize( window.innerWidth, window.innerHeight ); renderer.shadowMapEnabled = true; - renderer.shadowMapSoft = true; + // // renderer.shadowMapSoft = true; document.getElementById( 'viewport' ).appendChild( renderer.domElement ); render_stats = new Stats(); - render_stats.domElement.style.position = 'absolute'; - render_stats.domElement.style.top = '0px'; - render_stats.domElement.style.zIndex = 100; - document.getElementById( 'viewport' ).appendChild( render_stats.domElement ); + render_stats.dom.style.position = 'absolute'; + render_stats.dom.style.top = '0px'; + render_stats.dom.style.zIndex = '100'; + document.getElementById( 'viewport' ).appendChild( render_stats.dom ); physics_stats = new Stats(); - physics_stats.domElement.style.position = 'absolute'; - physics_stats.domElement.style.top = '50px'; - physics_stats.domElement.style.zIndex = 100; - document.getElementById( 'viewport' ).appendChild( physics_stats.domElement ); + physics_stats.dom.style.position = 'absolute'; + physics_stats.dom.style.top = '50px'; + physics_stats.dom.style.zIndex = '100'; + document.getElementById( 'viewport' ).appendChild( physics_stats.dom ); scene = new Physijs.Scene({ fixedTimeStep: 1 / 120 }); scene.setGravity(new THREE.Vector3( 0, -30, 0 )); @@ -65,7 +65,7 @@ initScene = function() { light.shadowCameraFar = 200; light.shadowBias = -.0001 light.shadowMapWidth = light.shadowMapHeight = 2048; - light.shadowDarkness = .7; + // // light.shadowDarkness = .7; scene.add( light ); // Materials @@ -74,8 +74,8 @@ initScene = function() { .8, // high friction .4 // low restitution ); - ground_material.map.wrapS = ground_material.map.wrapT = THREE.RepeatWrapping; - ground_material.map.repeat.set( 2.5, 2.5 ); + // ground_material.map.wrapS = ground_material.map.wrapT = THREE.RepeatWrapping; + // ground_material.map.repeat.set( 2.5, 2.5 ); // Ground NoiseGen = new SimplexNoise; @@ -155,7 +155,7 @@ createShape = (function() { break; } - shape.material.color.setRGB( Math.random() * 100 / 100, Math.random() * 100 / 100, Math.random() * 100 / 100 ); + // shape.material.color.setRGB( Math.random() * 100 / 100, Math.random() * 100 / 100, Math.random() * 100 / 100 ); shape.castShadow = true; shape.receiveShadow = true; diff --git a/physijs/tests/jenga.ts b/physijs/tests/jenga.ts index 43a4d924de..d4a333f426 100644 --- a/physijs/tests/jenga.ts +++ b/physijs/tests/jenga.ts @@ -12,20 +12,20 @@ initScene = function() { renderer = new THREE.WebGLRenderer({ antialias: true }); renderer.setSize( window.innerWidth, window.innerHeight ); renderer.shadowMapEnabled = true; - renderer.shadowMapSoft = true; + // // renderer.shadowMapSoft = true; document.getElementById( 'viewport' ).appendChild( renderer.domElement ); render_stats = new Stats(); - render_stats.domElement.style.position = 'absolute'; - render_stats.domElement.style.top = '1px'; - render_stats.domElement.style.zIndex = 100; - document.getElementById( 'viewport' ).appendChild( render_stats.domElement ); + render_stats.dom.style.position = 'absolute'; + render_stats.dom.style.top = '1px'; + render_stats.dom.style.zIndex = '100'; + document.getElementById( 'viewport' ).appendChild( render_stats.dom ); physics_stats = new Stats(); - physics_stats.domElement.style.position = 'absolute'; - physics_stats.domElement.style.top = '50px'; - physics_stats.domElement.style.zIndex = 100; - document.getElementById( 'viewport' ).appendChild( physics_stats.domElement ); + physics_stats.dom.style.position = 'absolute'; + physics_stats.dom.style.top = '50px'; + physics_stats.dom.style.zIndex = '100'; + document.getElementById( 'viewport' ).appendChild( physics_stats.dom ); scene = new Physijs.Scene({ fixedTimeStep: 1 / 120 }); scene.setGravity(new THREE.Vector3( 0, -30, 0 )); @@ -78,7 +78,7 @@ initScene = function() { dir_light.shadowCameraFar = 200; dir_light.shadowBias = -.001 dir_light.shadowMapWidth = dir_light.shadowMapHeight = 2048; - dir_light.shadowDarkness = .5; + // dir_light.shadowDarkness = .5; scene.add( dir_light ); // Materials @@ -87,16 +87,16 @@ initScene = function() { .9, // high friction .2 // low restitution ); - table_material.map.wrapS = table_material.map.wrapT = THREE.RepeatWrapping; - table_material.map.repeat.set( 5, 5 ); + // table_material.map.wrapS = table_material.map.wrapT = THREE.RepeatWrapping; + // table_material.map.repeat.set( 5, 5 ); block_material = Physijs.createMaterial( new THREE.MeshLambertMaterial({ map: THREE.ImageUtils.loadTexture( 'images/plywood.jpg' ) }), .4, // medium friction .4 // medium restitution ); - block_material.map.wrapS = block_material.map.wrapT = THREE.RepeatWrapping; - block_material.map.repeat.set( 1, .5 ); + // block_material.map.wrapS = block_material.map.wrapT = THREE.RepeatWrapping; + // block_material.map.repeat.set( 1, .5 ); // Table table = new Physijs.BoxMesh( @@ -179,10 +179,10 @@ initEventHandling = (function() { selected_block = intersections[0].object; _vector.set( 0, 0, 0 ); - selected_block.setAngularFactor( _vector ); - selected_block.setAngularVelocity( _vector ); - selected_block.setLinearFactor( _vector ); - selected_block.setLinearVelocity( _vector ); + // selected_block.setAngularFactor( _vector ); + // selected_block.setAngularVelocity( _vector ); + // selected_block.setLinearFactor( _vector ); + // selected_block.setLinearVelocity( _vector ); mouse_pos.copy( intersections[0].point ); block_offset.subVectors( selected_block.position, mouse_pos ); @@ -225,9 +225,9 @@ initEventHandling = (function() { }; return function() { - renderer.domElement.addEventListener( 'mousedown', handleMouseDown ); - renderer.domElement.addEventListener( 'mousemove', handleMouseMove ); - renderer.domElement.addEventListener( 'mouseup', handleMouseUp ); + renderer.dom.addEventListener( 'mousedown', handleMouseDown ); + renderer.dom.addEventListener( 'mousemove', handleMouseMove ); + renderer.dom.addEventListener( 'mouseup', handleMouseUp ); }; })(); diff --git a/physijs/tests/memorytest-compound.ts b/physijs/tests/memorytest-compound.ts index b755092ac2..a30a56658e 100644 --- a/physijs/tests/memorytest-compound.ts +++ b/physijs/tests/memorytest-compound.ts @@ -17,20 +17,20 @@ initScene = function() { renderer = new THREE.WebGLRenderer({ antialias: true }); renderer.setSize( window.innerWidth, window.innerHeight ); renderer.shadowMapEnabled = true; - renderer.shadowMapSoft = true; + // // renderer.shadowMapSoft = true; document.getElementById( 'viewport' ).appendChild( renderer.domElement ); render_stats = new Stats(); - render_stats.domElement.style.position = 'absolute'; - render_stats.domElement.style.top = '0px'; - render_stats.domElement.style.zIndex = 100; - document.getElementById( 'viewport' ).appendChild( render_stats.domElement ); + render_stats.dom.style.position = 'absolute'; + render_stats.dom.style.top = '0px'; + render_stats.dom.style.zIndex = '100'; + document.getElementById( 'viewport' ).appendChild( render_stats.dom ); physics_stats = new Stats(); - physics_stats.domElement.style.position = 'absolute'; - physics_stats.domElement.style.top = '50px'; - physics_stats.domElement.style.zIndex = 100; - document.getElementById( 'viewport' ).appendChild( physics_stats.domElement ); + physics_stats.dom.style.position = 'absolute'; + physics_stats.dom.style.top = '50px'; + physics_stats.dom.style.zIndex = '100'; + document.getElementById( 'viewport' ).appendChild( physics_stats.dom ); scene = new Physijs.Scene; scene.setGravity(new THREE.Vector3( 0, -30, 0 )); @@ -81,7 +81,7 @@ initScene = function() { light.shadowCameraFar = 200; light.shadowBias = -.0001 light.shadowMapWidth = light.shadowMapHeight = 2048; - light.shadowDarkness = .7; + // // light.shadowDarkness = .7; scene.add( light ); // Ground @@ -90,8 +90,8 @@ initScene = function() { .8, // high friction .3 // low restitution ); - ground_material.map.wrapS = ground_material.map.wrapT = THREE.RepeatWrapping; - ground_material.map.repeat.set( 3, 3 ); + // ground_material.map.wrapS = ground_material.map.wrapT = THREE.RepeatWrapping; + // ground_material.map.repeat.set( 3, 3 ); ground = new Physijs.BoxMesh( new THREE.BoxGeometry(100, 1, 100), @@ -119,7 +119,7 @@ spawnBox = (function() { .3 // low restitution ); - material.color.setRGB(Math.random() * 100 / 100, Math.random() * 100 / 100, Math.random() * 100 / 100); + // material.color.setRGB(Math.random() * 100 / 100, Math.random() * 100 / 100, Math.random() * 100 / 100); box = new Physijs.BoxMesh( box_geometry, @@ -130,8 +130,8 @@ spawnBox = (function() { material ); - childBox.collisions = 0; - box.collisions = 0; + // childBox.collisions = 0; + // box.collisions = 0; box.add(childBox); box.position.set( diff --git a/physijs/tests/memorytest-convex.ts b/physijs/tests/memorytest-convex.ts index 4a73bd6130..a46183498a 100644 --- a/physijs/tests/memorytest-convex.ts +++ b/physijs/tests/memorytest-convex.ts @@ -17,20 +17,20 @@ initScene = function() { renderer = new THREE.WebGLRenderer({ antialias: true }); renderer.setSize( window.innerWidth, window.innerHeight ); renderer.shadowMapEnabled = true; - renderer.shadowMapSoft = true; + // renderer.shadowMapSoft = true; document.getElementById( 'viewport' ).appendChild( renderer.domElement ); render_stats = new Stats(); - render_stats.domElement.style.position = 'absolute'; - render_stats.domElement.style.top = '0px'; - render_stats.domElement.style.zIndex = 100; - document.getElementById( 'viewport' ).appendChild( render_stats.domElement ); + render_stats.dom.style.position = 'absolute'; + render_stats.dom.style.top = '0px'; + render_stats.dom.style.zIndex = '100'; + document.getElementById( 'viewport' ).appendChild( render_stats.dom ); physics_stats = new Stats(); - physics_stats.domElement.style.position = 'absolute'; - physics_stats.domElement.style.top = '50px'; - physics_stats.domElement.style.zIndex = 100; - document.getElementById( 'viewport' ).appendChild( physics_stats.domElement ); + physics_stats.dom.style.position = 'absolute'; + physics_stats.dom.style.top = '50px'; + physics_stats.dom.style.zIndex = '100'; + document.getElementById( 'viewport' ).appendChild( physics_stats.dom ); scene = new Physijs.Scene; scene.setGravity(new THREE.Vector3( 0, -30, 0 )); @@ -81,7 +81,7 @@ initScene = function() { light.shadowCameraFar = 200; light.shadowBias = -.0001 light.shadowMapWidth = light.shadowMapHeight = 2048; - light.shadowDarkness = .7; + // light.shadowDarkness = .7; scene.add( light ); // Ground @@ -90,8 +90,8 @@ initScene = function() { .8, // high friction .3 // low restitution ); - ground_material.map.wrapS = ground_material.map.wrapT = THREE.RepeatWrapping; - ground_material.map.repeat.set( 3, 3 ); + // ground_material.map.wrapS = ground_material.map.wrapT = THREE.RepeatWrapping; + // ground_material.map.repeat.set( 3, 3 ); ground = new Physijs.BoxMesh( new THREE.BoxGeometry(100, 1, 100), @@ -119,13 +119,13 @@ spawnBox = (function() { .3 // low restitution ); - material.color.setRGB(Math.random() * 100 / 100, Math.random() * 100 / 100, Math.random() * 100 / 100); + // material.color.setRGB(Math.random() * 100 / 100, Math.random() * 100 / 100, Math.random() * 100 / 100); box = new Physijs.ConvexMesh( box_geometry, material ); - box.collisions = 0; + // box.collisions = 0; box.position.set( Math.random() * 15 - 7.5, diff --git a/physijs/tests/memorytest.ts b/physijs/tests/memorytest.ts index 4b5d6ac325..d7c2a3ddc3 100644 --- a/physijs/tests/memorytest.ts +++ b/physijs/tests/memorytest.ts @@ -17,20 +17,20 @@ initScene = function() { renderer = new THREE.WebGLRenderer({ antialias: true }); renderer.setSize( window.innerWidth, window.innerHeight ); renderer.shadowMapEnabled = true; - renderer.shadowMapSoft = true; + // renderer.shadowMapSoft = true; document.getElementById( 'viewport' ).appendChild( renderer.domElement ); render_stats = new Stats(); - render_stats.domElement.style.position = 'absolute'; - render_stats.domElement.style.top = '0px'; - render_stats.domElement.style.zIndex = 100; - document.getElementById( 'viewport' ).appendChild( render_stats.domElement ); + render_stats.dom.style.position = 'absolute'; + render_stats.dom.style.top = '0px'; + render_stats.dom.style.zIndex = '100'; + document.getElementById( 'viewport' ).appendChild( render_stats.dom ); physics_stats = new Stats(); - physics_stats.domElement.style.position = 'absolute'; - physics_stats.domElement.style.top = '50px'; - physics_stats.domElement.style.zIndex = 100; - document.getElementById( 'viewport' ).appendChild( physics_stats.domElement ); + physics_stats.dom.style.position = 'absolute'; + physics_stats.dom.style.top = '50px'; + physics_stats.dom.style.zIndex = '100'; + document.getElementById( 'viewport' ).appendChild( physics_stats.dom ); scene = new Physijs.Scene; scene.setGravity(new THREE.Vector3( 0, -30, 0 )); @@ -81,7 +81,7 @@ initScene = function() { light.shadowCameraFar = 200; light.shadowBias = -.0001 light.shadowMapWidth = light.shadowMapHeight = 2048; - light.shadowDarkness = .7; + // light.shadowDarkness = .7; scene.add( light ); // Ground @@ -90,8 +90,8 @@ initScene = function() { .8, // high friction .3 // low restitution ); - ground_material.map.wrapS = ground_material.map.wrapT = THREE.RepeatWrapping; - ground_material.map.repeat.set( 3, 3 ); + // ground_material.map.wrapS = ground_material.map.wrapT = THREE.RepeatWrapping; + // ground_material.map.repeat.set( 3, 3 ); ground = new Physijs.BoxMesh( new THREE.BoxGeometry(100, 1, 100), @@ -119,13 +119,13 @@ spawnBox = (function() { .3 // low restitution ); - material.color.setRGB(Math.random() * 100 / 100, Math.random() * 100 / 100, Math.random() * 100 / 100); + // material.color.setRGB(Math.random() * 100 / 100, Math.random() * 100 / 100, Math.random() * 100 / 100); box = new Physijs.BoxMesh( box_geometry, material ); - box.collisions = 0; + // box.collisions = 0; box.position.set( Math.random() * 15 - 7.5, diff --git a/physijs/tests/shapes.ts b/physijs/tests/shapes.ts index b5cecd0262..72f3cda0c2 100644 --- a/physijs/tests/shapes.ts +++ b/physijs/tests/shapes.ts @@ -18,20 +18,20 @@ initScene = function() { renderer = new THREE.WebGLRenderer({ antialias: true }); renderer.setSize( window.innerWidth, window.innerHeight ); renderer.shadowMapEnabled = true; - renderer.shadowMapSoft = true; + // renderer.shadowMapSoft = true; document.getElementById( 'viewport' ).appendChild( renderer.domElement ); render_stats = new Stats(); - render_stats.domElement.style.position = 'absolute'; - render_stats.domElement.style.top = '0px'; - render_stats.domElement.style.zIndex = 100; - document.getElementById( 'viewport' ).appendChild( render_stats.domElement ); + render_stats.dom.style.position = 'absolute'; + render_stats.dom.style.top = '0px'; + render_stats.dom.style.zIndex = '100'; + document.getElementById( 'viewport' ).appendChild( render_stats.dom ); physics_stats = new Stats(); - physics_stats.domElement.style.position = 'absolute'; - physics_stats.domElement.style.top = '50px'; - physics_stats.domElement.style.zIndex = 100; - document.getElementById( 'viewport' ).appendChild( physics_stats.domElement ); + physics_stats.dom.style.position = 'absolute'; + physics_stats.dom.style.top = '50px'; + physics_stats.dom.style.zIndex = '100'; + document.getElementById( 'viewport' ).appendChild( physics_stats.dom ); scene = new Physijs.Scene({ fixedTimeStep: 1 / 120 }); scene.setGravity(new THREE.Vector3( 0, -30, 0 )); @@ -66,7 +66,7 @@ initScene = function() { light.shadowCameraFar = 200; light.shadowBias = -.0001 light.shadowMapWidth = light.shadowMapHeight = 2048; - light.shadowDarkness = .7; + // light.shadowDarkness = .7; scene.add( light ); // Materials @@ -75,8 +75,8 @@ initScene = function() { .8, // high friction .4 // low restitution ); - ground_material.map.wrapS = ground_material.map.wrapT = THREE.RepeatWrapping; - ground_material.map.repeat.set( 2.5, 2.5 ); + // ground_material.map.wrapS = ground_material.map.wrapT = THREE.RepeatWrapping; + // ground_material.map.repeat.set( 2.5, 2.5 ); // Ground ground = new Physijs.BoxMesh( @@ -204,7 +204,7 @@ createShape = (function() { break; } - shape.material.color.setRGB( Math.random() * 100 / 100, Math.random() * 100 / 100, Math.random() * 100 / 100 ); + // shape.material.color.setRGB( Math.random() * 100 / 100, Math.random() * 100 / 100, Math.random() * 100 / 100 ); shape.castShadow = true; shape.receiveShadow = true; diff --git a/physijs/tests/vehicle.ts b/physijs/tests/vehicle.ts index b133299a5b..beecaa1c8b 100644 --- a/physijs/tests/vehicle.ts +++ b/physijs/tests/vehicle.ts @@ -18,20 +18,20 @@ initScene = function() { renderer = new THREE.WebGLRenderer({ antialias: true }); renderer.setSize( window.innerWidth, window.innerHeight ); renderer.shadowMapEnabled = true; - renderer.shadowMapSoft = true; + // renderer.shadowMapSoft = true; document.getElementById( 'viewport' ).appendChild( renderer.domElement ); render_stats = new Stats(); - render_stats.domElement.style.position = 'absolute'; - render_stats.domElement.style.top = '1px'; - render_stats.domElement.style.zIndex = 100; - document.getElementById( 'viewport' ).appendChild( render_stats.domElement ); + render_stats.dom.style.position = 'absolute'; + render_stats.dom.style.top = '1px'; + render_stats.dom.style.zIndex = '100'; + document.getElementById( 'viewport' ).appendChild( render_stats.dom ); physics_stats = new Stats(); - physics_stats.domElement.style.position = 'absolute'; - physics_stats.domElement.style.top = '50px'; - physics_stats.domElement.style.zIndex = 100; - document.getElementById( 'viewport' ).appendChild( physics_stats.domElement ); + physics_stats.dom.style.position = 'absolute'; + physics_stats.dom.style.top = '50px'; + physics_stats.dom.style.zIndex = '100'; + document.getElementById( 'viewport' ).appendChild( physics_stats.dom ); scene = new Physijs.Scene; scene.setGravity(new THREE.Vector3( 0, -30, 0 )); @@ -84,7 +84,7 @@ initScene = function() { light.shadowCameraFar = 400; light.shadowBias = -.0001 light.shadowMapWidth = light.shadowMapHeight = 2048; - light.shadowDarkness = .7; + // light.shadowDarkness = .7; scene.add( light ); @@ -97,16 +97,16 @@ initScene = function() { .8, // high friction .4 // low restitution ); - ground_material.map.wrapS = ground_material.map.wrapT = THREE.RepeatWrapping; - ground_material.map.repeat.set( 3, 3 ); + // ground_material.map.wrapS = ground_material.map.wrapT = THREE.RepeatWrapping; + // ground_material.map.repeat.set( 3, 3 ); box_material = Physijs.createMaterial( new THREE.MeshLambertMaterial({ map: THREE.ImageUtils.loadTexture( 'images/plywood.jpg' ) }), .4, // low friction .6 // high restitution ); - box_material.map.wrapS = ground_material.map.wrapT = THREE.RepeatWrapping; - box_material.map.repeat.set( .25, .25 ); + // box_material.map.wrapS = ground_material.map.wrapT = THREE.RepeatWrapping; + // box_material.map.repeat.set( .25, .25 ); // Ground var NoiseGen = new SimplexNoise; diff --git a/three/tests/canvas/canvas_camera_orthographic.ts b/three/tests/canvas/canvas_camera_orthographic.ts index 785512835f..c3b793fb14 100644 --- a/three/tests/canvas/canvas_camera_orthographic.ts +++ b/three/tests/canvas/canvas_camera_orthographic.ts @@ -96,9 +96,9 @@ container.appendChild(renderer.domElement); stats = new Stats(); - stats.domElement.style.position = 'absolute'; - stats.domElement.style.top = '0px'; - container.appendChild(stats.domElement); + stats.dom.style.position = 'absolute'; + stats.dom.style.top = '0px'; + container.appendChild(stats.dom); // diff --git a/three/tests/canvas/canvas_geometry_cube.ts b/three/tests/canvas/canvas_geometry_cube.ts index b1af3f97a2..3c704c8f6f 100644 --- a/three/tests/canvas/canvas_geometry_cube.ts +++ b/three/tests/canvas/canvas_geometry_cube.ts @@ -76,9 +76,9 @@ container.appendChild(renderer.domElement); stats = new Stats(); - stats.domElement.style.position = 'absolute'; - stats.domElement.style.top = '0px'; - container.appendChild(stats.domElement); + stats.dom.style.position = 'absolute'; + stats.dom.style.top = '0px'; + container.appendChild(stats.dom); document.addEventListener('mousedown', onDocumentMouseDown, false); document.addEventListener('touchstart', onDocumentTouchStart, false); diff --git a/three/tests/canvas/canvas_interactive_cubes_tween.ts b/three/tests/canvas/canvas_interactive_cubes_tween.ts index 4f85c068fb..0e86e5a2c5 100644 --- a/three/tests/canvas/canvas_interactive_cubes_tween.ts +++ b/three/tests/canvas/canvas_interactive_cubes_tween.ts @@ -63,9 +63,9 @@ container.appendChild(renderer.domElement); stats = new Stats(); - stats.domElement.style.position = 'absolute'; - stats.domElement.style.top = '0px'; - container.appendChild(stats.domElement); + stats.dom.style.position = 'absolute'; + stats.dom.style.top = '0px'; + container.appendChild(stats.dom); document.addEventListener('mousedown', onDocumentMouseDown, false); document.addEventListener('touchstart', onDocumentTouchStart, false); diff --git a/three/tests/canvas/canvas_materials.ts b/three/tests/canvas/canvas_materials.ts index 9fd59a6b4c..4518b46ea0 100644 --- a/three/tests/canvas/canvas_materials.ts +++ b/three/tests/canvas/canvas_materials.ts @@ -135,9 +135,9 @@ debugContext.strokeStyle = '#000000'; stats = new Stats(); - stats.domElement.style.position = 'absolute'; - stats.domElement.style.top = '0px'; - container.appendChild(stats.domElement); + stats.dom.style.position = 'absolute'; + stats.dom.style.top = '0px'; + container.appendChild(stats.dom); // diff --git a/three/tests/canvas/canvas_particles_floor.ts b/three/tests/canvas/canvas_particles_floor.ts index cf38f9a02d..b0725f6dbe 100644 --- a/three/tests/canvas/canvas_particles_floor.ts +++ b/three/tests/canvas/canvas_particles_floor.ts @@ -52,9 +52,9 @@ container.appendChild(renderer.domElement); stats = new Stats(); - stats.domElement.style.position = 'absolute'; - stats.domElement.style.top = '0px'; - container.appendChild(stats.domElement); + stats.dom.style.position = 'absolute'; + stats.dom.style.top = '0px'; + container.appendChild(stats.dom); document.addEventListener('mousemove', onDocumentMouseMove, false); document.addEventListener('touchstart', onDocumentTouchStart, false); diff --git a/three/tests/webgl/webgl_animation_cloth.ts b/three/tests/webgl/webgl_animation_cloth.ts index 1d7bf3ad39..a1cc4917cc 100644 --- a/three/tests/webgl/webgl_animation_cloth.ts +++ b/three/tests/webgl/webgl_animation_cloth.ts @@ -43,13 +43,16 @@ if (!Detector.webgl) Detector.addGetWebGLMessage(); - var container, stats; - var camera, scene, renderer; - - var clothGeometry; - var sphere; - var object, arrow; - + var container: HTMLElement; + var stats: Stats; + var camera: THREE.PerspectiveCamera; + var scene: THREE.Scene; + var renderer: THREE.WebGLRenderer; + var clothGeometry: THREE.ParametricGeometry; + var sphere: THREE.Mesh; + var object: THREE.Mesh; + var arrow: THREE.ArrowHelper; + var light: THREE.DirectionalLight, materials; var rotate = true; init(); @@ -75,8 +78,6 @@ // lights - var light, materials; - scene.add(new THREE.AmbientLight(0x666666)); light = new THREE.DirectionalLight(0xdfebff, 1.75); @@ -97,7 +98,7 @@ light.shadowCameraBottom = -d; light.shadowCameraFar = 1000; - light.shadowDarkness = 0.5; + //light.shadowDarkness = 0.5; scene.add(light); @@ -111,7 +112,7 @@ // cloth geometry clothGeometry = new THREE.ParametricGeometry(clothFunction, cloth.w, cloth.h); - clothGeometry.dynamic = true; + //clothGeometry.dynamic = true; clothGeometry.computeFaceNormals(); var uniforms = { texture: { value: clothTexture } }; @@ -126,7 +127,7 @@ object.receiveShadow = true; scene.add(object); - object.customDepthMaterial = new THREE.ShaderMaterial({ uniforms: uniforms, vertexShader: vertexShader, fragmentShader: fragmentShader }); + //object.customDepthMaterial = new THREE.ShaderMaterial({ uniforms: uniforms, vertexShader: vertexShader, fragmentShader: fragmentShader }); // sphere @@ -217,7 +218,7 @@ // stats = new Stats(); - container.appendChild(stats.domElement); + container.appendChild(stats.dom); // diff --git a/three/tests/webgl/webgl_animation_skinning_morph.ts b/three/tests/webgl/webgl_animation_skinning_morph.ts index b8f2f767be..4beb0dde39 100644 --- a/three/tests/webgl/webgl_animation_skinning_morph.ts +++ b/three/tests/webgl/webgl_animation_skinning_morph.ts @@ -11,14 +11,14 @@ var SCREEN_HEIGHT = window.innerHeight; var FLOOR = -250; - var container,stats; - - var camera, scene; - var renderer; - - var mesh, helper; - - var mixer; + var container: HTMLElement; + var stats: Stats; + var camera: THREE.PerspectiveCamera; + var scene: THREE.Scene; + var renderer: THREE.WebGLRenderer; + var mesh: THREE.Mesh; + var helper: THREE.SkeletonHelper; + var mixer: THREE.AnimationMixer; var mouseX = 0, mouseY = 0; @@ -100,7 +100,7 @@ // STATS stats = new Stats(); - container.appendChild( stats.domElement ); + container.appendChild( stats.dom ); // @@ -177,12 +177,12 @@ mesh.receiveShadow = true; helper = new THREE.SkeletonHelper( mesh ); - helper.material.linewidth = 3; + //helper.material.linewidth = 3; helper.visible = false; scene.add( helper ); - var clipMorpher = THREE.AnimationClip.CreateFromMorphTargetSequence( 'facialExpressions', mesh.geometry.morphTargets, 3, true ); + var clipMorpher = THREE.AnimationClip.CreateFromMorphTargetSequence( 'facialExpressions', (mesh.geometry as THREE.Geometry).morphTargets, 3, true ); var clipBones = geometry.animations[0]; mixer = new THREE.AnimationMixer( mesh ); diff --git a/three/tests/webgl/webgl_buffergeometry.ts b/three/tests/webgl/webgl_buffergeometry.ts index 57106f0aed..8be65dc8a0 100644 --- a/three/tests/webgl/webgl_buffergeometry.ts +++ b/three/tests/webgl/webgl_buffergeometry.ts @@ -10,11 +10,12 @@ if ( ! Detector.webgl ) Detector.addGetWebGLMessage(); - var container, stats; - - var camera, scene, renderer; - - var mesh; +var container: HTMLElement; + var stats: Stats; + var camera: THREE.PerspectiveCamera; + var scene: THREE.Scene; + var renderer: THREE.WebGLRenderer; + var mesh: THREE.Mesh; init(); animate(); @@ -176,9 +177,9 @@ // stats = new Stats(); - stats.domElement.style.position = 'absolute'; - stats.domElement.style.top = '0px'; - container.appendChild( stats.domElement ); + stats.dom.style.position = 'absolute'; + stats.dom.style.top = '0px'; + container.appendChild( stats.dom ); // diff --git a/three/tests/webgl/webgl_camera.ts b/three/tests/webgl/webgl_camera.ts index 7f05840923..6f60b5f3d7 100644 --- a/three/tests/webgl/webgl_camera.ts +++ b/three/tests/webgl/webgl_camera.ts @@ -7,8 +7,13 @@ var SCREEN_WIDTH = window.innerWidth; var SCREEN_HEIGHT = window.innerHeight; - var container, stats; - var camera, scene, renderer, mesh; + var container: HTMLElement; + var stats: Stats; + var camera: THREE.PerspectiveCamera; + var scene: THREE.Scene; + var renderer: THREE.WebGLRenderer; + var mesh: THREE.Mesh; + var cameraRig, activeCamera, activeHelper; var cameraPerspective, cameraOrtho; var cameraPerspectiveHelper, cameraOrthoHelper; @@ -112,7 +117,7 @@ // stats = new Stats(); - container.appendChild( stats.domElement ); + container.appendChild( stats.dom ); // diff --git a/three/tests/webgl/webgl_custom_attributes.ts b/three/tests/webgl/webgl_custom_attributes.ts index 077b99424d..fc920abd8f 100644 --- a/three/tests/webgl/webgl_custom_attributes.ts +++ b/three/tests/webgl/webgl_custom_attributes.ts @@ -68,9 +68,9 @@ container.appendChild(renderer.domElement); stats = new Stats(); - stats.domElement.style.position = 'absolute'; - stats.domElement.style.top = '0px'; - container.appendChild(stats.domElement); + stats.dom.style.position = 'absolute'; + stats.dom.style.top = '0px'; + container.appendChild(stats.dom); // @@ -104,16 +104,16 @@ uniforms.amplitude.value = 2.5 * Math.sin(sphere.rotation.y * 0.125); uniforms.color.value.offsetHSL(0.0005, 0, 0); - + for ( var i = 0; i < displacement.length; i ++ ) { - + displacement[ i ] = Math.sin( 0.1 * i + time ); - + noise[ i ] += 0.5 * ( 0.5 - Math.random() ); noise[ i ] = THREE.Math.clamp( noise[ i ], -5, 5 ); - + displacement[ i ] += noise[ i ]; - + } sphere.geometry.attributes.displacement.needsUpdate = true; diff --git a/three/tests/webgl/webgl_geometries.ts b/three/tests/webgl/webgl_geometries.ts index aed2b2e2b6..d1d9764536 100644 --- a/three/tests/webgl/webgl_geometries.ts +++ b/three/tests/webgl/webgl_geometries.ts @@ -116,9 +116,9 @@ container.appendChild(renderer.domElement); stats = new Stats(); - stats.domElement.style.position = 'absolute'; - stats.domElement.style.top = '0px'; - container.appendChild(stats.domElement); + stats.dom.style.position = 'absolute'; + stats.dom.style.top = '0px'; + container.appendChild(stats.dom); // diff --git a/three/tests/webgl/webgl_interactive_cubes.ts b/three/tests/webgl/webgl_interactive_cubes.ts index 2c574e2bad..f9a2d2d224 100644 --- a/three/tests/webgl/webgl_interactive_cubes.ts +++ b/three/tests/webgl/webgl_interactive_cubes.ts @@ -66,9 +66,9 @@ container.appendChild(renderer.domElement); stats = new Stats(); - stats.domElement.style.position = 'absolute'; - stats.domElement.style.top = '0px'; - container.appendChild(stats.domElement); + stats.dom.style.position = 'absolute'; + stats.dom.style.top = '0px'; + container.appendChild(stats.dom); document.addEventListener('mousemove', onDocumentMouseMove, false); @@ -147,4 +147,4 @@ renderer.render(scene, camera); } -} \ No newline at end of file +} \ No newline at end of file diff --git a/three/tests/webgl/webgl_interactive_raycasting_points.ts b/three/tests/webgl/webgl_interactive_raycasting_points.ts index 86edace793..798a5a193c 100644 --- a/three/tests/webgl/webgl_interactive_raycasting_points.ts +++ b/three/tests/webgl/webgl_interactive_raycasting_points.ts @@ -249,9 +249,9 @@ // stats = new Stats(); - stats.domElement.style.position = 'absolute'; - stats.domElement.style.top = '0px'; - container.appendChild(stats.domElement); + stats.dom.style.position = 'absolute'; + stats.dom.style.top = '0px'; + container.appendChild(stats.dom); // diff --git a/three/tests/webgl/webgl_lensflares.ts b/three/tests/webgl/webgl_lensflares.ts index 5e2e3a1a20..2f9f748ad5 100644 --- a/three/tests/webgl/webgl_lensflares.ts +++ b/three/tests/webgl/webgl_lensflares.ts @@ -138,7 +138,7 @@ // stats stats = new Stats(); - container.appendChild(stats.domElement); + container.appendChild(stats.dom); // events diff --git a/three/tests/webgl/webgl_lights_hemisphere.ts b/three/tests/webgl/webgl_lights_hemisphere.ts index 41ff781a87..1ea5013f67 100644 --- a/three/tests/webgl/webgl_lights_hemisphere.ts +++ b/three/tests/webgl/webgl_lights_hemisphere.ts @@ -151,7 +151,7 @@ // STATS stats = new Stats(); - container.appendChild( stats.domElement ); + container.appendChild( stats.dom ); // diff --git a/three/tests/webgl/webgl_lines_colors.ts b/three/tests/webgl/webgl_lines_colors.ts index 2d8ec1156e..7621f55ad9 100644 --- a/three/tests/webgl/webgl_lines_colors.ts +++ b/three/tests/webgl/webgl_lines_colors.ts @@ -73,23 +73,20 @@ material = new THREE.LineBasicMaterial({ color: 0xffffff, opacity: 1, linewidth: 3, vertexColors: THREE.VertexColors }); - var line, p, scale = 0.3, d = 225; - var parameters = [ + var line, scale = 0.3, d = 225; + var parameters : [THREE.LineBasicMaterial, number, [number, number, number], THREE.Geometry][] = [ [material, scale * 1.5, [-d, 0, 0], geometry], [material, scale * 1.5, [0, 0, 0], geometry2], [material, scale * 1.5, [d, 0, 0], geometry3] ]; - for (i = 0; i < parameters.length; ++i) { - - p = parameters[i]; + for (const p of parameters) { line = new THREE.Line(p[3], p[0]); line.scale.x = line.scale.y = line.scale.z = p[1]; line.position.x = p[2][0]; line.position.y = p[2][1]; line.position.z = p[2][2]; scene.add(line); - } // diff --git a/three/tests/webgl/webgl_loader_awd.ts b/three/tests/webgl/webgl_loader_awd.ts index fedc182619..8bdf496df0 100644 --- a/three/tests/webgl/webgl_loader_awd.ts +++ b/three/tests/webgl/webgl_loader_awd.ts @@ -77,9 +77,9 @@ container.appendChild(renderer.domElement); stats = new Stats(); - stats.domElement.style.position = 'absolute'; - stats.domElement.style.top = '0px'; - container.appendChild(stats.domElement); + stats.dom.style.position = 'absolute'; + stats.dom.style.top = '0px'; + container.appendChild(stats.dom); // diff --git a/three/tests/webgl/webgl_materials.ts b/three/tests/webgl/webgl_materials.ts index 47356cad68..a821d8198b 100644 --- a/three/tests/webgl/webgl_materials.ts +++ b/three/tests/webgl/webgl_materials.ts @@ -146,10 +146,10 @@ // stats = new Stats(); - stats.domElement.style.position = 'absolute'; - stats.domElement.style.top = '0px'; + stats.dom.style.position = 'absolute'; + stats.dom.style.top = '0px'; - container.appendChild(stats.domElement); + container.appendChild(stats.dom); // diff --git a/three/tests/webgl/webgl_points_billboards.ts b/three/tests/webgl/webgl_points_billboards.ts index 0fb5283cd6..bc2f133531 100644 --- a/three/tests/webgl/webgl_points_billboards.ts +++ b/three/tests/webgl/webgl_points_billboards.ts @@ -58,9 +58,9 @@ // stats = new Stats(); - stats.domElement.style.position = 'absolute'; - stats.domElement.style.top = '0px'; - container.appendChild( stats.domElement ); + stats.dom.style.position = 'absolute'; + stats.dom.style.top = '0px'; + container.appendChild( stats.dom ); // diff --git a/three/tests/webgl/webgl_shader.ts b/three/tests/webgl/webgl_shader.ts index 8ddb9e5dd8..57825368da 100644 --- a/three/tests/webgl/webgl_shader.ts +++ b/three/tests/webgl/webgl_shader.ts @@ -47,9 +47,9 @@ container.appendChild(renderer.domElement); stats = new Stats(); - stats.domElement.style.position = 'absolute'; - stats.domElement.style.top = '0px'; - container.appendChild(stats.domElement); + stats.dom.style.position = 'absolute'; + stats.dom.style.top = '0px'; + container.appendChild(stats.dom); onWindowResize();