Merge branch 'master' of https://github.com/borisyankov/DefinitelyTyped

dropzone/dropzone.d.ts

@@ -24,7 +24,7 @@ interface DropzoneOptions {
     headers?: any;
     addRemoveLinks?: boolean;
     previewsContainer?: string;
-    clickable?: boolean;
+    clickable?: any;
     createImageThumbnails?: boolean;
     maxThumbnailFilesize?: number;
     thumbnailWidth?: number;
@@ -39,7 +39,7 @@ interface DropzoneOptions {
     forceFallback?: boolean;
     fallback?: () => void;
 
-    // dictionary options 
+    // dictionary options
     dictDefaultMessage?: string;
     dictFallbackMessage?: string;
     dictFallbackText?: string;
@@ -66,13 +66,13 @@ declare class Dropzone {
     off(eventName): void;
 
     removeFile(file: DropzoneFile): void;
-    removeAllFiles(): void;
+    removeAllFiles(cancelIfNecessary?: boolean): void;
     processQueue(): void;
     getAcceptedFiles(): DropzoneFile[];
     getRejectedFiles(): DropzoneFile[];
     getQueuedFiles(): DropzoneFile[];
     getUploadingFiles(): DropzoneFile[];
-    
+
     emit(eventName: string, file: DropzoneFile, str?: string);
     emit(eventName: "thumbnail", file: DropzoneFile, path: string);
     emit(eventName: "addedfile", file: DropzoneFile);

gruntjs/gruntjs.d.ts

@@ -122,8 +122,7 @@ declare module grunt {
          * {@link http://gruntjs.com/sample-gruntfile}
          */
         interface IProjectConfig{
-            [plugin: string]: any
-            pkg: any; // unfortunate. It is actually a string
+            [plugin: string]: any;
         }                
 
         /**

mongoose/mongoose-tests.ts

@@ -364,3 +364,5 @@ schema.virtual('display_name')
   .get(function(): string { return this.name; })
   .set((value: string): void => {});
 
+var id : mongoose.Types.ObjectId;
+var s = id.toHexString();

mongoose/mongoose.d.ts

@@ -78,7 +78,9 @@ declare module "mongoose" {
     set(fn: Function): VirtualType;
   }
   export module Types {
-    export class ObjectId {}
+    export class ObjectId {
+        toHexString(): string;
+    }
   }
 
   export class Schema {

stripe/stripe.d.ts

@@ -1,16 +1,16 @@
-// Type definitions for stripe
+// Type definitions for stripe
 // Project: https://stripe.com/
 // Definitions by: Eric J. Smith <https://github.com/ejsmith/>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 interface StripeStatic {
     setPublishableKey(key: string);
-    createToken(data: StripeTokenData, responseHandler: (status: number, response: StripeTokenResponse) => void);
     validateCardNumber(cardNumber: string): boolean;
     validateExpiry(month: string, year: string): boolean;
     validateCVC(cardCVC: string): boolean;
     cardType(cardNumber: string): string;
     getToken(token: string, responseHandler: (status: number, response: StripeTokenResponse) => void);
+    card: StripeCardData;
 }
 
 interface StripeTokenData {
@@ -57,6 +57,8 @@ interface StripeCardData {
     address_state?: string;
     address_zip?: string;
     address_country?: string;
+
+    createToken(data: StripeTokenData, responseHandler: (status: number, response: StripeTokenResponse) => void);
 }
 
-declare var Stripe: StripeStatic;
+declare var Stripe: StripeStatic;