Merge pull request #397 from Igmat/master

Better commonJs module integration

Author: steffentchr

package.json

@@ -3,6 +3,7 @@
   "version": "1.1.1",
   "description": "A JavaScript library for providing multiple simultaneous, stable, fault-tolerant and resumable/restartable uploads via the HTML5 File API.",
   "main": "resumable.js",
+  "types": "./resumable.d.ts",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },

resumable.d.ts

@@ -158,10 +158,10 @@ declare module Resumable  {
      **/
     dragOverClass?: string;
   }
-  
+
   export class Resumable {
     constructor(options:ConfigurationHash);
-    
+
     /**
      * A boolean value indicator whether or not Resumable.js is supported by the current browser.
      **/
@@ -174,10 +174,10 @@ declare module Resumable  {
      * An array of ResumableFile file objects added by the user (see full docs for this object type below).
      **/
     files: Array<ResumableFile>;
-    
+
     events: Array<any>;
     version: number;
-    
+
     /**
      * Assign a browse action to one or more DOM nodes. Pass in true to allow directories to be selected (Chrome only).
      **/
@@ -233,7 +233,7 @@ declare module Resumable  {
      **/
     getSize(): void;
     getOpt(o: string): any;
-    
+
     // Events
     /**
      * Listen for event from Resumable.js (see below)
@@ -369,10 +369,10 @@ declare module Resumable  {
      **/
     isComplete: () => boolean;
   }
-  
+
   class ResumableChunk {}
 }
 
 declare module 'resumablejs' {
-  export = Resumable.Resumable;
+  export = Resumable;
 }

resumable.js

@@ -1154,7 +1154,9 @@
 
   // Node.js-style export for Node and Component
   if (typeof module != 'undefined') {
+    // left here for backwards compatibility
     module.exports = Resumable;
+    module.exports.Resumable = Resumable;
   } else if (typeof define === "function" && define.amd) {
     // AMD/requirejs: Define the module
     define(function(){