Fixing overrides I accidentally made in the conflict merges

Modernizr · Feb 24, 2013 · 8813c25 · 8813c25
1 parent 56ac350
commit 8813c25
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/config-all.json b/config-all.json
@@ -63,6 +63,7 @@
     "test/css/vmaxunit",
     "test/css/vminunit",
     "test/css/vwunit",
+    "test/css/wrapflow",
     "test/dom/classlist",
     "test/dom/createElement-attrs",
     "test/dom/dataset",

diff --git a/feature-detects/forms/fileinput.js b/feature-detects/forms/fileinput.js
@@ -7,7 +7,7 @@ define(['Modernizr', 'createElement'], function( Modernizr, createElement ) {
   //  don't support it (iphone, ipad, etc).
 
   Modernizr.addTest('fileinput', function() {
-    if(navigator.userAgent.match(/(Android (1.0|1.1|1.5|1.6|2.0|2.1))|(Windows Phone (OS 7|8.0)|(XBLWP)|(ZuneWP)|(w(eb)?OSBrowser)|(webOS)|Pre\/1.2|Kindle\/(1.0|2.0|2.5|3.0))/)) {
+    if(navigator.userAgent.match(/(Android (1.0|1.1|1.5|1.6|2.0|2.1))|(Windows Phone (OS 7|8.0))|(XBLWP)|(ZuneWP)|(w(eb)?OSBrowser)|(webOS)|(Kindle\/(1.0|2.0|2.5|3.0))/)) {
         return false;
     }
     var elem = createElement('input');

diff --git a/modular.html b/modular.html
@@ -77,6 +77,7 @@ <h1>Config JSON</h1>
     "test/css/vmaxunit",
     "test/css/vminunit",
     "test/css/vwunit",
+    "test/css/wrapflow",
     "test/dom/classlist",
     "test/dom/createElement-attrs",
     "test/dom/dataset",