Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/v4'
Browse files Browse the repository at this point in the history
  • Loading branch information
JimBobSquarePants committed Aug 28, 2016
2 parents 92f2f46 + b011a78 commit ff1e8c2
Show file tree
Hide file tree
Showing 18 changed files with 123 additions and 121 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ Browser support covers IE9+ as well as all other modern browsers.

Several options are available for downloading Responsive:

- [Download the latest release](https://github.com/ResponsiveBP/Responsive/releases/download/4.1.0/responsive.zip).
- [Download the latest release source](https://github.com/ResponsiveBP/Responsive/archive/4.1.0.zip).
- [Download the latest release](https://github.com/ResponsiveBP/Responsive/releases/download/4.1.3/responsive.zip).
- [Download the latest release source](https://github.com/ResponsiveBP/Responsive/archive/4.1.3.zip).
- Clone the repo: `git clone https://github.com/ResponsiveBP/Responsive.git`.
- Install with [Bower](http://bower.io): `bower install responsive`.

Expand Down Expand Up @@ -82,4 +82,4 @@ Discuss Responsive on [Gitter](https://gitter.im/ResponsiveBP/Responsive).

###Copyright and license

Copyright 2013-2016 James South under the [MIT license](http://opensource.org/licenses/MIT).
Copyright 2013-2016 James Jackson-South under the [MIT license](http://opensource.org/licenses/MIT).
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "responsive",
"description": "A powerful, accessible, developer friendly framework for building responsive websites.",
"version": "4.1.2",
"version": "4.1.3",
"homepage": "http://responsivebp.com",
"authors": [
"James South"
"James Jackson-South"
],
"keywords": [
"html",
Expand Down
6 changes: 3 additions & 3 deletions build/responsive.css
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/** ==|== Responsive =============================================================
Author: James South
Author: James Jackson-South
twitter : http://twitter.com/James_M_South
github : https://github.com/ResponsiveBP/Responsive
Copyright (c), James South.
Copyright (c), James Jackson-South.
Licensed under the MIT License.
============================================================================== */
/*! Responsive v4.1.2 | MIT License | responsivebp.com */
/*! Responsive v4.1.3 | MIT License | responsivebp.com */
/*! normalize.css v3.0.3 | MIT License | git.io/normalize */
html {
font-family: sans-serif;
Expand Down
107 changes: 54 additions & 53 deletions build/responsive.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/* ==|== Responsive =============================================================
Author: James South
Author: James Jackson-South
twitter : http://twitter.com/James_M_South
github : https://github.com/ResponsiveBP/Responsive
Copyright (c), James South.
Copyright (c), James Jackson-South.
Licensed under the MIT License.
============================================================================== */

/*! Responsive v4.1.2 | MIT License | responsivebp.com */
/*! Responsive v4.1.3 | MIT License | responsivebp.com */

/*
* Responsive Core
Expand Down Expand Up @@ -546,13 +546,13 @@
};

(function (old) {
/// <summary>Override the core html method in the jQuery object to fire a domchanged event whenever it is called.</summary>
/// <summary>Override the core html method in the jQuery object to fire a RBPchanged event whenever it is called.</summary>
/// <param name="old" type="Function">
/// The jQuery function being overridden.
/// </param>
/// <returns type="jQuery">The jQuery object for chaining.</returns>

var echanged = $.Event("domchanged"),
var echanged = $.Event("RBPchanged"),
$d = $(d);

$.fn.html = function () {
Expand Down Expand Up @@ -583,8 +583,8 @@
}

// General variables and methods.
var eready = "ready" + ns + da,
echanged = ["domchanged" + ns + da, "shown.r.modal" + da].join(" "),
var einit = "RBPinit" + ns + da,
echanged = ["RBPchanged" + ns + da, "shown.r.modal" + da].join(" "),
eresize = ["resize" + ns, "orientationchange" + ns].join(" "),
einput = "input",
ekeyup = "keyup",
Expand Down Expand Up @@ -732,9 +732,9 @@
},
debouncedInit = $.debounce(init, 500);

$(document).on([eready, echanged].join(" "), function (event) {
event.type === "ready" ? init() : debouncedInit();
});
$(document).on([einit, echanged].join(" "), function (event) {
event.type === "RBPinit" ? init() : debouncedInit();
}).ready(function(){$(this).trigger(einit);});

w.RESPONSIVE_AUTOSIZE = true;

Expand All @@ -760,8 +760,8 @@
emouseleave = "mouseleave",
ekeydown = "keydown",
eclick = "click",
eready = "ready" + ns + da,
echanged = ["domchanged" + ns + da, "shown.r.modal" + da].join(" "),
einit = "RBPinit" + ns + da,
echanged = ["RBPchanged" + ns + da, "shown.r.modal" + da].join(" "),
eslide = "slide" + ns,
eslid = "slid" + ns;

Expand Down Expand Up @@ -865,7 +865,7 @@

if (this.options.touch) {
// You always have to pass the third parameter if setting data.
this.$element.on("swipe.carousel", { touchAction: "pan-y" }, true)
this.$element.on("swipe.carousel", { touchAction: "pan-y" }, function(){return true;})
.on("swipemove.carousel", $.proxy(this.swipemove, this))
.on("swipeend.carousel", $.proxy(this.swipeend, this));
}
Expand Down Expand Up @@ -1334,9 +1334,9 @@
},
debouncedInit = $.debounce(init, 500);

$(document).on([eready, echanged].join(" "), function (event) {
event.type === "ready" ? init() : debouncedInit();
});
$(document).on([einit, echanged].join(" "), function (event) {
event.type === "RBPinit" ? init() : debouncedInit();
}).ready(function(){$(this).trigger(einit);});

w.RESPONSIVE_CAROUSEL = true;

Expand All @@ -1356,8 +1356,8 @@
}

// General variables and methods.
var eready = "ready" + ns + da,
echanged = ["domchanged" + ns + da, "shown.r.modal" + da].join(" "),
var einit = "RBPinit" + ns + da,
echanged = ["RBPchanged" + ns + da, "shown.r.modal" + da].join(" "),
eresize = ["resize" + ns, "orientationchange" + ns].join(" "),
eload = "load" + ns,
eloaded = "loaded" + ns,
Expand Down Expand Up @@ -1505,9 +1505,9 @@
},
debouncedInit = $.debounce(init, 500);

$(document).on([eready, echanged].join(" "), function (event) {
event.type === "ready" ? init() : debouncedInit();
});
$(document).on([einit, echanged].join(" "), function (event) {
event.type === "RBPinit" ? init() : debouncedInit();
}).ready(function(){$(this).trigger(einit);});

w.RESPONSIVE_CONDITIONAL = true;

Expand All @@ -1527,8 +1527,8 @@
}

// General variables.
var eready = "ready" + ns + da,
echanged = ["domchanged" + ns + da, "shown.r.modal" + da].join(" "),
var einit = "RBPinit" + ns + da,
echanged = ["RBPchanged" + ns + da, "shown.r.modal" + da].join(" "),
eclick = "click",
edismiss = "dismiss" + ns,
edismissed = "dismissed" + ns;
Expand Down Expand Up @@ -1641,9 +1641,9 @@
},
debouncedInit = $.debounce(init, 500);

$(document).on([eready, echanged].join(" "), function (event) {
event.type === "ready" ? init() : debouncedInit();
});
$(document).on([einit, echanged].join(" "), function (event) {
event.type === "RBPinit" ? init() : debouncedInit();
}).ready(function(){$(this).trigger(einit);});

w.RESPONSIVE_DISMISS = true;

Expand All @@ -1664,8 +1664,8 @@
// General variables.
var supportTransition = w.getComputedStyle && $.support.transition,
rtl = $.support.rtl,
eready = "ready" + ns + da,
echanged = ["domchanged" + ns + da, "shown.r.modal" + da].join(" "),
einit = "RBPinit" + ns + da,
echanged = ["RBPchanged" + ns + da, "shown.r.modal" + da].join(" "),
eclick = "click",
ekeydown = "keydown",
eshow = "show" + ns,
Expand Down Expand Up @@ -1922,7 +1922,8 @@
index = length - 1;
}

$($items.eq(index)).data("r.dropdown").show();
var data = $($items.eq(index)).data("r.dropdown");
data && data.show();
}
};

Expand Down Expand Up @@ -1969,9 +1970,9 @@
},
debouncedInit = $.debounce(init, 500);

$(document).on([eready, echanged].join(" "), function (event) {
event.type === "ready" ? init() : debouncedInit();
});
$(document).on([einit, echanged].join(" "), function (event) {
event.type === "RBPinit" ? init() : debouncedInit();
}).ready(function(){$(this).trigger(einit);});

w.RESPONSIVE_DROPDOWN = true;

Expand All @@ -1998,8 +1999,8 @@
$next = $("<button/>").attr({ "type": "button" }).addClass("modal-direction next fade-out"),
$placeholder = $("<div/>").addClass("modal-placeholder"),
// Events
eready = "ready" + ns + da,
echanged = "domchanged" + ns + da,
einit = "RBPinit" + ns + da,
echanged = "RBPchanged" + ns + da,
eresize = ["resize" + ns, "orientationchange" + ns].join(" "),
eclick = "click" + ns,
ekeydown = "keydown" + ns,
Expand Down Expand Up @@ -2198,7 +2199,7 @@

if (this.options.group) {
if (this.options.touch) {
$modal.off("swipe.modal").on("swipe.modal", true)
$modal.off("swipe.modal").on("swipe.modal", function(){return true;})
.off("swipeend.modal").on("swipeend.modal", this.swipeend.bind(this));
}
}
Expand Down Expand Up @@ -2715,9 +2716,9 @@
},
debouncedInit = $.debounce(init, 500);

$(document).on([eready, echanged, eshown].join(" "), function (event) {
event.type === "ready" ? init() : debouncedInit();
});
$(document).on([einit, echanged, eshown].join(" "), function (event) {
event.type === "RBPinit" ? init() : debouncedInit();
}).ready(function(){$(this).trigger(einit);});

w.RESPONSIVE_MODAL = true;

Expand All @@ -2739,8 +2740,8 @@

// General variables and methods.
var $window = $(w),
eready = "ready" + ns + da,
echanged = ["domchanged" + ns + da, "shown.r.modal" + da].join(" "),
einit = "RBPinit" + ns + da,
echanged = ["RBPchanged" + ns + da, "shown.r.modal" + da].join(" "),
emodalShow = "show.r.modal" + da,
eclick = "click" + ns,
efocusin = "focusin" + ns,
Expand Down Expand Up @@ -2952,9 +2953,9 @@
},
debouncedInit = $.debounce(init, 500);

$(document).on([eready, echanged].join(" "), function (event) {
event.type === "ready" ? init() : debouncedInit();
});
$(document).on([einit, echanged].join(" "), function (event) {
event.type === "RBPinit" ? init() : debouncedInit();
}).ready(function(){$(this).trigger(einit);});

w.RESPONSIVE_NAVIGATION = true;

Expand All @@ -2974,8 +2975,8 @@
}

// General variables and methods.
var eready = "ready" + ns + da,
echanged = ["domchanged" + ns + da, "shown.r.modal" + da].join(" "),
var einit = "RBPinit" + ns + da,
echanged = ["RBPchanged" + ns + da, "shown.r.modal" + da].join(" "),
eadd = "add" + ns,
eadded = "added" + ns;

Expand Down Expand Up @@ -3102,9 +3103,9 @@
},
debouncedInit = $.debounce(init, 500);

$(document).on([eready, echanged].join(" "), function (event) {
event.type === "ready" ? init() : debouncedInit();
});
$(document).on([einit, echanged].join(" "), function (event) {
event.type === "RBPinit" ? init() : debouncedInit();
}).ready(function(){$(this).trigger(einit);});

w.RESPONSIVE_TABLE = true;

Expand All @@ -3125,8 +3126,8 @@

// General variables.
var rtl = $.support.rtl,
eready = "ready" + ns + da,
echanged = ["domchanged" + ns + da, "shown.r.modal" + da].join(" "),
einit = "RBPinit" + ns + da,
echanged = ["RBPchanged" + ns + da, "shown.r.modal" + da].join(" "),
eclick = "click",
ekeydown = "keydown",
eshow = "show" + ns,
Expand Down Expand Up @@ -3333,9 +3334,9 @@
},
debouncedInit = $.debounce(init, 500);

$(document).on([eready, echanged].join(" "), function (event) {
event.type === "ready" ? init() : debouncedInit();
});
$(document).on([einit, echanged].join(" "), function (event) {
event.type === "RBPinit" ? init() : debouncedInit();
}).ready(function(){$(this).trigger(einit);});

w.RESPONSIVE_TABS = true;

Expand Down
2 changes: 1 addition & 1 deletion build/responsive.min.css

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions build/responsive.min.js

Large diffs are not rendered by default.

Binary file modified dist/responsive.zip
Binary file not shown.
10 changes: 5 additions & 5 deletions src/js/responsive.autosize.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
}

// General variables and methods.
var eready = "ready" + ns + da,
echanged = ["domchanged" + ns + da, "shown.r.modal" + da].join(" "),
var einit = "RBPinit" + ns + da,
echanged = ["RBPchanged" + ns + da, "shown.r.modal" + da].join(" "),
eresize = ["resize" + ns, "orientationchange" + ns].join(" "),
einput = "input",
ekeyup = "keyup",
Expand Down Expand Up @@ -162,9 +162,9 @@
},
debouncedInit = $.debounce(init, 500);

$(document).on([eready, echanged].join(" "), function (event) {
event.type === "ready" ? init() : debouncedInit();
});
$(document).on([einit, echanged].join(" "), function (event) {
event.type === "RBPinit" ? init() : debouncedInit();
}).ready(function(){$(this).trigger(einit);});

w.RESPONSIVE_AUTOSIZE = true;

Expand Down
12 changes: 6 additions & 6 deletions src/js/responsive.carousel.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
emouseleave = "mouseleave",
ekeydown = "keydown",
eclick = "click",
eready = "ready" + ns + da,
echanged = ["domchanged" + ns + da, "shown.r.modal" + da].join(" "),
einit = "RBPinit" + ns + da,
echanged = ["RBPchanged" + ns + da, "shown.r.modal" + da].join(" "),
eslide = "slide" + ns,
eslid = "slid" + ns;

Expand Down Expand Up @@ -124,7 +124,7 @@

if (this.options.touch) {
// You always have to pass the third parameter if setting data.
this.$element.on("swipe.carousel", { touchAction: "pan-y" }, true)
this.$element.on("swipe.carousel", { touchAction: "pan-y" }, function(){return true;})
.on("swipemove.carousel", $.proxy(this.swipemove, this))
.on("swipeend.carousel", $.proxy(this.swipeend, this));
}
Expand Down Expand Up @@ -593,9 +593,9 @@
},
debouncedInit = $.debounce(init, 500);

$(document).on([eready, echanged].join(" "), function (event) {
event.type === "ready" ? init() : debouncedInit();
});
$(document).on([einit, echanged].join(" "), function (event) {
event.type === "RBPinit" ? init() : debouncedInit();
}).ready(function(){$(this).trigger(einit);});

w.RESPONSIVE_CAROUSEL = true;

Expand Down
Loading

0 comments on commit ff1e8c2

Please sign in to comment.