Merge remote-tracking branch 'origin/v2'

ResponsiveBP · May 31, 2014 · 93b077c · 93b077c
2 parents 2a45ccf + bdd4c11
commit 93b077c
Show file tree

Hide file tree

Showing 13 changed files with 89 additions and 93 deletions.
diff --git a/build/responsive.css b/build/responsive.css
@@ -6,7 +6,7 @@
     Licensed under the MIT License.
     ============================================================================== */
 
-/*! Responsive v2.5.5 | MIT License | responsivebp.com */
+/*! Responsive v2.5.6 | MIT License | responsivebp.com */
 /*! normalize.css v3.0.0 | MIT License | git.io/normalize */
 
 /**
@@ -3041,7 +3041,6 @@ select.inline-block {
     margin: 1em 0;
     padding: 1em 0;
 }
-
 /*
  * Normalize button borders, color, and padding.
  * 1: Remove rounded corners on iPhone.
@@ -3059,13 +3058,10 @@ input[type="reset"],
     padding: .5em 1em;
     margin-bottom: 0;
     line-height: normal;
-    text-decoration: none !important;
-    font-size: 1em;
     border: solid 1px #c0c0c0;
     background-color: #dadada;
-    color: #222;
+    color: inherit;
     cursor: pointer;
-    position: relative;
     -ms-touch-action: none; /* 2 */
     touch-action: none; /* 2 */
 }
@@ -3075,10 +3071,7 @@ input[type="reset"],
  */
 input[type="submit"],
 input[type="reset"],
-input[type="button"],
-.form-no-grid input[type="submit"],
-.form-no-grid input[type="reset"],
-.form-no-grid input[type="button"] {
+input[type="button"] {
     width: auto;
     max-width: none;
 }
@@ -3091,7 +3084,6 @@ input[type="button"],
     input[type="button"]:hover,
     input[type="reset"]:hover,
     [role="button"]:hover {
-        color: #222;
         background-color: #cdcdcd;
     }
 
@@ -3100,7 +3092,6 @@ input[type="button"],
     input[type="button"]:focus,
     input[type="reset"]:focus,
     [role="button"]:focus {
-        color: #222;
         outline: 1px solid #00a9ec;
         outline-offset: -1px;
     }
@@ -3110,14 +3101,21 @@ input[type="button"],
     input[type="button"]:active,
     input[type="reset"]:active,
     [role="button"]:active {
-        color: #222;
         background-color: #e7e7e7;
         outline: none;
     }
 
-    /*
-     * 1. Fix IOS 6/7 opacity issue
-     */
+[role="button"],
+[role="button"]:hover,
+[role="button"]:focus,
+[role="button"]:active {
+    color: inherit;
+    text-decoration: none;
+}
+
+/*
+ * 1. Fix IOS 6/7 opacity issue
+ */
     button[disabled],
     input[type="submit"][disabled],
     input[type="button"][disabled],
@@ -3126,7 +3124,7 @@ input[type="button"],
         color: #5d5d5d;
         background-color: #e7e7e7;
         cursor: not-allowed;
-        opacity: 1;
+        opacity: 1 /* 1 */;
     }
 
     /*
@@ -3170,6 +3168,7 @@ input[type="button"],
     .btn-group > * {
         float: left;
     }
+
 /*
  * Colors and padding.
  */

