Merge pull request #1 from Microsoft/master

fetch latest code
microsoft · Jan 13, 2016 · cb4b6dc · cb4b6dc
2 parents 9951366 + b9b0cee
commit cb4b6dc
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts
@@ -1514,9 +1514,9 @@ interface DataTransferItemList {
     length: number;
     add(data: File): DataTransferItem;
     clear(): void;
-    item(index: number): File;
+    item(index: number): DataTransferItem;
     remove(index: number): void;
-    [index: number]: File;
+    [index: number]: DataTransferItem;
 }
 
 declare var DataTransferItemList: {
@@ -3770,6 +3770,7 @@ interface HTMLCanvasElement extends HTMLElement {
       * @param type The standard MIME type for the image format to return. If you do not specify this parameter, the default value is a PNG format image.
       */
     toDataURL(type?: string, ...args: any[]): string;
+    toBlob(): Blob;
 }
 
 declare var HTMLCanvasElement: {

diff --git a/inputfiles/addedTypes.json b/inputfiles/addedTypes.json
@@ -302,5 +302,11 @@
         "interface": "HTMLSelectElement",
         "name": "selectedOptions",
         "type": "HTMLCollection"
+    },
+    {
+        "kind": "method",
+        "interface": "HTMLCanvasElement",
+        "name": "toBlob",
+        "signatures": ["toBlob(): Blob"]
     }
 ]
diff --git a/inputfiles/overridingTypes.json b/inputfiles/overridingTypes.json
@@ -295,5 +295,16 @@
         "interface": "IDBDatabase",
         "name": "version",
         "type": "number"
+    },
+    {
+        "kind": "method",
+        "interface": "DataTransferItemList",
+        "name": "item",
+        "signatures": ["item(index: number): DataTransferItem"]
+    },
+    {
+        "kind": "indexer",
+        "interface": "DataTransferItemList",
+        "signatures": ["[index: number]: DataTransferItem"]
     }
 ]