Merge remote-tracking branch 'upstream/master' into master

simplebar/simplebar-tests.ts

@@ -0,0 +1,5 @@
+/// <reference path="simplebar.d.ts"/>
+/// <reference path="../jquery/jquery.d.ts"/>
+
+var simplebar = $.fn.simplebar.noConflict();
+$.fn.simplebar = simplebar;

simplebar/simplebar.d.ts

@@ -0,0 +1,37 @@
+// Type definitions for simplebar.js 1.1.7
+// Project: https://github.com/Grsmto/simplebar
+// Definitions by: Gregor Woiwode <https://github.com/gregonnet>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+interface SimplebarOptions {
+    autoHide?: boolean;
+    wrapContent?: boolean;
+}
+
+interface JQuery {
+    /**
+    * Enables simplebar on calling element.
+    */
+    simplebar: {
+        /**
+        * Define if scrollbar should be faded out automatically
+        *
+        * @param indicator if scrollbar should be faded out automatically.
+        */
+        (options?: SimplebarOptions): JQuery;
+    };
+}
+
+interface JQueryStatic {
+    /**
+    * Enables simplebar on calling element.
+    */
+    simplebar: {
+        /**
+        * Define if scrollbar should be faded out automatically
+        *
+        * @param indicator if scrollbar should be faded out automatically.
+        */
+        (options?: SimplebarOptions): JQuery;
+    };
+}