updates @require statements for js plugins, moves $.fn.addTouch and $.fn.spotSwipe...

diff --git a/dist/foundation.js b/dist/foundation.js
index d1287ba3415e74daa3287951cd3579702b78e867..ff795c903ae77957839b37eaabb4fc88a439b8d0 100644 (file)
--- a/dist/foundation.js
+++ b/dist/foundation.js
@@ -620,7 +620,7 @@ function parseStyleToObject(str) {
 /**
  * Motion module.
  * @module foundation.motion
- * @requires foundation.util.animationFrame
+ * @requires foundation.util.motion
  */
 !function($, Foundation) {
 
@@ -1786,7 +1786,7 @@ Foundation.IFeelYou = closemeListener;
  * Accordion module.
  * @module foundation.accordion
  * @requires foundation.util.keyboard
- * @requires foundation.util.animationFrame
+ * @requires foundation.util.motion
  */
 !function($) {
   'use strict';
@@ -1997,7 +1997,7 @@ Foundation.IFeelYou = closemeListener;
  * AccordionMenu module.
  * @module foundation.accordionMenu
  * @requires foundation.util.keyboard
- * @requires foundation.util.animationFrame
+ * @requires foundation.util.motion
  */
 !function($) {
   'use strict';
@@ -2243,7 +2243,7 @@ Foundation.IFeelYou = closemeListener;
  * Drilldown module.
  * @module foundation.drilldown
  * @requires foundation.util.keyboard
- * @requires foundation.util.animationFrame
+ * @requires foundation.util.motion
  */
 !function($, Foundation){
   'use strict';
@@ -2688,7 +2688,7 @@ Foundation.IFeelYou = closemeListener;
  * Dropdown module.
  * @module foundation.dropdown
  * @requires foundation.util.keyboard
- * @requires foundation.util.size-and-collision
+ * @requires foundation.util.box
  */
 !function($, Foundation){
   'use strict';
@@ -2927,7 +2927,7 @@ Foundation.IFeelYou = closemeListener;
  * DropdownMenu module.
  * @module foundation.dropdown-menu
  * @requires foundation.util.keyboard
- * @requires foundation.util.size-and-collision
+ * @requires foundation.util.box
  */
 !function(Foundation, $) {
   'use strict';
@@ -3969,7 +3969,7 @@ Foundation.IFeelYou = closemeListener;
 /**
  * Magellan module.
  * @module foundation.magellan
- * @requires foundation.util.animationFrame
+ * @requires foundation.util.motion
  */
 !function(Foundation, $) {
   'use strict';
@@ -4107,7 +4107,7 @@ Foundation.IFeelYou = closemeListener;
  * OffCanvas module.
  * @module foundation.offcanvas
  * @requires foundation.util.triggers
- * @requires foundation.util.animationFrame
+ * @requires foundation.util.motion
  */
 !function($, Foundation) {
 
@@ -4285,9 +4285,9 @@ Foundation.plugin(OffCanvas);
  * Orbit module.
  * @module foundation.orbit
  * @requires foundation.util.keyboard
- * @requires foundation.util.animationFrame
  * @requires foundation.util.motion
- * @requires foundation.util.timer
+ * @requires foundation.util.motion
+ * @requires foundation.util.timerAndImageLoader
  */
 !function($, Foundation){
   'use strict';
@@ -4868,7 +4868,7 @@ Foundation.plugin(ResponsiveToggle);
  * Reveal module.
  * @module foundation.reveal
  * @requires foundation.util.keyboard
- * @requires foundation.util.size-and-collision
+ * @requires foundation.util.box
  * @requires foundation.util.triggers
  * @requires foundation.util.mediaQuery
  */
@@ -5274,7 +5274,7 @@ Foundation.plugin(ResponsiveToggle);
 /**
  * Slider module.
  * @module foundation.slider
- * @requires foundation.util.animationFrame
+ * @requires foundation.util.motion
  * @requires foundation.util.triggers
  * @requires foundation.util.keyboard
  * @requires foundation.util.addtouch
@@ -6511,7 +6511,7 @@ Foundation.plugin(ResponsiveToggle);
 /**
  * Tooltip module.
  * @module foundation.tooltip
- * @requires foundation.util.size-and-collision
+ * @requires foundation.util.box
  * @requires foundation.util.triggers
  */
 !function($, document, Foundation){

diff --git a/js/foundation.accordion.js b/js/foundation.accordion.js
index c9063f542808c644add60d480adc7cbeed0c2c23..fe25b713a583ee6148e9031ae41888642e9c2f77 100644 (file)
--- a/js/foundation.accordion.js
+++ b/js/foundation.accordion.js
@@ -2,7 +2,7 @@
  * Accordion module.
  * @module foundation.accordion
  * @requires foundation.util.keyboard
- * @requires foundation.util.animationFrame
+ * @requires foundation.util.motion
  */
 !function($, Foundation) {
   'use strict';

diff --git a/js/foundation.accordionMenu.js b/js/foundation.accordionMenu.js
index 11ed8a85a7097d17a86eb32122ef3364e9b4f371..6cd684dfd6d1972b4ad97dc0982859c107d9107a 100644 (file)
--- a/js/foundation.accordionMenu.js
+++ b/js/foundation.accordionMenu.js
@@ -2,7 +2,8 @@
  * AccordionMenu module.
  * @module foundation.accordionMenu
  * @requires foundation.util.keyboard
- * @requires foundation.util.animationFrame
+ * @requires foundation.util.motion
+ * @requires foundation.util.nest
  */
 !function($) {
   'use strict';

diff --git a/js/foundation.drilldown.js b/js/foundation.drilldown.js
index ea24bc5a8b33f604f32193dcba50a4dd91c2e7d2..5f6bbe8936155a1dba14e71aca934592b7fcc470 100644 (file)
--- a/js/foundation.drilldown.js
+++ b/js/foundation.drilldown.js
@@ -2,7 +2,8 @@
  * Drilldown module.
  * @module foundation.drilldown
  * @requires foundation.util.keyboard
- * @requires foundation.util.animationFrame
+ * @requires foundation.util.motion
+ * @requires foundation.util.nest
  */
 !function($, Foundation){
   'use strict';

diff --git a/js/foundation.dropdown.js b/js/foundation.dropdown.js
index 3273188ee0a55376051037f996227cf7f2171207..06eb53eb9910709864f18df68009c64132db1d96 100644 (file)
--- a/js/foundation.dropdown.js
+++ b/js/foundation.dropdown.js
@@ -2,7 +2,7 @@
  * Dropdown module.
  * @module foundation.dropdown
  * @requires foundation.util.keyboard
- * @requires foundation.util.size-and-collision
+ * @requires foundation.util.box
  */
 !function($, Foundation){
   'use strict';

diff --git a/js/foundation.dropdownMenu.js b/js/foundation.dropdownMenu.js
index 3f9ba9d16a5f22c99c5982bb40663bb5b2e5cd78..46c349528f02a5108282bcc0f45f729e3ba3ee26 100644 (file)
--- a/js/foundation.dropdownMenu.js
+++ b/js/foundation.dropdownMenu.js
@@ -2,7 +2,8 @@
  * DropdownMenu module.
  * @module foundation.dropdown-menu
  * @requires foundation.util.keyboard
- * @requires foundation.util.size-and-collision
+ * @requires foundation.util.box
+ * @requires foundation.util.nest
  */
 !function(Foundation, $) {
   'use strict';

diff --git a/js/foundation.interchange.js b/js/foundation.interchange.js
index f3655a4610f114a7963cfac21d204e7d064028a3..cffcfa6e26d2e461b15d9bcef37849cbdaf3faa5 100644 (file)
--- a/js/foundation.interchange.js
+++ b/js/foundation.interchange.js
@@ -2,6 +2,7 @@
  * Interchange module.
  * @module foundation.interchange
  * @requires foundation.util.mediaQuery
+ * @requires foundation.util.timerAndImageLoader
  */
 !function(Foundation, $) {
   'use strict';

diff --git a/js/foundation.magellan.js b/js/foundation.magellan.js
index 3ae5a084aa3d243771680bddf675e5e30d5d4793..6693d34ba8f658b4845b38b5dfe6ccd0b2e357e4 100644 (file)
--- a/js/foundation.magellan.js
+++ b/js/foundation.magellan.js
@@ -1,7 +1,6 @@
 /**
  * Magellan module.
  * @module foundation.magellan
- // * @requires foundation.util.animationFrame
  */
 !function(Foundation, $) {
   'use strict';

diff --git a/js/foundation.offcanvas.js b/js/foundation.offcanvas.js
index 24a0d90695b8803840c76fe3576b08dac6d8c5ce..872df780dd5b92adf9d8ab0a9a596d2394495553 100644 (file)
--- a/js/foundation.offcanvas.js
+++ b/js/foundation.offcanvas.js
@@ -2,7 +2,7 @@
  * OffCanvas module.
  * @module foundation.offcanvas
  * @requires foundation.util.triggers
- * @requires foundation.util.animationFrame
+ * @requires foundation.util.motion
  */
 !function($, Foundation) {
 

diff --git a/js/foundation.orbit.js b/js/foundation.orbit.js
index d6ea61dd90d81a669f3b2a2d408ddb3bdd38a865..943210c3c97a3210c81173ba2a0d925883866ee7 100644 (file)
--- a/js/foundation.orbit.js
+++ b/js/foundation.orbit.js
@@ -2,9 +2,9 @@
  * Orbit module.
  * @module foundation.orbit
  * @requires foundation.util.keyboard
- * @requires foundation.util.animationFrame
  * @requires foundation.util.motion
- * @requires foundation.util.timer
+ * @requires foundation.util.timerAndImageLoader
+ * @requires foundation.util.touch
  */
 !function($, Foundation){
   'use strict';

diff --git a/js/foundation.reveal.js b/js/foundation.reveal.js
index 719f9d64a34a847ff66934a8039ba59631544923..0455d113dcb804a5522190158f615069382b9bae 100644 (file)
--- a/js/foundation.reveal.js
+++ b/js/foundation.reveal.js
@@ -2,9 +2,10 @@
  * Reveal module.
  * @module foundation.reveal
  * @requires foundation.util.keyboard
- * @requires foundation.util.size-and-collision
+ * @requires foundation.util.box
  * @requires foundation.util.triggers
  * @requires foundation.util.mediaQuery
+ * @requires foundation.util.motion if using animations
  */
 !function(Foundation, $) {
   'use strict';

diff --git a/js/foundation.slider.js b/js/foundation.slider.js
index ef9702734a9a46d740f8cb6df1d2ae45a791e0a4..0d1cc03631c9b64c887b3b2739c4f16a149efafb 100644 (file)
--- a/js/foundation.slider.js
+++ b/js/foundation.slider.js
@@ -1,10 +1,10 @@
 /**
  * Slider module.
  * @module foundation.slider
- * @requires foundation.util.animationFrame
+ * @requires foundation.util.motion
  * @requires foundation.util.triggers
  * @requires foundation.util.keyboard
- * @requires foundation.util.addtouch
+ * @requires foundation.util.touch
  */
 !function($, Foundation){
   'use strict';
@@ -57,7 +57,7 @@
     end: 100,
     /**
      * Minimum value change per change event. Not Currently Implemented!
-     * @option
+
      */
     step: 1,
     /**
@@ -483,29 +483,3 @@
 //   }
 //   cb();
 // };
-!function(){
-  $.fn.addTouch = function(){
-    this.each(function(i,el){
-      $(el).bind('touchstart touchmove touchend touchcancel',function(){
-        //we pass the original event object because the jQuery event
-        //object is normalized to w3c specs and does not provide the TouchList
-        handleTouch(event);
-      });
-    });
-
-    var handleTouch = function(event){
-      var touches = event.changedTouches,
-          first = touches[0],
-          eventTypes = {
-            touchstart: 'mousedown',
-            touchmove: 'mousemove',
-            touchend: 'mouseup'
-          },
-          type = eventTypes[event.type];
-
-      var simulatedEvent = document.createEvent('MouseEvent');
-      simulatedEvent.initMouseEvent(type, true, true, window, 1, first.screenX, first.screenY, first.clientX, first.clientY, false, false, false, false, 0/*left*/, null);
-      first.target.dispatchEvent(simulatedEvent);
-    };
-  };
-}();

diff --git a/js/foundation.tabs.js b/js/foundation.tabs.js
index 98b1e2a0613c3d60034e62ac44f8e066cb07e909..5f54dbace5aeac26e8e258142d6a9bec12bbdc2f 100644 (file)
--- a/js/foundation.tabs.js
+++ b/js/foundation.tabs.js
@@ -2,6 +2,7 @@
  * Tabs module.
  * @module foundation.tabs
  * @requires foundation.util.keyboard
+ * @requires foundation.util.timerAndImageLoader if tabs contain images
  */
 !function($, Foundation) {
   'use strict';

diff --git a/js/foundation.tooltip.js b/js/foundation.tooltip.js
index f912d31e1464f93d8a9e3dae5126617e69a8164d..90489f980343398d397c557edb0b047bde7fe007 100644 (file)
--- a/js/foundation.tooltip.js
+++ b/js/foundation.tooltip.js
@@ -1,7 +1,7 @@
 /**
  * Tooltip module.
  * @module foundation.tooltip
- * @requires foundation.util.size-and-collision
+ * @requires foundation.util.box
  * @requires foundation.util.triggers
  */
 !function($, document, Foundation){

diff --git a/js/foundation.util.swipe.js b/js/foundation.util.touch.js
similarity index 88%
rename from js/foundation.util.swipe.js
rename to js/foundation.util.touch.js
index 4eb0fe039b5acdbd6658d7165b0b20bc27184df5..928b9938132f08749f072bbd449bf2d7cf70f937 100644 (file)
--- a/js/foundation.util.swipe.js
+++ b/js/foundation.util.touch.js
@@ -74,6 +74,36 @@
     } };
   });
 })(jQuery);
+/****************************************************
+ * Method for adding psuedo drag events to elements *
+ ***************************************************/
+!function($){
+  $.fn.addTouch = function(){
+    this.each(function(i,el){
+      $(el).bind('touchstart touchmove touchend touchcancel',function(){
+        //we pass the original event object because the jQuery event
+        //object is normalized to w3c specs and does not provide the TouchList
+        handleTouch(event);
+      });
+    });
+
+    var handleTouch = function(event){
+      var touches = event.changedTouches,
+          first = touches[0],
+          eventTypes = {
+            touchstart: 'mousedown',
+            touchmove: 'mousemove',
+            touchend: 'mouseup'
+          },
+          type = eventTypes[event.type];
+
+      var simulatedEvent = document.createEvent('MouseEvent');
+      simulatedEvent.initMouseEvent(type, true, true, window, 1, first.screenX, first.screenY, first.clientX, first.clientY, false, false, false, false, 0/*left*/, null);
+      first.target.dispatchEvent(simulatedEvent);
+    };
+  };
+}(jQuery);
+
 
 //**********************************
 //**From the jQuery Mobile Library**

diff --git a/js/util-map.json b/js/util-map.json
index f98f2e1914b2ca45cab1ffdf59955b1a5bb4c18b..be4d13acb50f95c6105dc9524ebfa2d7dbcbbf89 100644 (file)
--- a/js/util-map.json
+++ b/js/util-map.json
@@ -39,7 +39,7 @@
     "foundation.util.motion.js",
     "foundation.util.timerAndImageLoader.js",
     "foundation.util.keyboard.js",
-    "foundation.util.timerAndImageLoader.js"
+    "foundation.util.touch.js"
   ],
   "responsiveMenu": [
     "foundation.util.triggers.js",
@@ -62,7 +62,7 @@
     "foundation.util.triggers.js",
     "foundation.util.motion.js",
     "foundation.util.keyboard.js",
-    "foundation.util.addTouch.js"
+    "foundation.util.touch.js"
   ],
   "sticky": [
     "foundation.util.triggers.js",