diff --git a/bootstrap.datepicker/bootstrap.datepicker-tests.ts b/bootstrap.datepicker/bootstrap.datepicker-tests.ts index 3346ab5e2..0bbf2c650 100644 --- a/bootstrap.datepicker/bootstrap.datepicker-tests.ts +++ b/bootstrap.datepicker/bootstrap.datepicker-tests.ts @@ -1,5 +1,4 @@ -/// -/// +/// function tests_simple() { $('#datepicker').datepicker(); @@ -11,30 +10,32 @@ function tests_simple() { $('#datepicker').datepicker('setEndDate', '2012-12-31'); $('#date-end') .datepicker() - .on('changeDate', function (ev) { }); + .on('changeDate', function (ev) { ev; }); var startDate = new Date(2012, 1, 20); var endDate = new Date(2012, 1, 25); $('#date-start') .datepicker() - .on('changeDate', function (ev) { + //.on("changeDate", function (ev) { // bug https://typescript.codeplex.com/workitem/1976 + .on("changeDate", function (ev: DatepickerEventObject) { if (ev.date.valueOf() > endDate.valueOf()) { $('#alert').show().find('strong').text('The start date must be before the end date.'); } else { $('#alert').hide(); - startDate = new Date(ev.date); + startDate = ev.date; $('#date-start-display').text($('#date-start').data('date')); } $('#date-start').datepicker('hide'); }); $('#date-end') .datepicker() - .on('changeDate', function (ev) { + //.on('changeDate', function (ev) { // bug https://typescript.codeplex.com/workitem/1976 + .on('changeDate', function (ev: DatepickerEventObject) { if (ev.date.valueOf() < startDate.valueOf()) { $('#alert').show().find('strong').text('The end date must be after the start date.'); } else { $('#alert').hide(); - endDate = new Date(ev.date); + endDate = ev.date; $('#date-end-display').text($('#date-end').data('date')); } $('#date-end').datepicker('hide'); @@ -55,25 +56,27 @@ $(function () { var startDate = new Date(2012, 1, 20); var endDate = new Date(2012, 1, 25); $('#dp4').datepicker() - .on('changeDate', function (ev) { + //.on('changeDate', function (ev) { // bug https://typescript.codeplex.com/workitem/1976 + .on('changeDate', function (ev: DatepickerEventObject) { if (ev.date.valueOf() > endDate.valueOf()) { $('#alert').show().find('strong').text('The start date can not be greater then the end date'); } else { $('#alert').hide(); - startDate = new Date(ev.date); + startDate = ev.date; $('#startDate').text($('#dp4').data('date')); } $('#dp4').datepicker('hide'); }); $('#dp5').datepicker() - .on('changeDate', function (ev) { + //.on('changeDate', function (ev) { // bug https://typescript.codeplex.com/workitem/1976 + .on('changeDate', function (ev: DatepickerEventObject) { if (ev.date.valueOf() < startDate.valueOf()) { $('#alert').show().find('strong').text('The end date can not be less then the start date'); } else { $('#alert').hide(); - endDate = new Date(ev.date); + endDate = ev.date; $('#endDate').text($('#dp5').data('date')); } $('#dp5').datepicker('hide'); }); -}); \ No newline at end of file +}); diff --git a/bootstrap.datepicker/bootstrap.datepicker.d.ts b/bootstrap.datepicker/bootstrap.datepicker.d.ts index 4cf27ef19..0664b2aa0 100644 --- a/bootstrap.datepicker/bootstrap.datepicker.d.ts +++ b/bootstrap.datepicker/bootstrap.datepicker.d.ts @@ -3,7 +3,6 @@ // Definitions by: Boris Yankov // Definitions: https://github.com/borisyankov/DefinitelyTyped - /// interface DatepickerOptions { @@ -19,15 +18,21 @@ interface DatepickerOptions { language?: string; } +interface DatepickerEventObject extends JQueryEventObject { + date: Date; + format(format?: string): string; +} + interface JQuery { datepicker(): JQuery; datepicker(methodName: string): JQuery; datepicker(methodName: string, params: any): JQuery; datepicker(options: DatepickerOptions): JQuery; - off(events?: "changeDate", selector?: any, handler?: (eventObject: any) => any): JQuery; + off(events: "changeDate", selector?: string, handler?: (eventObject: DatepickerEventObject) => any): JQuery; + off(events: "changeDate", handler: (eventObject: DatepickerEventObject) => any): JQuery; - on(events: "changeDate", selector?: string, data?: any, handler?: (eventObject: any) => any): JQuery; - on(events: "changeDate", selector?: string, handler?: (eventObject: any) => any): JQuery; - on(events: "changeDate", handler?: (eventObject: any) => any): JQuery; + on(events: "changeDate", selector: string, data: any, handler?: (eventObject: DatepickerEventObject) => any): JQuery; + on(events: "changeDate", selector: string, handler: (eventObject: DatepickerEventObject) => any): JQuery; + on(events: 'changeDate', handler: (eventObject: DatepickerEventObject) => any): JQuery; } diff --git a/state-machine/state-machine-tests.ts b/state-machine/state-machine-tests.ts index 98b6ccf7c..24321fc60 100644 --- a/state-machine/state-machine-tests.ts +++ b/state-machine/state-machine-tests.ts @@ -16,11 +16,11 @@ var fsm: StateMachineTest = StateMachine.create({ { name: 'clear', from: 'yellow', to: 'green' } ], callbacks: { - onpanic: function (event, from, to, msg) { alert('panic! ' + msg); }, - onclear: function (event, from, to, msg) { alert('thanks to ' + msg); }, - ongreen: function (event, from, to) { document.body.className = 'green'; }, - onyellow: function (event, from, to) { document.body.className = 'yellow'; }, - onred: function (event, from, to) { document.body.className = 'red'; }, + onpanic: function (event?, from?, to?, msg?) { alert('panic! ' + msg); }, + onclear: function (event?, from?, to?, msg?) { alert('thanks to ' + msg); }, + ongreen: function (event?, from?, to?) { document.body.className = 'green'; }, + onyellow: function (event?, from?, to?) { document.body.className = 'yellow'; }, + onred: function (event?, from?, to?) { document.body.className = 'red'; }, } }); diff --git a/underscore/underscore-tests.ts b/underscore/underscore-tests.ts index aa70ea4d9..ae5ab6f7e 100644 --- a/underscore/underscore-tests.ts +++ b/underscore/underscore-tests.ts @@ -8,11 +8,13 @@ _.each({ one: 1, two: 2, three: 3 }, (value) => alert(value.toString())); _.map([1, 2, 3], (num) => num * 3); _.map({ one: 1, two: 2, three: 3 }, (value: number, key?: string) => value * 3); -var sum = _.reduce([1, 2, 3], (memo, num) => memo + num, 0); -sum = _.reduce([1, 2, 3], (memo, num) => memo + num); // memo is optional #issue 5 github +//var sum = _.reduce([1, 2, 3], (memo, num) => memo + num, 0); // https://typescript.codeplex.com/workitem/1960 +var sum = _.reduce([1, 2, 3], (memo, num) => memo + num, 0); +sum = _.reduce([1, 2, 3], (memo, num) => memo + num); // memo is optional #issue 5 github var list = [[0, 1], [2, 3], [4, 5]]; -var flat = _.reduceRight(list, (a, b) => a.concat(b), []); +//var flat = _.reduceRight(list, (a, b) => a.concat(b), []); // https://typescript.codeplex.com/workitem/1960 +var flat = _.reduceRight(list, (a, b) => a.concat(b), []); var even = _.find([1, 2, 3, 4, 5, 6], (num) => num % 2 == 0); @@ -23,7 +25,8 @@ _.where(listOfPlays, { author: "Shakespeare", year: 1611 }); var odds = _.reject([1, 2, 3, 4, 5, 6], (num) => num % 2 == 0); -_.every([true, 1, null, 'yes'], _.identity); +//_.every([true, 1, null, 'yes'], _.identity); // https://typescript.codeplex.com/workitem/1960 +_.every([true, 1, null, 'yes'], _.identity); _.every<{}>([true, 1, null, 'yes']); _.any([null, 0, 'yes', false]); @@ -279,10 +282,11 @@ _(['test', 'test']).pick(['test2', 'test2']); //////////////// Chain Tests function chain_tests() { - var list:number[] = _.chain([1, 2, 3, 4, 5, 6, 7, 8]) + // https://typescript.codeplex.com/workitem/1960 + var list:number[] = _.chain([1, 2, 3, 4, 5, 6, 7, 8]) .filter(n => n % 2 == 0) .map(n => n * n) - .value(); + .value(); _([1, 2, 3, 4]) .chain()