Merge branch 'master' of http://github.com/DefinitelyTyped/DefinitelyTyped

Author: mauchmaSICKAG

.gitattributes

@@ -1,5 +1,5 @@
 # Auto detect text files and perform LF normalization
-* text=none
+* text=auto
 
 # Custom for Visual Studio
 *.cs     diff=csharp

.gitignore

@@ -1,36 +1,37 @@
-*.dll
-*.exe
-*.cmd
-*.pdb
-*.suo
-*.js
-*.user
-*.cache
-*.cs
-*.sln
-*.csproj
-*.txt
-*.map
-*.swp
-.DS_Store
-
-_Resharper.DefinitelyTyped
-bin
-obj
-Properties
-
-# VIM backup files
-*~
-
-# test folder
-_infrastructure/tests/build
-
-.idea
-*.iml
-*.js.map
-!*.js/
-
-node_modules
-
-.sublimets
-.settings/launch.json
+*.dll
+*.exe
+*.cmd
+*.pdb
+*.suo
+*.js
+*.user
+*.cache
+*.cs
+*.sln
+*.csproj
+*.txt
+*.map
+*.swp
+.DS_Store
+npm-debug.log
+
+_Resharper.DefinitelyTyped
+bin
+obj
+Properties
+
+# VIM backup files
+*~
+
+# test folder
+_infrastructure/tests/build
+
+.idea
+*.iml
+*.js.map
+!*.js/
+
+node_modules
+
+.sublimets
+.settings/launch.json

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - "0.10"
+  - 4
 
 sudo: false
 

CONTRIBUTORS.md

@@ -6,6 +6,7 @@
 function testSaveAs() {
     var data: Blob = new Blob(["Hello, world!"], {type: "text/plain;charset=utf-8"});
     var filename: string = 'hello world.txt';
-    
-    saveAs(data, filename);
+    var disableAutoBOM = true;
+
+    saveAs(data, filename, disableAutoBOM);
 }

FileSaver/FileSaver-tests.ts

@@ -20,8 +20,14 @@ interface FileSaver {
          * @summary File name.
          * @type {DOMString}
          */
-        filename: string
+	 filename: string,
+
+	 /**
+	  * @summary Disable Unicode text encoding hints or not.
+	  * @type {boolean}
+	  */
+	 disableAutoBOM?: boolean
     ): void
 }
 
-declare var saveAs: FileSaver;
+declare var saveAs: FileSaver;