From edc40d8db0533f5133662645d27045a5b340f28c Mon Sep 17 00:00:00 2001 From: kwiateusz Date: Tue, 3 Nov 2015 09:14:55 +0100 Subject: [PATCH 1/8] Update of ScrollToParameterOptions in mCustomScrollbar.d.ts --- mCustomScrollbar/mCustomScrollbar.d.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/mCustomScrollbar/mCustomScrollbar.d.ts b/mCustomScrollbar/mCustomScrollbar.d.ts index f41aca00a..6ce44b23c 100644 --- a/mCustomScrollbar/mCustomScrollbar.d.ts +++ b/mCustomScrollbar/mCustomScrollbar.d.ts @@ -132,10 +132,18 @@ declare module MCustomScrollbar { */ scrollInertia?: number; /** ++ * Scroll-to animation easing, values: "linear", "easeOut", "easeInOut". ++ */ ++ scrollEasing?: string; ++ /** * Scroll scrollbar dragger (instead of content) to a number of pixels, values: true, false */ moveDragger?: boolean; /** ++ * Set a timeout for the method (the default timeout is 60 ms in order to work with automatic scrollbar update), value in milliseconds. ++ */ ++ timeout?: number; + /** * Trigger user defined callback after scroll-to completes, value: true, false */ callbacks?: boolean; @@ -163,4 +171,4 @@ interface JQuery { * @param options Override default options */ mCustomScrollbar(options?: MCustomScrollbar.CustomScrollbarOptions): JQuery; -} \ No newline at end of file +} From ba72a292ddfda7b615bec42861657a30b89ca235 Mon Sep 17 00:00:00 2001 From: kwiateusz Date: Thu, 5 Nov 2015 15:27:42 +0100 Subject: [PATCH 2/8] Update mCustomScrollbar.d.ts --- mCustomScrollbar/mCustomScrollbar.d.ts | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/mCustomScrollbar/mCustomScrollbar.d.ts b/mCustomScrollbar/mCustomScrollbar.d.ts index 6ce44b23c..5763bcbe0 100644 --- a/mCustomScrollbar/mCustomScrollbar.d.ts +++ b/mCustomScrollbar/mCustomScrollbar.d.ts @@ -10,15 +10,16 @@ declare module MCustomScrollbar { /** * Set the width of your content (overwrites CSS width), value in pixels (integer) or percentage (string) */ - set_width?: any; + setWidth?: any; /** * Set the height of your content (overwirtes CSS height), value in pixels (integer) or percentage (string) */ - set_height?: any; + setHeight?: any; /** - * Add horizontal scrollbar (default is vertical), value: true, false - */ - horizontalScroll?: boolean; + * Define content’s scrolling axis (the type of scrollbars added to the element: vertical and/of horizontal). + * Available values: "y", "x", "yx". y -vertical, x - horizontal + */ + axis: string; /** * Scrolling inertia (easing), value in milliseconds (0 for no scrolling inertia) */ @@ -132,17 +133,17 @@ declare module MCustomScrollbar { */ scrollInertia?: number; /** -+ * Scroll-to animation easing, values: "linear", "easeOut", "easeInOut". -+ */ -+ scrollEasing?: string; -+ /** + * Scroll-to animation easing, values: "linear", "easeOut", "easeInOut". + */ + scrollEasing?: string; + /** * Scroll scrollbar dragger (instead of content) to a number of pixels, values: true, false */ moveDragger?: boolean; /** -+ * Set a timeout for the method (the default timeout is 60 ms in order to work with automatic scrollbar update), value in milliseconds. -+ */ -+ timeout?: number; + * Set a timeout for the method (the default timeout is 60 ms in order to work with automatic scrollbar update), value in milliseconds. + */ + timeout?: number; /** * Trigger user defined callback after scroll-to completes, value: true, false */ From fccf41376b522683139cadd8885dea0d044420df Mon Sep 17 00:00:00 2001 From: kwiateusz Date: Thu, 5 Nov 2015 19:14:02 +0100 Subject: [PATCH 3/8] Update mCustomScrollbar-tests.ts --- mCustomScrollbar/mCustomScrollbar-tests.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mCustomScrollbar/mCustomScrollbar-tests.ts b/mCustomScrollbar/mCustomScrollbar-tests.ts index 983dc3a83..e2c43a119 100644 --- a/mCustomScrollbar/mCustomScrollbar-tests.ts +++ b/mCustomScrollbar/mCustomScrollbar-tests.ts @@ -22,9 +22,9 @@ class SimpleTestAllParams { this.element = $(".content"); this.element.mCustomScrollbar({ - set_width: false, - set_height: false, - horizontalScroll: false, + setWidth: false, + setHeight: false, + axis: "y", scrollInertia: 950, mouseWheel: true, mouseWheelPixels: "auto", @@ -39,7 +39,7 @@ class SimpleTestAllParams { advanced: { updateOnBrowserResize: true, updateOnContentResize: false, - autoExpandHorizontalScroll: false, + autoExpandscrollInertia: false, autoScrollOnFocus: true, normalizeMouseWheelDelta: false }, @@ -147,4 +147,4 @@ class DisableDestroyTest { }); }); } -} \ No newline at end of file +} From 47a19e1ca50137e830cc0d55579f15886f7b9449 Mon Sep 17 00:00:00 2001 From: kwiateusz Date: Thu, 5 Nov 2015 19:16:20 +0100 Subject: [PATCH 4/8] Update mCustomScrollbar.d.ts --- mCustomScrollbar/mCustomScrollbar.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mCustomScrollbar/mCustomScrollbar.d.ts b/mCustomScrollbar/mCustomScrollbar.d.ts index 5763bcbe0..3d354ee45 100644 --- a/mCustomScrollbar/mCustomScrollbar.d.ts +++ b/mCustomScrollbar/mCustomScrollbar.d.ts @@ -19,7 +19,7 @@ declare module MCustomScrollbar { * Define content’s scrolling axis (the type of scrollbars added to the element: vertical and/of horizontal). * Available values: "y", "x", "yx". y -vertical, x - horizontal */ - axis: string; + axis?: string; /** * Scrolling inertia (easing), value in milliseconds (0 for no scrolling inertia) */ From be07b0617c6114f45fdadbfcf134099314ac241e Mon Sep 17 00:00:00 2001 From: kwiateusz Date: Thu, 5 Nov 2015 19:21:11 +0100 Subject: [PATCH 5/8] Update mCustomScrollbar-tests.ts --- mCustomScrollbar/mCustomScrollbar-tests.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mCustomScrollbar/mCustomScrollbar-tests.ts b/mCustomScrollbar/mCustomScrollbar-tests.ts index e2c43a119..7dcf79356 100644 --- a/mCustomScrollbar/mCustomScrollbar-tests.ts +++ b/mCustomScrollbar/mCustomScrollbar-tests.ts @@ -39,7 +39,7 @@ class SimpleTestAllParams { advanced: { updateOnBrowserResize: true, updateOnContentResize: false, - autoExpandscrollInertia: false, + autoExpandHorizontalScroll: false, autoScrollOnFocus: true, normalizeMouseWheelDelta: false }, From 7a4b73270589c003e3e79ab2f0bd8bb022054653 Mon Sep 17 00:00:00 2001 From: kwiateusz Date: Sat, 7 Nov 2015 20:34:16 +0100 Subject: [PATCH 6/8] Update toastr.d.ts Add target in options --- toastr/toastr.d.ts | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/toastr/toastr.d.ts b/toastr/toastr.d.ts index 321177ec2..39be5a21b 100644 --- a/toastr/toastr.d.ts +++ b/toastr/toastr.d.ts @@ -113,17 +113,18 @@ interface ToastrOptions { * Set newest toast to appear on top **/ newestOnTop?: boolean; - - /** - * Rather than having identical toasts stack, set the preventDuplicates property to true. Duplicates are matched to the previous toast based on their message content. - */ - preventDuplicates?: boolean; - - /** - * Visually indicates how long before a toast expires. - */ - progressBar?: boolean; - + /** + * The element to put the toastr container + **/ + target?: string; + /** + * Rather than having identical toasts stack, set the preventDuplicates property to true. Duplicates are matched to the previous toast based on their message content. + */ + preventDuplicates?: boolean; + /** + * Visually indicates how long before a toast expires. + */ + progressBar?: boolean; /** * Function to execute on toast click */ From a36e6ad2f472741b1c22c2af955bf13b7c62e146 Mon Sep 17 00:00:00 2001 From: kwiateusz Date: Sat, 7 Nov 2015 22:28:15 +0100 Subject: [PATCH 7/8] Update toastr.d.ts --- toastr/toastr.d.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/toastr/toastr.d.ts b/toastr/toastr.d.ts index 39be5a21b..e7cd15f92 100644 --- a/toastr/toastr.d.ts +++ b/toastr/toastr.d.ts @@ -129,6 +129,10 @@ interface ToastrOptions { * Function to execute on toast click */ onclick?: () => void; + /** + * Set if toastr should parse containing html + **/ + allowHtml?: boolean; } interface ToastrDisplayMethod { From 17d5157eb89cc9f1fbfa74bbb134bbd873152398 Mon Sep 17 00:00:00 2001 From: kwiateusz Date: Sun, 8 Nov 2015 12:08:35 +0100 Subject: [PATCH 8/8] Update mCustomScrollbar.d.ts Add more missing options --- mCustomScrollbar/mCustomScrollbar.d.ts | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/mCustomScrollbar/mCustomScrollbar.d.ts b/mCustomScrollbar/mCustomScrollbar.d.ts index 3d354ee45..e20384968 100644 --- a/mCustomScrollbar/mCustomScrollbar.d.ts +++ b/mCustomScrollbar/mCustomScrollbar.d.ts @@ -21,6 +21,17 @@ declare module MCustomScrollbar { */ axis?: string; /** + * Always keep scrollbar(s) visible, even when there’s nothing to scroll. + * 0 – disable (default) + * 1 – keep dragger rail visible + * 2 – keep all scrollbar components (dragger, rail, buttons etc.) visible + */ + alwaysShowScrollbar?: number; + /** + * Enable or disable auto-expanding the scrollbar when cursor is over or dragging the scrollbar. + */ + autoExpandScrollbar?: boolean; + /** * Scrolling inertia (easing), value in milliseconds (0 for no scrolling inertia) */ scrollInertia?: number; @@ -120,6 +131,12 @@ declare module MCustomScrollbar { * User defined callback function, triggered while scrolling */ whileScrolling?: () => void; + /** + * Set the behavior of calling onTotalScroll and onTotalScrollBack offsets. + * By default, callback offsets will trigger repeatedly while content is scrolling within the offsets. + * Set alwaysTriggerOffsets: false when you need to trigger onTotalScroll and onTotalScrollBack callbacks once, each time scroll end or beginning is reached. + */ + alwaysTriggerOffsets?: boolean; } /** * Set a scrollbar ready-to-use theme. See themes demo for all themes - http://manos.malihu.gr/tuts/custom-scrollbar-plugin/scrollbar_themes_demo.html