diff --git a/build/responsive.ie10mobilefix.js b/build/responsive.ie10mobilefix.js
@@ -1,4 +1,4 @@
-/*! Responsive v2.5.5 | MIT License | responsivebp.com */
+/*! Responsive v2.5.6 | MIT License | responsivebp.com */
 
 (function () {
 

diff --git a/build/responsive.ie10mobilefix.min.js b/build/responsive.ie10mobilefix.min.js
diff --git a/build/responsive.js b/build/responsive.js
@@ -6,10 +6,10 @@
     Licensed under the MIT License.
     ============================================================================== */
 
-/*! Responsive v2.5.5 | MIT License | responsivebp.com */
+/*! Responsive v2.5.6 | MIT License | responsivebp.com */
 
 /*
- * Responsive Utils
+ * Responsive Core
  */
 
 /*global jQuery*/
@@ -98,7 +98,7 @@
     }());
 
     $.support.pointerEvents = (function () {
-        return (navigator.maxTouchPoints) || (navigator.msMaxTouchPoints);
+        return (w.PointerEvent || w.MSPointerEvent);
     }());
 
     (function () {
@@ -124,15 +124,16 @@
                 eend;
 
             // Keep the events separate since support could be crazy.
-            if (supportPointer) {
+            if (supportTouch) {
+                estart = touchStart + ns;
+                emove = touchMove + ns;
+                eend = (touchEnd.join(ns + " ")) + ns;
+            }
+            else if (supportPointer) {
                 estart = (pointerStart.join(ns + " ")) + ns;
                 emove = (pointerMove.join(ns + " ")) + ns;
                 eend = (pointerEnd.join(ns + " ")) + ns;
 
-            } else if (supportTouch) {
-                estart = touchStart + ns;
-                emove = touchMove + ns;
-                eend = (touchEnd.join(ns + " ")) + ns;
             } else {
                 estart = mouseStart + ns;
                 emove = mouseMove + ns;
@@ -180,7 +181,8 @@
                     onMove = function (event) {
 
                         // Normalize the variables.
-                        var isMouse = !supportPointer && !supportTouch,
+                        var isMouse = event.type === "mousemove",
+                            isPointer = event.type !== "touchmove" && !isMouse,
                             original = event.originalEvent,
                             moveEvent;
 
@@ -199,12 +201,12 @@
                             return;
                         }
 
-                        var dx = (isMouse ? original.pageX : supportPointer ? original.clientX : original.touches[0].pageX) - start.x,
-                            dy = (isMouse ? original.pageY : supportPointer ? original.clientY : original.touches[0].pageY) - start.y;
+                        var dx = (isMouse ? original.pageX : isPointer ? original.clientX : original.touches[0].pageX) - start.x,
+                            dy = (isMouse ? original.pageY : isPointer ? original.clientY : original.touches[0].pageY) - start.y;
 
                         // Mimic touch action on iProducts.
                         // Should also prevent bounce.
-                        if (!supportPointer) {
+                        if (!isPointer) {
                             switch (settings.touchAction) {
                                 case "pan-x":
                                 case "pan-y":
@@ -755,7 +757,6 @@
             lazyOnDemand: true
         };
         this.options = $.extend({}, this.defaults, options);
-        this.$indicators = this.$element.children("ol:first");
         this.paused = null;
         this.interval = null;
         this.sliding = null;
@@ -922,18 +923,6 @@
             this.pause();
         }
 
-        // Highlight the correct indicator.
-        if (this.$indicators.length) {
-            this.$indicators.find(".active").removeClass("active");
-
-            this.$element.one(eslid, function () {
-                var $nextIndicator = $(self.$indicators.children()[getActiveIndex.call(self)]);
-                if ($nextIndicator) {
-                    $nextIndicator.addClass("active");
-                }
-            });
-        }
-
         var complete = function () {
 
             if (self.$items) {
@@ -1024,11 +1013,21 @@
             options = data || $.buildDataOptions($this, {}, "carousel", "r"),
             $target = $(options.target || (options.target = $this.attr("href"))),
             slideIndex = options.slideTo,
+            numeric = typeof slideIndex === "number",
             carousel = $target.data("r.carousel");
 
         if (carousel) {
-            typeof slideIndex === "number" ? carousel.to(slideIndex) : carousel[options.slide]();
+
+            numeric ? carousel.to(slideIndex) : carousel[options.slide]();
+
+            $target.one(eslid, function () {
+                if (numeric) {
+                    // Show the correct highlight
+                    $this.addClass("active").siblings().removeClass("active");
+                }
+            });
         }
+
     }).on(eready, function () {
 
         $(".carousel").each(function () {

diff --git a/build/responsive.min.css b/build/responsive.min.css
diff --git a/build/responsive.min.js b/build/responsive.min.js
diff --git a/dist/responsive.zip b/dist/responsive.zip
diff --git a/src/css/buttons.css b/src/css/buttons.css
@@ -15,13 +15,10 @@ input[type="reset"],
     padding: .5em 1em;
     margin-bottom: 0;
     line-height: normal;
-    text-decoration: none !important;
-    font-size: 1em;
     border: solid 1px #c0c0c0;
     background-color: #dadada;
-    color: #222;
+    color: inherit;
     cursor: pointer;
-    position: relative;
     -ms-touch-action: none; /* 2 */
     touch-action: none; /* 2 */
 }
@@ -31,10 +28,7 @@ input[type="reset"],
  */
 input[type="submit"],
 input[type="reset"],
-input[type="button"],
-.form-no-grid input[type="submit"],
-.form-no-grid input[type="reset"],
-.form-no-grid input[type="button"] {
+input[type="button"] {
     width: auto;
     max-width: none;
 }
@@ -47,7 +41,6 @@ input[type="button"],
     input[type="button"]:hover,
     input[type="reset"]:hover,
     [role="button"]:hover {
-        color: #222;
         background-color: #cdcdcd;
     }
 
@@ -56,7 +49,6 @@ input[type="button"],
     input[type="button"]:focus,
     input[type="reset"]:focus,
     [role="button"]:focus {
-        color: #222;
         outline: 1px solid #00a9ec;
         outline-offset: -1px;
     }
@@ -66,14 +58,21 @@ input[type="button"],
     input[type="button"]:active,
     input[type="reset"]:active,
     [role="button"]:active {
-        color: #222;
         background-color: #e7e7e7;
         outline: none;
     }
 
-    /*
-     * 1. Fix IOS 6/7 opacity issue
-     */
+[role="button"],
+[role="button"]:hover,
+[role="button"]:focus,
+[role="button"]:active {
+    color: inherit;
+    text-decoration: none;
+}
+
+/*
+ * 1. Fix IOS 6/7 opacity issue
+ */
     button[disabled],
     input[type="submit"][disabled],
     input[type="button"][disabled],
@@ -82,7 +81,7 @@ input[type="button"],
         color: #5d5d5d;
         background-color: #e7e7e7;
         cursor: not-allowed;
-        opacity: 1;
+        opacity: 1 /* 1 */;
     }
 
     /*
@@ -125,4 +124,4 @@ input[type="button"],
 
     .btn-group > * {
         float: left;
-    }
+    }
diff --git a/src/css/copyright.css b/src/css/copyright.css
@@ -6,4 +6,4 @@
     Licensed under the MIT License.
     ============================================================================== */
 
-/*! Responsive v2.5.5 | MIT License | responsivebp.com */
+/*! Responsive v2.5.6 | MIT License | responsivebp.com */
diff --git a/src/css/forms.css b/src/css/forms.css
@@ -293,4 +293,4 @@ select.inline-block {
 .form-actions {
     margin: 1em 0;
     padding: 1em 0;
-}
+}
diff --git a/src/js/responsive.carousel.js b/src/js/responsive.carousel.js
@@ -161,7 +161,6 @@
             lazyOnDemand: true
         };
         this.options = $.extend({}, this.defaults, options);
-        this.$indicators = this.$element.children("ol:first");
         this.paused = null;
         this.interval = null;
         this.sliding = null;
@@ -328,18 +327,6 @@
             this.pause();
         }
 
-        // Highlight the correct indicator.
-        if (this.$indicators.length) {
-            this.$indicators.find(".active").removeClass("active");
-
-            this.$element.one(eslid, function () {
-                var $nextIndicator = $(self.$indicators.children()[getActiveIndex.call(self)]);
-                if ($nextIndicator) {
-                    $nextIndicator.addClass("active");
-                }
-            });
-        }
-
         var complete = function () {
 
             if (self.$items) {
@@ -430,11 +417,21 @@
             options = data || $.buildDataOptions($this, {}, "carousel", "r"),
             $target = $(options.target || (options.target = $this.attr("href"))),
             slideIndex = options.slideTo,
+            numeric = typeof slideIndex === "number",
             carousel = $target.data("r.carousel");
 
         if (carousel) {
-            typeof slideIndex === "number" ? carousel.to(slideIndex) : carousel[options.slide]();
+
+            numeric ? carousel.to(slideIndex) : carousel[options.slide]();
+
+            $target.one(eslid, function () {
+                if (numeric) {
+                    // Show the correct highlight
+                    $this.addClass("active").siblings().removeClass("active");
+                }
+            });
         }
+
     }).on(eready, function () {
 
         $(".carousel").each(function () {