From d8f058ce5883c67fc22b9884cc1f92c262540434 Mon Sep 17 00:00:00 2001 From: jmackay Date: Wed, 18 Sep 2013 23:56:27 -0600 Subject: [PATCH] updated to match toastr 2.0.1 --- toastr/toastr-tests.ts | 30 ++-- toastr/toastr.d.ts | 318 ++++++++++++++++++++++------------------- 2 files changed, 186 insertions(+), 162 deletions(-) diff --git a/toastr/toastr-tests.ts b/toastr/toastr-tests.ts index d973731a5..a49b8684c 100644 --- a/toastr/toastr-tests.ts +++ b/toastr/toastr-tests.ts @@ -36,24 +36,24 @@ function test_fromdemo() { return msgs[i]; }; $('#showtoast').click(function () { - var shortCutFunction = $("#toastTypeGroup input:radio:checked").val(), - msg = $('#message').val(), - title = $('#title').val() || '', - $fadeIn = $('#fadeIn'), - $fadeOut = $('#fadeOut'), - $timeOut = $('#timeOut'), - $extendedTimeOut = $('#extendedTimeOut'), - toastIndex = 123; - toastr.options = { - debug: $('#debugInfo').prop('checked'), - tapToDismiss: $('#tapToDismiss').prop('checked'), - positionClass: $('#positionGroup input:radio:checked').val() || 'toast-top-right' - } + var shortCutFunction = $("#toastTypeGroup input:radio:checked").val(), + msg = $('#message').val(), + title = $('#title').val() || '', + $fadeIn = $('#fadeIn'), + $fadeOut = $('#fadeOut'), + $timeOut = $('#timeOut'), + $extendedTimeOut = $('#extendedTimeOut'), + toastIndex = 123; + toastr.options = { + debug: $('#debugInfo').prop('checked'), + tapToDismiss: $('#tapToDismiss').prop('checked'), + positionClass: $('#positionGroup input:radio:checked').val() || 'toast-top-right' + } if ($fadeIn.val().length) { - toastr.options.fadeIn = +$fadeIn.val() + toastr.options.showDuration = +$fadeIn.val() } if ($fadeOut.val().length) { - toastr.options.fadeOut = +$fadeOut.val() + toastr.options.hideDuration = +$fadeOut.val() } if ($timeOut.val().length) { toastr.options.timeOut = +$timeOut.val() diff --git a/toastr/toastr.d.ts b/toastr/toastr.d.ts index db36ee477..0af198944 100644 --- a/toastr/toastr.d.ts +++ b/toastr/toastr.d.ts @@ -1,4 +1,4 @@ -// Type definitions for Toastr 1.3.0 +// Type definitions for Toastr 2.0.1 // Project: https://github.com/CodeSeven/toastr // Definitions by: Boris Yankov // Definitions: https://github.com/borisyankov/DefinitelyTyped @@ -7,159 +7,183 @@ /// interface ToastrOptions { - /** - * Should clicking on toast dismiss it? - */ - tapToDismiss?: boolean; - /** - * CSS class the toast element will be given - */ - toastClass?: string; - /** - * Id toast container will be given - */ - containerId?: string; - /** - * Should debug details be outputted to the console - */ - debug?: boolean; - /** - * Time in milliseconds the toast should take to fade in - */ - fadeIn?: number; - /** - * OnFadeIn function callback - **/ - onFadeIn?: () => void; - /** - * Time in milliseconds the toast should take to fade out - */ - fadeOut?: number; - /** - * OnFadeOut function callback - **/ - onFadeOut?: () => void; - /** - * Time in milliseconds the toast should be displayed after mouse over - */ - extendedTimeOut?: number; - iconClasses?: { - /** - * Icon to use on error toasts - */ - error: string; - /** - * Icon to use on info toasts - */ - info: string; - /** - * Icon to use on success toasts - */ - success: string; - /** - * Icon to use on warning toasts - */ - warning: string; - }; - /** - * Icon to use for toast - */ - iconClass?: string; - /** - * Where toast should be displayed - */ - positionClass?: string; - /** - * Where toast should be displayed - background - */ - backgroundpositionClass?: string; - /** - * Time in milliseconds that the toast should be displayed - */ - timeOut?: number; - /** - * CSS class the title element will be given - */ - titleClass?: string; - /** - * CSS class the message element will be given - */ - messageClass?: string; - /** - * Set newest toast to appear on top - **/ - newestOnTop?: boolean; + /** + * Optionally override the animation easing to show or hide the toasts. Default is swing. swing and linear are built into jQuery. + */ + showEasing?: string; + /** + * Optionally override the animation easing to show or hide the toasts. Default is swing. swing and linear are built into jQuery. + */ + hideEasing?: string; + /** + * Use the jQuery show/hide method of your choice. These default to fadeIn/fadeOut. The methods fadeIn/fadeOut, slideDown/slideUp, and show/hide are built into jQuery. + */ + showMethod?: string; + /** + * Use the jQuery show/hide method of your choice. These default to fadeIn/fadeOut. The methods fadeIn/fadeOut, slideDown/slideUp, and show/hide are built into jQuery. + */ + hideMethod?: string; + /** + * Should a close button be shown + */ + closeButton?: boolean; + /** + * Html for the close button + */ + closeHtml?: string; + /** + * Should clicking on toast dismiss it? + */ + tapToDismiss?: boolean; + /** + * CSS class the toast element will be given + */ + toastClass?: string; + /** + * Id toast container will be given + */ + containerId?: string; + /** + * Should debug details be outputted to the console + */ + debug?: boolean; + /** + * Time in milliseconds the toast should take to show + */ + showDuration?: number; + /** + * onShown function callback + **/ + onShown?: () => void; + /** + * Time in milliseconds the toast should take to hide + */ + hideDuration?: number; + /** + * onHidden function callback + **/ + onHidden?: () => void; + /** + * Time in milliseconds the toast should be displayed after mouse over + */ + extendedTimeOut?: number; + iconClasses?: { + /** + * Icon to use on error toasts + */ + error: string; + /** + * Icon to use on info toasts + */ + info: string; + /** + * Icon to use on success toasts + */ + success: string; + /** + * Icon to use on warning toasts + */ + warning: string; + }; + /** + * Icon to use for toast + */ + iconClass?: string; + /** + * Where toast should be displayed + */ + positionClass?: string; + /** + * Where toast should be displayed - background + */ + backgroundpositionClass?: string; + /** + * Time in milliseconds that the toast should be displayed + */ + timeOut?: number; + /** + * CSS class the title element will be given + */ + titleClass?: string; + /** + * CSS class the message element will be given + */ + messageClass?: string; + /** + * Set newest toast to appear on top + **/ + newestOnTop?: boolean; - /** - * Function to execute on toast click - */ - onclick?: () => void; + /** + * Function to execute on toast click + */ + onclick?: () => void; } interface ToastrDisplayMethod { - /** - * Create a toast - * - * @param message Message to display in toast - */ - (message: string): JQuery; - /** - * Create a toast - * - * @param message Message to display in toast - * @param title Title to display on toast - */ - (message: string, title: string): JQuery; - /** - * Create a toast - * - * @param message Message to display in toast - * @param title Title to display on toast - * @param overrides Option values for toast - */ - (message: string, title: string, overrides: ToastrOptions): JQuery; + /** + * Create a toast + * + * @param message Message to display in toast + */ + (message: string): JQuery; + /** + * Create a toast + * + * @param message Message to display in toast + * @param title Title to display on toast + */ + (message: string, title: string): JQuery; + /** + * Create a toast + * + * @param message Message to display in toast + * @param title Title to display on toast + * @param overrides Option values for toast + */ + (message: string, title: string, overrides: ToastrOptions): JQuery; } interface Toastr { - /** - * Clear toasts - */ - clear: { - /** - * Clear all toasts - */ - (): void; - /** - * Clear specific toast - * - * @param toast Toast to clear - */ - (toast: JQuery): void; - }; - /** - * Create an error toast - */ - error: ToastrDisplayMethod; - /** - * Create an info toast - */ - info: ToastrDisplayMethod; - /** - * Create an options object - */ - options: ToastrOptions; - /** - * Create a success toast - */ - success: ToastrDisplayMethod; - /** - * Create a warning toast - */ - warning: ToastrDisplayMethod; - /** - * Get toastr version - */ - version: string; + /** + * Clear toasts + */ + clear: { + /** + * Clear all toasts + */ + (): void; + /** + * Clear specific toast + * + * @param toast Toast to clear + */ + (toast: JQuery): void; + }; + /** + * Create an error toast + */ + error: ToastrDisplayMethod; + /** + * Create an info toast + */ + info: ToastrDisplayMethod; + /** + * Create an options object + */ + options: ToastrOptions; + /** + * Create a success toast + */ + success: ToastrDisplayMethod; + /** + * Create a warning toast + */ + warning: ToastrDisplayMethod; + /** + * Get toastr version + */ + version: string; } declare var toastr: Toastr;