Moved Modernizr.touch -> Modernizr.touchevents (kept an alias though)

Modernizr · Jan 29, 2013 · b36a6b2 · b36a6b2
1 parent fa31361
commit b36a6b2
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 55 deletions.
diff --git a/config-all.json b/config-all.json
@@ -149,7 +149,7 @@
     "test/quota-management-api",
     "test/requestanimationframe",
     "test/svg",
-    "test/touch",
+    "test/touchevents",
     "test/unicode",
     "test/userdata",
     "test/vibration",

diff --git a/feature-detects/touch.js → feature-detects/touchevents.js b/feature-detects/touch.js → feature-detects/touchevents.js
@@ -13,7 +13,7 @@ define(['Modernizr', 'prefixes', 'testStyles'], function( Modernizr, prefixes, t
   // For more info, see: modernizr.github.com/Modernizr/touch.html
   //
 
-  Modernizr.addTest('touch', function() {
+  Modernizr.addTest('touchevents', function() {
     var bool;
     if(('ontouchstart' in window) || window.DocumentTouch && document instanceof DocumentTouch) {
       bool = true;
@@ -24,5 +24,7 @@ define(['Modernizr', 'prefixes', 'testStyles'], function( Modernizr, prefixes, t
       });
     }
     return bool;
+  }, {
+    aliases : ['touch']
   });
 });
diff --git a/modular.html b/modular.html
@@ -162,7 +162,7 @@ <h1>Config JSON</h1>
     "test/quota-management-api",
     "test/requestanimationframe",
     "test/svg",
-    "test/touch",
+    "test/touchevents",
     "test/unicode",
     "test/userdata",
     "test/vibration",

diff --git a/modulizr/index.html b/modulizr/index.html
@@ -10,53 +10,53 @@ <h1>Modernizr Modular Build Tool</h1>
 
 <h3>Choose the features you want to test for:</h3>
 
-<ul id="tests" class="features"> 
+<ul id="tests" class="features">
   <li id="fontface"><input type="checkbox" value="fontface" /> @font-face</li>
   <li id="flexbox"><input type="checkbox" value="flexbox" /> FlexBox CSS Model</li>
   <li id="webgl"><input type="checkbox" value="webgl" /> WebGL</li>
-  <li id="touch"><input type="checkbox" value="touch" /> Touch Events</li>
+  <li id="touchevents"><input type="checkbox" value="touchevents" /> Touch Events</li>
   <li id="postmessage"><input type="checkbox" value="postmessage" /> PostMessage</li>
   <li id="textshadow"><input type="checkbox" value="textshadow" /> text-shadow</li>
   <li id="inlinesvg"><input type="checkbox" value="inlinesvg" /> Inline SVG</li>
-  <li id="canvas"><input type="checkbox" value="canvas" /> Canvas</li> 
-  <li id="canvastext"><input type="checkbox" value="canvastext" /> Canvas Text</li> 
-  <li id="audio"><input type="checkbox" value="audio" /> HTML5 Audio</li> 
-  <li id="video"><input type="checkbox" value="video" /> HTML5 Video</li> 
-  <li id="rgba"><input type="checkbox" value="rgba" /> rgba()</li> 
-  <li id="hsla"><input type="checkbox" value="hsla" /> hsla()</li> 
-  <li id="borderimage"><input type="checkbox" value="borderimage" /> border-image:</li> 
-  <li id="borderradius"><input type="checkbox" value="borderradius" /> border-radius:</li> 
-  <li id="boxshadow"><input type="checkbox" value="boxshadow" /> box-shadow:</li> 
+  <li id="canvas"><input type="checkbox" value="canvas" /> Canvas</li>
+  <li id="canvastext"><input type="checkbox" value="canvastext" /> Canvas Text</li>
+  <li id="audio"><input type="checkbox" value="audio" /> HTML5 Audio</li>
+  <li id="video"><input type="checkbox" value="video" /> HTML5 Video</li>
+  <li id="rgba"><input type="checkbox" value="rgba" /> rgba()</li>
+  <li id="hsla"><input type="checkbox" value="hsla" /> hsla()</li>
+  <li id="borderimage"><input type="checkbox" value="borderimage" /> border-image:</li>
+  <li id="borderradius"><input type="checkbox" value="borderradius" /> border-radius:</li>
+  <li id="boxshadow"><input type="checkbox" value="boxshadow" /> box-shadow:</li>
   <li id="opacity"><input type="checkbox" value="opacity" /> opacity:</li>
-  <li id="backgroundsize"><input type="checkbox" value="backgroundsize" /> backgroundsize</li> 
-  <li id="multiplebgs"><input type="checkbox" value="multiplebgs" /> Multiple backgrounds</li> 
-  <li id="cssanimations"><input type="checkbox" value="cssanimations" /> CSS Animations</li> 
-  <li id="csscolumns"><input type="checkbox" value="csscolumns" /> CSS Columns</li> 
-  <li id="cssgradients"><input type="checkbox" value="cssgradients" /> CSS Gradients</li> 
-  <li id="cssreflections"><input type="checkbox" value="cssreflections" /> CSS Reflections</li> 
-  <li id="csstransforms"><input type="checkbox" value="csstransforms" /> CSS 2D Transforms</li> 
-  <li id="csstransforms3d"><input type="checkbox" value="csstransforms3d" /> CSS 3D Transforms</li> 
-  <li id="csstransitions"><input type="checkbox" value="csstransitions" /> CSS Transitions</li> 
-  <li id="geolocation"><input type="checkbox" value="geolocation" /> Geolocation API</li> 
-  <li id="localstorage"><input type="checkbox" value="localstorage" /> localStorage</li> 
-  <li id="sessionstorage"><input type="checkbox" value="sessionstorage" /> sessionStorage</li> 
-  <li id="svg"><input type="checkbox" value="svg" /> SVG</li> 
-  <li id="smil"><input type="checkbox" value="smil" /> SMIL</li> 
-  <li id="svgclippaths"><input type="checkbox" value="svgclippaths" /> SVG Clipping</li> 
-  <li id="draganddrop"><input type="checkbox" value="draganddrop" /> Drag and Drop</li> 
-  <li id="hashchange"><input type="checkbox" value="hashchange" /> hashchange</li> 
-  <li id="history"><input type="checkbox" value="history" /> History</li> 
-  <li id="applicationcache"><input type="checkbox" value="applicationcache" /> applicationCache</li> 
+  <li id="backgroundsize"><input type="checkbox" value="backgroundsize" /> backgroundsize</li>
+  <li id="multiplebgs"><input type="checkbox" value="multiplebgs" /> Multiple backgrounds</li>
+  <li id="cssanimations"><input type="checkbox" value="cssanimations" /> CSS Animations</li>
+  <li id="csscolumns"><input type="checkbox" value="csscolumns" /> CSS Columns</li>
+  <li id="cssgradients"><input type="checkbox" value="cssgradients" /> CSS Gradients</li>
+  <li id="cssreflections"><input type="checkbox" value="cssreflections" /> CSS Reflections</li>
+  <li id="csstransforms"><input type="checkbox" value="csstransforms" /> CSS 2D Transforms</li>
+  <li id="csstransforms3d"><input type="checkbox" value="csstransforms3d" /> CSS 3D Transforms</li>
+  <li id="csstransitions"><input type="checkbox" value="csstransitions" /> CSS Transitions</li>
+  <li id="geolocation"><input type="checkbox" value="geolocation" /> Geolocation API</li>
+  <li id="localstorage"><input type="checkbox" value="localstorage" /> localStorage</li>
+  <li id="sessionstorage"><input type="checkbox" value="sessionstorage" /> sessionStorage</li>
+  <li id="svg"><input type="checkbox" value="svg" /> SVG</li>
+  <li id="smil"><input type="checkbox" value="smil" /> SMIL</li>
+  <li id="svgclippaths"><input type="checkbox" value="svgclippaths" /> SVG Clipping</li>
+  <li id="draganddrop"><input type="checkbox" value="draganddrop" /> Drag and Drop</li>
+  <li id="hashchange"><input type="checkbox" value="hashchange" /> hashchange</li>
+  <li id="history"><input type="checkbox" value="history" /> History</li>
+  <li id="applicationcache"><input type="checkbox" value="applicationcache" /> applicationCache</li>
   <li id="webworkers"><input type="checkbox" value="webworkers" /> Web Workers</li>
   <li id="websockets"><input type="checkbox" value="websockets" /> Web Sockets</li>
-  <li id="websqldatabase"><input type="checkbox" value="websqldatabase" /> Web SQL Database</li> 
-  <li id="indexeddb"><input type="checkbox" value="indexeddb" /> IndexedDB</li> 
-  <li id="inputtypes"><input type="checkbox" value="inputtypes" /> Input Types</li> 
-  <li id="input"><input type="checkbox" value="input" /> Input Attributes</li> 
+  <li id="websqldatabase"><input type="checkbox" value="websqldatabase" /> Web SQL Database</li>
+  <li id="indexeddb"><input type="checkbox" value="indexeddb" /> IndexedDB</li>
+  <li id="inputtypes"><input type="checkbox" value="inputtypes" /> Input Types</li>
+  <li id="input"><input type="checkbox" value="input" /> Input Attributes</li>
 </ul>
 
 <h3>Choose the enhancements you want to run:</h3>
-<ul id="enhancements" class="features"> 
+<ul id="enhancements" class="features">
   <li id="iepp"><input type="checkbox" value="iepp" /> IEPP/HTML5 Shim</li>
   <!--li id="shim"><input type="checkbox" value="htmlclasses" /> Add &lt;html&gt; Classes (e.g. class="no-csstransitions")</li-->
 </ul>
@@ -83,7 +83,7 @@ <h3>Choose the enhancements you want to run:</h3>
     var tests = $('.features input:checked').map(function(){
       return this.value;
     });
-    
+
     // Grab the modernizr source and run it through modulizr
     $.ajax({
       dataType: 'text',
@@ -94,19 +94,19 @@ <h3>Choose the enhancements you want to run:</h3>
         // Call the modulr function to create a modular build
         var modularBuild = Modulizr.ize(script, [].slice.call(tests,0)),
             cframe       = $('#cframe').contents();
-           
+
         cframe.find('#js_code').val(modularBuild);
         cframe.find('#compileForm').submit();
 
         // Inject into the textarea
         $('#generatedSource').val(modularBuild);
-        
+
         // Create Download Button
         Downloadify.create('modulizrize',{
           filename: function(){
             return 'modernizr.custom.'+(+new Date)+'.js';
           },
-          data: function(){ 
+          data: function(){
             return modularBuild;
           },
           swf: 'media/downloadify.swf',
@@ -116,7 +116,7 @@ <h3>Choose the enhancements you want to run:</h3>
           transparent: true,
           append: false
         });
-        
+
         $('#buildArea').fadeIn();
       }
     });

diff --git a/modulizr/js/modulizr.tests.js b/modulizr/js/modulizr.tests.js
@@ -1,23 +1,23 @@
 (function(global, doc, fullModernizr, undefined){
   if (global.Modulizr) {
     global.Modulizr.Test = {
-      
+
       all: function(script, cb) {
         /**
          * In order to not have to test all possible permutation, which would be
          * prohibitively long, we'll test everything individually, and all together.
          * That's a pretty good indicator that anything inbetween will work.
          */
-        
+
         // Test everything at once!!
         var modules = this._deepCopy(this._modules);
         for(var i in this._features) {
           modules.push(this._features[i]);
         }
-        
+
         console.log(modules)
         this.ify(Modulizr.ize(script, modules), modules, cb);
-        
+
         // Then go through each and test
         for (var j in modules) {
           var modList = [modules[j]];
@@ -26,7 +26,7 @@
           this.ify(Modulizr.ize(script, modList), modList, cb);
         }
       },
-      
+
       ify: function(script, modules, cb) {
         var weirdTests = {
          // 'addtest' : function(m){ return ('addTest' in m); },
@@ -39,7 +39,7 @@
           var results = {};
           for(var i in modules) {
             var modname = modules[i];
-            
+
             if (!(modname in weirdTests)) {
               if (modname in mdzr && mdzr[modname] === fullModernizr[modname]) {
                 results[modname] = true;
@@ -62,18 +62,18 @@
           }
           cb.call(this, results, mdzr);
         };
-        
+
         this._runScript(script, myCb);
       },
-      
+
       _runScript: function(script, cb) {
         (new Function(script)).call(global);
         mdzr = global.Modernizr;
         console.log(mdzr);
         global.Modernizr = undefined;
         cb.call(this, mdzr);
       },
-      
+
       _deepCopy: function(obj) {
         if (Object.prototype.toString.call(obj) === '[object Array]') {
           var out = [], i = 0, len = obj.length;
@@ -96,7 +96,7 @@
 "canvas",
 "canvastext",
 "webgl",
-"touch",
+"touchevents",
 "geolocation",
 "postmessage",
 "websqldatabase",
@@ -133,9 +133,9 @@
 "smil",
 "svgclippaths"
       ],
-      
+
       _features: [] //'shim', 'addtest', 'htmlclasses', 'removenojs']
-      
+
     };
   }
 })(this, this.document, this.fullModernizr);