Merge remote-tracking branch 'upstream/master'

2026-09-09 11:13:57 +08:00 · 2014-09-05 16:17:19 -04:00
parent 74dbac71d2 0c4b4ef263
commit 72ec96b0c9
240 changed files with 640 additions and 237 deletions
@@ -1,4 +1,4 @@
-# Contributors
+# Contributors

 This is a non-exhaustive list of definitions and their creators. If you created a definition but are not listed then feel free to send a pull request on this file with your name and url.

@@ -161,6 +161,7 @@ All definitions files include a header with the author and editors, so at some p
 * [jQuery.Colorbox](http://www.jacklmoore.com/colorbox/) (by [Gidon Junge](https://github.com/gjunge))
 * [jQuery.contextMenu](http://medialize.github.com/jQuery-contextMenu/) (by [Natan Vivo](https://github.com/nvivo/))
 * [jQuery.Cookie](https://github.com/carhartl/jquery-cookie) (by [Roy Goode](https://github.com/RoyGoode))
+* [jQuery.customSelect](https://github.com/adamcoulombe/jquery.customSelect) (by [tomato360](https://github.com/tomato360))
 * [jQuery.Cycle](http://jquery.malsup.com/cycle/) (by [François Guillot](http://fguillot.developpez.com/))
 * [jQuery.Cycle2](http://jquery.malsup.com/cycle2/) (by [Donny Nadolny](https://github.com/dnadolny))
 * [jQuery.dataTables](http://www.datatables.net) (by [Armin Sander](https://github.com/pragmatrix))
@@ -175,6 +176,7 @@ All definitions files include a header with the author and editors, so at some p
 * [jQuery.jNotify](http://jnotify.codeplex.com) (by [James Curran](https://github.com/jamescurran/))
 * [jQuery.joyride](http://zurb.com/playground/jquery-joyride-feature-tour-plugin) (by [Vincent Bortone](https://github.com/vbortone))
 * [jQuery.jSignature](https://github.com/willowsystems/jSignature) (by [Patrick Magee](https://github.com/pjmagee))
+* [jQuery.leanModal](http://leanmodal.finelysliced.com.au/)(by [tomato360](https://github.com/tomato360))
 * [jQuery.notifyBar](http://www.whoop.ee/posts/2013-04-05-the-resurrection-of-jquery-notify-bar/) (by [Shunsuke Ohtani](https://github.com/zaneli))
 * [jQuery.noty](http://needim.github.io/noty/) (by [Aaron King](https://github.com/kingdango/))
 * [jQuery.payment](http://needim.github.io/noty/) (by [Eric J. Smith](https://github.com/ejsmith/))
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -618,6 +618,10 @@ module locationTests {
    $location.search('foo', 'yipee');
    // => $location

+    // set foo to 5
+    $location.search('foo', 5);
+    // => $location
+
    /*
     * From: https://docs.angularjs.org/guide/$location
     */
@@ -445,6 +445,7 @@ declare module ng {
        $untouched: boolean;

        $validators: IModelValidators;
+        $asyncValidators: IModelValidators;

        $pristine: boolean;
        $dirty: boolean;
@@ -482,13 +483,11 @@ declare module ng {
        $digest(): void;
        $emit(name: string, ...args: any[]): IAngularEvent;

-        // Documentation says exp is optional, but actual implementaton counts on it
-        $eval(expression: string, args?: Object): any;
-        $eval(expression: (scope: IScope) => any, args?: Object): any;
+        $eval(expression?: string, args?: Object): any;
+        $eval(expression?: (scope: IScope) => any, args?: Object): any;

-        // Documentation says exp is optional, but actual implementaton counts on it
-        $evalAsync(expression: string): void;
-        $evalAsync(expression: (scope: IScope) => any): void;
+        $evalAsync(expression?: string): void;
+        $evalAsync(expression?: (scope: IScope) => any): void;

        // Defaults to false by the implementation checking strategy
        $new(isolate?: boolean): IScope;
@@ -748,10 +747,18 @@ declare module ng {
         * Change search part when called with parameter and return $location.
         * 
         * @param search New search params
-         * @param paramValue If search is a string, then paramValue will override only a single search property. If paramValue is null, the property specified via the first argument will be deleted.
+         * @param paramValue If search is a string or a Number, then paramValue will override only a single search property. If paramValue is null, the property specified via the first argument will be deleted.
         */
        search(search: string, paramValue: string): ILocationService;

+        /**
+         * Change search part when called with parameter and return $location.
+         * 
+         * @param search New search params
+         * @param paramValue If search is a string or a Number, then paramValue will override only a single search property. If paramValue is null, the property specified via the first argument will be deleted.
+         */
+        search(search: string, paramValue: number): ILocationService;
+
        /**
         * Change search part when called with parameter and return $location.
         * 
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-"--noImplicitAny --module commonjs"
+--noImplicitAny --module commonjs
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
--noImplicitAny --module commonjs --target es5
+--noImplicitAny --module commonjs --target es5
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
--target ES5
+--target ES5
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1104,6 +1104,7 @@ declare module D3 {
            offset(offset: string): StackLayout;
            x(accessor: (d: any, i: number) => any): StackLayout;
            y(accessor: (d: any, i: number) => any): StackLayout;
+            out(setter: (d: any, y0: number, y: number) => void): StackLayout;
        }

        export interface TreeLayout {
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/borisyankov/DefinitelyTyped


-// For ddescribe / iit use : hhttps://github.com/borisyankov/DefinitelyTyped/blob/master/karma-jasmine/karma-jasmine.d.ts
+// For ddescribe / iit use : https://github.com/borisyankov/DefinitelyTyped/blob/master/karma-jasmine/karma-jasmine.d.ts

 declare function describe(description: string, specDefinitions: () => void): void;
 // declare function ddescribe(description: string, specDefinitions: () => void): void; Not a part of jasmine. Angular team adds these
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
@@ -1 +1 @@
-""
+
--- a/Show More
+++ b/Show More