Merge branch 'master' of github.com:michael/github

ingalls · ingalls · commit f9f5d860f028 · 2014-12-11T13:06:57.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,3 @@
-_site/*
 .DS_Store
-
-test/.DS_Store
-node_modules/
+node_modules/
+npm-debug.log
diff --git a/README.md b/README.md
@@ -279,13 +279,12 @@ Github.js is automatically™ tested by the users of [Prose](http://prose.io). B
 Github.js has the following dependencies:
 
 - Underscore
-- Base64 (for basic auth). You can leave this if you are not using basic auth.
+- btoa (included in modern browsers, an npm module is included in package.json for node)
 
 Include these before github.js :
 
 ```
 <script src="lib/underscore-min.js">
-<script src="lib/base64.js">
 <script src="github.js">
 ```
 
diff --git a/github.js b/github.js
@@ -15,14 +15,13 @@
   // Initial Setup
   // -------------
 
-  var XMLHttpRequest, Base64, _;
+  var XMLHttpRequest,  _;
   if (typeof exports !== 'undefined') {
       XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest;
       _ = require('underscore');
-      Base64 = require('./lib/base64.js');
-  }else{
+      btoa = require('btoa');
+  } else {
       _ = window._;
-      Base64 = window.Base64;
   }
   //prefer native XMLHttpRequest always
   if (typeof window !== 'undefined' && typeof window.XMLHttpRequest !== 'undefined'){
@@ -63,7 +62,7 @@
       xhr.setRequestHeader('Accept','application/vnd.github.v3.raw+json');
       xhr.setRequestHeader('Content-Type','application/json;charset=UTF-8');
       if ((options.token) || (options.username && options.password)) {
-        var authorization = options.token ? 'token ' + options.token : 'Basic ' + Base64.encode(options.username + ':' + options.password);
+        var authorization = options.token ? 'token ' + options.token : 'Basic ' + btoa(options.username + ':' + options.password);
         xhr.setRequestHeader('Authorization', authorization);
       }
       if (data)
diff --git a/lib/base64.js b/lib/base64.js
diff --git a/package.json b/package.json
@@ -4,6 +4,7 @@
   "description": "A higher-level wrapper around the Github API.",
   "main": "github.js",
   "dependencies": {
+    "btoa": "^1.1.2",
     "tape": "^3.0.3",
     "underscore": "~1.6.0",
     "xmlhttprequest": "~1.6.0"
