Merge pull request #294 from benjaminmcdonald/patch-1

Update ParseFile.js

Author: andrewimm

src/ParseFile.js

@@ -24,7 +24,7 @@ export type FileSource = {
 };
 
 var dataUriRegexp =
-  /^data:([a-zA-Z]*\/[a-zA-Z+.-]*);(charset=[a-zA-Z0-9\-\/\s]*,)?base64,(\S+)/;
+  /^data:([a-zA-Z]*\/[a-zA-Z+.-]*);(charset=[a-zA-Z0-9\-\/\s]*,)?base64,/;
 
 function b64Digit(number: number): string {
   if (number < 26) {
@@ -99,12 +99,14 @@ export default class ParseFile {
         type: specifiedType
       };
     } else if (data && data.hasOwnProperty('base64')) {
-      var matches = dataUriRegexp.exec(data.base64);
-      if (matches && matches.length > 0) {
+      var commaIndex = data.base64.indexOf(',');
+  
+      if (commaIndex !== -1) {
+        var matches = dataUriRegexp.exec(data.base64.slice(0, commaIndex + 1));
         // if data URI with type and charset, there will be 4 matches.
         this._source = {
           format: 'base64',
-          base64: matches.length === 4 ? matches[3] : matches[2],
+          base64: data.base64.slice(commaIndex + 1),
           type: matches[1]
         };
       } else {