gowon · June 14, 2021 17:03 · Dec 2, 2015 · Aug 9, 2013 · Aug 9, 2013 · Aug 9, 2013
diff --git a/detectDataURL.js b/detectDataURL.js
@@ -4,6 +4,6 @@
 // Valid URL Characters: http://tools.ietf.org/html/rfc2396#section2
 
 function isDataURL(s) {
-    return !!s.match(isDataURL.regex);
+    return isDataURL.regex.test(s);
 }
-isDataURL.regex = /^\s*data:([a-z]+\/[a-z]+(;[a-z\-]+\=[a-z\-]+)?)?(;base64)?,[a-z0-9\!\$\&\'\,\(\)\*\+\,\;\=\-\.\_\~\:\@\/\?\%\s]*\s*$/i;
+isDataURI.regex = /^\s*data:([a-z]+\/[a-z0-9\-]+(;[a-z\-]+\=[a-z\-]+)?)?(;base64)?,[a-z0-9\!\$\&\'\,\(\)\*\+\,\;\=\-\.\_\~\:\@\/\?\%\s]*\s*$/i;
diff --git a/detectDataURL.js b/detectDataURL.js
@@ -6,4 +6,4 @@
 function isDataURL(s) {
     return !!s.match(isDataURL.regex);
 }
-isDataURL.regex = /^\s*data:([a-z]+\/[a-z]+)?(;base64)?,[a-z0-9\!\$\&\'\,\(\)\*\+\,\;\=\-\.\_\~\:\@\/\?\%\s]*\s*$/i;
+isDataURL.regex = /^\s*data:([a-z]+\/[a-z]+(;[a-z\-]+\=[a-z\-]+)?)?(;base64)?,[a-z0-9\!\$\&\'\,\(\)\*\+\,\;\=\-\.\_\~\:\@\/\?\%\s]*\s*$/i;
diff --git a/test.js b/test.js
@@ -6,35 +6,54 @@ var yes = [
     " data:,Hello World!",
     " data:text/plain;base64,SGVsbG8sIFdvcmxkIQ%3D%3D",
     " data:text/html,%3Ch1%3EHello%2C%20World!%3C%2Fh1%3E",
-    "data:,A%20brief%20note"
+    "data:,A%20brief%20note",
+    "data:text/html;charset=US-ASCII,%3Ch1%3EHello!%3C%2Fh1%3E"
 ];
 
 var no = [
     "dataxbase64",
     "data:HelloWorld",
-    "data:base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAD///+l2Z/dAAAAM0lEQVR4nGP4/5/h/1+G/58ZDrAz3D/McH8yw83NDDeNGe4Ug9C9zwz3gVLMDA/A6P9/AFGGFyjOXZtQAAAAAElFTkSuQmCC",
+    "data:text/html;charset=,%3Ch1%3EHello!%3C%2Fh1%3E",
+    "data:text/html;charset,%3Ch1%3EHello!%3C%2Fh1%3E", "data:base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAD///+l2Z/dAAAAM0lEQVR4nGP4/5/h/1+G/58ZDrAz3D/McH8yw83NDDeNGe4Ug9C9zwz3gVLMDA/A6P9/AFGGFyjOXZtQAAAAAElFTkSuQmCC",
     "",
     "http://wikipedia.org",
     "base64",
     "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAD///+l2Z/dAAAAM0lEQVR4nGP4/5/h/1+G/58ZDrAz3D/McH8yw83NDDeNGe4Ug9C9zwz3gVLMDA/A6P9/AFGGFyjOXZtQAAAAAElFTkSuQmCC"
 ];
 
+var log = document.createElement("pre");
+document.body.appendChild(log);
+
+function printError(msg) {
+   var message = document.createElement("span");
+   message.style.color = "red";
+   message.textContent = msg + "\n";
+
+   log.appendChild(message);
+}
+
+function printSuccess(msg) {
+   var message = document.createElement("span");
+   message.style.color = "green";
+   message.textContent = msg + "\n";
+
+   log.appendChild(message);
+}
 
 yes.forEach(function(s) {
     if (!isDataURL(s)) {
-       throw "Assertion failed: " + s;  
+        printError("Expected yes, got no: " + s);
     }
-    else {
-       console.log("Matched as expected ", s); 
+    else {        
+        printSuccess("Expected yes, got yes: " + s);
     }
 });
 
 no.forEach(function(s) {
     if (isDataURL(s)) {
-        throw "Assertion failed: " + s;  
+        printError("Expected no, got yes: " + s);
     }
     else {
-       console.log("Matched as expected ", s); 
+        printSuccess("Expected no, got no: " + s);
     }
-});
-
+});
diff --git a/uri-data-syntax.md b/uri-data-syntax.md
@@ -1,4 +1,3 @@
-
 ## [Syntax](http://tools.ietf.org/html/rfc2397#page-2)
 
     dataurl    := "data:" [ mediatype ] [ ";base64" ] "," data

diff --git a/uri-data-syntax.md b/uri-data-syntax.md
@@ -1,6 +1,5 @@
 
-
-** [Syntax](http://tools.ietf.org/html/rfc2397#page-2) **
+## [Syntax](http://tools.ietf.org/html/rfc2397#page-2)
 
     dataurl    := "data:" [ mediatype ] [ ";base64" ] "," data
     mediatype  := [ type "/" subtype ] *( ";" parameter )

diff --git a/uri-data-syntax.md b/uri-data-syntax.md
@@ -1,6 +1,6 @@
-http://tools.ietf.org/html/rfc2397#page-2
 
-# Syntax
+
+** [Syntax](http://tools.ietf.org/html/rfc2397#page-2) **
 
     dataurl    := "data:" [ mediatype ] [ ";base64" ] "," data
     mediatype  := [ type "/" subtype ] *( ";" parameter )

diff --git a/uri-data-syntax.md b/uri-data-syntax.md
@@ -1,22 +1,22 @@
 http://tools.ietf.org/html/rfc2397#page-2
 
-3. Syntax
-       
+# Syntax
+
     dataurl    := "data:" [ mediatype ] [ ";base64" ] "," data
     mediatype  := [ type "/" subtype ] *( ";" parameter )
     data       := *urlchar
     parameter  := attribute "=" value
 
-   where "urlchar" is imported from [RFC2396], and "type", "subtype",
-   "attribute" and "value" are the corresponding tokens from [RFC2045],
-   represented using URL escaped encoding of [RFC2396] as necessary.
+where "urlchar" is imported from [RFC2396], and "type", "subtype",
+"attribute" and "value" are the corresponding tokens from [RFC2045],
+represented using URL escaped encoding of [RFC2396] as necessary.
 
-   Attribute values in [RFC2045] are allowed to be either represented as
-   tokens or as quoted strings. However, within a "data" URL, the
-   "quoted-string" representation would be awkward, since the quote mark
-   is itself not a valid urlchar. For this reason, parameter values
-   should use the URL Escaped encoding instead of quoted string if the
-   parameter values contain any "tspecial".
+Attribute values in [RFC2045] are allowed to be either represented as
+tokens or as quoted strings. However, within a "data" URL, the
+"quoted-string" representation would be awkward, since the quote mark
+is itself not a valid urlchar. For this reason, parameter values
+should use the URL Escaped encoding instead of quoted string if the
+parameter values contain any "tspecial".
 
-   The ";base64" extension is distinguishable from a content-type
-   parameter by the fact that it doesn't have a following "=" sign.
+The ";base64" extension is distinguishable from a content-type
+parameter by the fact that it doesn't have a following "=" sign.
diff --git a/syntax.md → uri-data-syntax.md b/syntax.md → uri-data-syntax.md
@@ -1,11 +1,11 @@
-[http://tools.ietf.org/html/rfc2397#page-2]
+http://tools.ietf.org/html/rfc2397#page-2
 
 3. Syntax
-
-       dataurl    := "data:" [ mediatype ] [ ";base64" ] "," data
-       mediatype  := [ type "/" subtype ] *( ";" parameter )
-       data       := *urlchar
-       parameter  := attribute "=" value
+       
+    dataurl    := "data:" [ mediatype ] [ ";base64" ] "," data
+    mediatype  := [ type "/" subtype ] *( ";" parameter )
+    data       := *urlchar
+    parameter  := attribute "=" value
 
    where "urlchar" is imported from [RFC2396], and "type", "subtype",
    "attribute" and "value" are the corresponding tokens from [RFC2045],

diff --git a/syntax.md b/syntax.md
@@ -0,0 +1,22 @@
+[http://tools.ietf.org/html/rfc2397#page-2]
+
+3. Syntax
+
+       dataurl    := "data:" [ mediatype ] [ ";base64" ] "," data
+       mediatype  := [ type "/" subtype ] *( ";" parameter )
+       data       := *urlchar
+       parameter  := attribute "=" value
+
+   where "urlchar" is imported from [RFC2396], and "type", "subtype",
+   "attribute" and "value" are the corresponding tokens from [RFC2045],
+   represented using URL escaped encoding of [RFC2396] as necessary.
+
+   Attribute values in [RFC2045] are allowed to be either represented as
+   tokens or as quoted strings. However, within a "data" URL, the
+   "quoted-string" representation would be awkward, since the quote mark
+   is itself not a valid urlchar. For this reason, parameter values
+   should use the URL Escaped encoding instead of quoted string if the
+   parameter values contain any "tspecial".
+
+   The ";base64" extension is distinguishable from a content-type
+   parameter by the fact that it doesn't have a following "=" sign.
diff --git a/test.js b/test.js
@@ -1,4 +1,3 @@
-
 var yes = [
     "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAD///+l2Z/dAAAAM0lEQVR4nGP4/5/h/1+G/58ZDrAz3D/McH8yw83NDDeNGe4Ug9C9zwz3gVLMDA/A6P9/AFGGFyjOXZtQAAAAAElFTkSuQmCC",
     "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIBAMAAAA2IaO4AAAAFVBMVEXk5OTn5+ft7e319fX29vb5+fn///++GUmVAAAALUlEQVQIHWNICnYLZnALTgpmMGYIFWYIZTA2ZFAzTTFlSDFVMwVyQhmAwsYMAKDaBy0axX/iAAAAAElFTkSuQmCC",
@@ -20,8 +19,8 @@ var no = [
     "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAD///+l2Z/dAAAAM0lEQVR4nGP4/5/h/1+G/58ZDrAz3D/McH8yw83NDDeNGe4Ug9C9zwz3gVLMDA/A6P9/AFGGFyjOXZtQAAAAAElFTkSuQmCC"
 ];
 
-yes.forEach(function(s) {
 
+yes.forEach(function(s) {
     if (!isDataURL(s)) {
        throw "Assertion failed: " + s;  
     }
@@ -31,12 +30,11 @@ yes.forEach(function(s) {
 });
 
 no.forEach(function(s) {
-
     if (isDataURL(s)) {
         throw "Assertion failed: " + s;  
     }
     else {
        console.log("Matched as expected ", s); 
     }
-
 });
+
diff --git a/detectDataURL.js b/detectDataURL.js
@@ -1,4 +1,3 @@
-
 // Detecting data URLs
 // data URI - MDN https://developer.mozilla.org/en-US/docs/data_URIs
 // The "data" URL scheme: http://tools.ietf.org/html/rfc2397
@@ -7,4 +6,4 @@
 function isDataURL(s) {
     return !!s.match(isDataURL.regex);
 }
-isDataURL.regex = /^\s*data:([a-z]+\/[a-z]+)?(;base64)?,[a-z0-9\!\$\&\'\,\(\)\*\+\,\;\=\-\.\_\~\:\@\/\?\%]*\s*$/i;
+isDataURL.regex = /^\s*data:([a-z]+\/[a-z]+)?(;base64)?,[a-z0-9\!\$\&\'\,\(\)\*\+\,\;\=\-\.\_\~\:\@\/\?\%\s]*\s*$/i;
diff --git a/test.js b/test.js
@@ -1,22 +1,23 @@
 
-
 var yes = [
-'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAD///+l2Z/dAAAAM0lEQVR4nGP4/5/h/1+G/58ZDrAz3D/McH8yw83NDDeNGe4Ug9C9zwz3gVLMDA/A6P9/AFGGFyjOXZtQAAAAAElFTkSuQmCC',
-"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIBAMAAAA2IaO4AAAAFVBMVEXk5OTn5+ft7e319fX29vb5+fn///++GUmVAAAALUlEQVQIHWNICnYLZnALTgpmMGYIFWYIZTA2ZFAzTTFlSDFVMwVyQhmAwsYMAKDaBy0axX/iAAAAAElFTkSuQmCC",
-"   data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIBAMAAAA2IaO4AAAAFVBMVEXk5OTn5+ft7e319fX29vb5+fn///++GUmVAAAALUlEQVQIHWNICnYLZnALTgpmMGYIFWYIZTA2ZFAzTTFlSDFVMwVyQhmAwsYMAKDaBy0axX/iAAAAAElFTkSuQmCC   ",
-" data:,Hello%2C%20World!",
-" data:text/plain;base64,SGVsbG8sIFdvcmxkIQ%3D%3D",
-" data:text/html,%3Ch1%3EHello%2C%20World!%3C%2Fh1%3E",
-"data:,A%20brief%20note"
+    "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAD///+l2Z/dAAAAM0lEQVR4nGP4/5/h/1+G/58ZDrAz3D/McH8yw83NDDeNGe4Ug9C9zwz3gVLMDA/A6P9/AFGGFyjOXZtQAAAAAElFTkSuQmCC",
+    "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIBAMAAAA2IaO4AAAAFVBMVEXk5OTn5+ft7e319fX29vb5+fn///++GUmVAAAALUlEQVQIHWNICnYLZnALTgpmMGYIFWYIZTA2ZFAzTTFlSDFVMwVyQhmAwsYMAKDaBy0axX/iAAAAAElFTkSuQmCC",
+    "   data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIBAMAAAA2IaO4AAAAFVBMVEXk5OTn5+ft7e319fX29vb5+fn///++GUmVAAAALUlEQVQIHWNICnYLZnALTgpmMGYIFWYIZTA2ZFAzTTFlSDFVMwVyQhmAwsYMAKDaBy0axX/iAAAAAElFTkSuQmCC   ",
+    " data:,Hello%2C%20World!",
+    " data:,Hello World!",
+    " data:text/plain;base64,SGVsbG8sIFdvcmxkIQ%3D%3D",
+    " data:text/html,%3Ch1%3EHello%2C%20World!%3C%2Fh1%3E",
+    "data:,A%20brief%20note"
 ];
 
 var no = [
-"dataxbase64",
-'data:base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAD///+l2Z/dAAAAM0lEQVR4nGP4/5/h/1+G/58ZDrAz3D/McH8yw83NDDeNGe4Ug9C9zwz3gVLMDA/A6P9/AFGGFyjOXZtQAAAAAElFTkSuQmCC',
-'',
-'http://wikipedia.org',
-'base64',
-'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAD///+l2Z/dAAAAM0lEQVR4nGP4/5/h/1+G/58ZDrAz3D/McH8yw83NDDeNGe4Ug9C9zwz3gVLMDA/A6P9/AFGGFyjOXZtQAAAAAElFTkSuQmCC'
+    "dataxbase64",
+    "data:HelloWorld",
+    "data:base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAD///+l2Z/dAAAAM0lEQVR4nGP4/5/h/1+G/58ZDrAz3D/McH8yw83NDDeNGe4Ug9C9zwz3gVLMDA/A6P9/AFGGFyjOXZtQAAAAAElFTkSuQmCC",
+    "",
+    "http://wikipedia.org",
+    "base64",
+    "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAD///+l2Z/dAAAAM0lEQVR4nGP4/5/h/1+G/58ZDrAz3D/McH8yw83NDDeNGe4Ug9C9zwz3gVLMDA/A6P9/AFGGFyjOXZtQAAAAAElFTkSuQmCC"
 ];
 
 yes.forEach(function(s) {

diff --git a/detectDataURL.js b/detectDataURL.js
@@ -0,0 +1,10 @@
+
+// Detecting data URLs
+// data URI - MDN https://developer.mozilla.org/en-US/docs/data_URIs
+// The "data" URL scheme: http://tools.ietf.org/html/rfc2397
+// Valid URL Characters: http://tools.ietf.org/html/rfc2396#section2
+
+function isDataURL(s) {
+    return !!s.match(isDataURL.regex);
+}
+isDataURL.regex = /^\s*data:([a-z]+\/[a-z]+)?(;base64)?,[a-z0-9\!\$\&\'\,\(\)\*\+\,\;\=\-\.\_\~\:\@\/\?\%]*\s*$/i;
diff --git a/test.js b/test.js
@@ -0,0 +1,41 @@
+
+
+var yes = [
+'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAD///+l2Z/dAAAAM0lEQVR4nGP4/5/h/1+G/58ZDrAz3D/McH8yw83NDDeNGe4Ug9C9zwz3gVLMDA/A6P9/AFGGFyjOXZtQAAAAAElFTkSuQmCC',
+"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIBAMAAAA2IaO4AAAAFVBMVEXk5OTn5+ft7e319fX29vb5+fn///++GUmVAAAALUlEQVQIHWNICnYLZnALTgpmMGYIFWYIZTA2ZFAzTTFlSDFVMwVyQhmAwsYMAKDaBy0axX/iAAAAAElFTkSuQmCC",
+"   data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIBAMAAAA2IaO4AAAAFVBMVEXk5OTn5+ft7e319fX29vb5+fn///++GUmVAAAALUlEQVQIHWNICnYLZnALTgpmMGYIFWYIZTA2ZFAzTTFlSDFVMwVyQhmAwsYMAKDaBy0axX/iAAAAAElFTkSuQmCC   ",
+" data:,Hello%2C%20World!",
+" data:text/plain;base64,SGVsbG8sIFdvcmxkIQ%3D%3D",
+" data:text/html,%3Ch1%3EHello%2C%20World!%3C%2Fh1%3E",
+"data:,A%20brief%20note"
+];
+
+var no = [
+"dataxbase64",
+'data:base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAD///+l2Z/dAAAAM0lEQVR4nGP4/5/h/1+G/58ZDrAz3D/McH8yw83NDDeNGe4Ug9C9zwz3gVLMDA/A6P9/AFGGFyjOXZtQAAAAAElFTkSuQmCC',
+'',
+'http://wikipedia.org',
+'base64',
+'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAD///+l2Z/dAAAAM0lEQVR4nGP4/5/h/1+G/58ZDrAz3D/McH8yw83NDDeNGe4Ug9C9zwz3gVLMDA/A6P9/AFGGFyjOXZtQAAAAAElFTkSuQmCC'
+];
+
+yes.forEach(function(s) {
+
+    if (!isDataURL(s)) {
+       throw "Assertion failed: " + s;  
+    }
+    else {
+       console.log("Matched as expected ", s); 
+    }
+});
+
+no.forEach(function(s) {
+
+    if (isDataURL(s)) {
+        throw "Assertion failed: " + s;  
+    }
+    else {
+       console.log("Matched as expected ", s); 
+    }
+
+});
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@

		## [Syntax](http://tools.ietf.org/html/rfc2397#page-2)

		dataurl := "data:" [ mediatype ] [ ";base64" ] "," data
No results found