From: zurbchris <chris@zurb.com>
Date: Tue, 17 Nov 2015 19:44:04 +0000 (-0800)
Subject: updates @require statements for js plugins, moves $.fn.addTouch and $.fn.spotSwipe... 
X-Git-Tag: v6.0.0^2~24^2~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=208c0743d25d8b4948de0ba5fedf744d685e7a65;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

updates @require statements for js plugins, moves $.fn.addTouch and $.fn.spotSwipe to new file foundation.util.touch.js
---

diff --git a/dist/foundation.js b/dist/foundation.js
index d1287ba34..ff795c903 100644
--- 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 c9063f542..fe25b713a 100644
--- 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 11ed8a85a..6cd684dfd 100644
--- 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 ea24bc5a8..5f6bbe893 100644
--- 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 3273188ee..06eb53eb9 100644
--- 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 3f9ba9d16..46c349528 100644
--- 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 f3655a461..cffcfa6e2 100644
--- 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 3ae5a084a..6693d34ba 100644
--- 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 24a0d9069..872df780d 100644
--- 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 d6ea61dd9..943210c3c 100644
--- 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 719f9d64a..0455d113d 100644
--- 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 ef9702734..0d1cc0363 100644
--- 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 98b1e2a06..5f54dbace 100644
--- 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 f912d31e1..90489f980 100644
--- 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 4eb0fe039..928b99381 100644
--- 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 f98f2e191..be4d13acb 100644
--- 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",