Skip to content

Commit ff1e8c2

Browse files
JimBobSquarePantsJimBobSquarePants
committed
Merge remote-tracking branch 'refs/remotes/origin/v4'
2 parents 92f2f46 + b011a78 commit ff1e8c2

18 files changed

+123
-121
lines changed

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ Browser support covers IE9+ as well as all other modern browsers.
2323

2424
Several options are available for downloading Responsive:
2525

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

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

8383
###Copyright and license
8484

85-
Copyright 2013-2016 James South under the [MIT license](http://opensource.org/licenses/MIT).
85+
Copyright 2013-2016 James Jackson-South under the [MIT license](http://opensource.org/licenses/MIT).

‎bower.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"name": "responsive",
33
"description": "A powerful, accessible, developer friendly framework for building responsive websites.",
4-
"version": "4.1.2",
4+
"version": "4.1.3",
55
"homepage": "http://responsivebp.com",
66
"authors": [
7-
"James South"
7+
"James Jackson-South"
88
],
99
"keywords": [
1010
"html",

‎build/responsive.css‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/** ==|== Responsive =============================================================
2-
Author: James South
2+
Author: James Jackson-South
33
twitter : http://twitter.com/James_M_South
44
github : https://github.com/ResponsiveBP/Responsive
5-
Copyright (c), James South.
5+
Copyright (c), James Jackson-South.
66
Licensed under the MIT License.
77
============================================================================== */
8-
/*! Responsive v4.1.2 | MIT License | responsivebp.com */
8+
/*! Responsive v4.1.3 | MIT License | responsivebp.com */
99
/*! normalize.css v3.0.3 | MIT License | git.io/normalize */
1010
html {
1111
font-family: sans-serif;

‎build/responsive.js‎

Lines changed: 54 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/* ==|== Responsive =============================================================
2-
Author: James South
2+
Author: James Jackson-South
33
twitter : http://twitter.com/James_M_South
44
github : https://github.com/ResponsiveBP/Responsive
5-
Copyright (c), James South.
5+
Copyright (c), James Jackson-South.
66
Licensed under the MIT License.
77
============================================================================== */
88

9-
/*! Responsive v4.1.2 | MIT License | responsivebp.com */
9+
/*! Responsive v4.1.3 | MIT License | responsivebp.com */
1010

1111
/*
1212
* Responsive Core
@@ -546,13 +546,13 @@
546546
};
547547

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

555-
var echanged = $.Event("domchanged"),
555+
var echanged = $.Event("RBPchanged"),
556556
$d = $(d);
557557

558558
$.fn.html = function () {
@@ -583,8 +583,8 @@
583583
}
584584

585585
// General variables and methods.
586-
var eready = "ready" + ns + da,
587-
echanged = ["domchanged" + ns + da, "shown.r.modal" + da].join(" "),
586+
var einit = "RBPinit" + ns + da,
587+
echanged = ["RBPchanged" + ns + da, "shown.r.modal" + da].join(" "),
588588
eresize = ["resize" + ns, "orientationchange" + ns].join(" "),
589589
einput = "input",
590590
ekeyup = "keyup",
@@ -732,9 +732,9 @@
732732
},
733733
debouncedInit = $.debounce(init, 500);
734734

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

739739
w.RESPONSIVE_AUTOSIZE = true;
740740

@@ -760,8 +760,8 @@
760760
emouseleave = "mouseleave",
761761
ekeydown = "keydown",
762762
eclick = "click",
763-
eready = "ready" + ns + da,
764-
echanged = ["domchanged" + ns + da, "shown.r.modal" + da].join(" "),
763+
einit = "RBPinit" + ns + da,
764+
echanged = ["RBPchanged" + ns + da, "shown.r.modal" + da].join(" "),
765765
eslide = "slide" + ns,
766766
eslid = "slid" + ns;
767767

@@ -865,7 +865,7 @@
865865

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

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

13411341
w.RESPONSIVE_CAROUSEL = true;
13421342

@@ -1356,8 +1356,8 @@
13561356
}
13571357

13581358
// General variables and methods.
1359-
var eready = "ready" + ns + da,
1360-
echanged = ["domchanged" + ns + da, "shown.r.modal" + da].join(" "),
1359+
var einit = "RBPinit" + ns + da,
1360+
echanged = ["RBPchanged" + ns + da, "shown.r.modal" + da].join(" "),
13611361
eresize = ["resize" + ns, "orientationchange" + ns].join(" "),
13621362
eload = "load" + ns,
13631363
eloaded = "loaded" + ns,
@@ -1505,9 +1505,9 @@
15051505
},
15061506
debouncedInit = $.debounce(init, 500);
15071507

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

15121512
w.RESPONSIVE_CONDITIONAL = true;
15131513

@@ -1527,8 +1527,8 @@
15271527
}
15281528

15291529
// General variables.
1530-
var eready = "ready" + ns + da,
1531-
echanged = ["domchanged" + ns + da, "shown.r.modal" + da].join(" "),
1530+
var einit = "RBPinit" + ns + da,
1531+
echanged = ["RBPchanged" + ns + da, "shown.r.modal" + da].join(" "),
15321532
eclick = "click",
15331533
edismiss = "dismiss" + ns,
15341534
edismissed = "dismissed" + ns;
@@ -1641,9 +1641,9 @@
16411641
},
16421642
debouncedInit = $.debounce(init, 500);
16431643

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

16481648
w.RESPONSIVE_DISMISS = true;
16491649

@@ -1664,8 +1664,8 @@
16641664
// General variables.
16651665
var supportTransition = w.getComputedStyle && $.support.transition,
16661666
rtl = $.support.rtl,
1667-
eready = "ready" + ns + da,
1668-
echanged = ["domchanged" + ns + da, "shown.r.modal" + da].join(" "),
1667+
einit = "RBPinit" + ns + da,
1668+
echanged = ["RBPchanged" + ns + da, "shown.r.modal" + da].join(" "),
16691669
eclick = "click",
16701670
ekeydown = "keydown",
16711671
eshow = "show" + ns,
@@ -1922,7 +1922,8 @@
19221922
index = length - 1;
19231923
}
19241924

1925-
$($items.eq(index)).data("r.dropdown").show();
1925+
var data = $($items.eq(index)).data("r.dropdown");
1926+
data && data.show();
19261927
}
19271928
};
19281929

@@ -1969,9 +1970,9 @@
19691970
},
19701971
debouncedInit = $.debounce(init, 500);
19711972

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

19761977
w.RESPONSIVE_DROPDOWN = true;
19771978

@@ -1998,8 +1999,8 @@
19981999
$next = $("<button/>").attr({ "type": "button" }).addClass("modal-direction next fade-out"),
19992000
$placeholder = $("<div/>").addClass("modal-placeholder"),
20002001
// Events
2001-
eready = "ready" + ns + da,
2002-
echanged = "domchanged" + ns + da,
2002+
einit = "RBPinit" + ns + da,
2003+
echanged = "RBPchanged" + ns + da,
20032004
eresize = ["resize" + ns, "orientationchange" + ns].join(" "),
20042005
eclick = "click" + ns,
20052006
ekeydown = "keydown" + ns,
@@ -2198,7 +2199,7 @@
21982199

21992200
if (this.options.group) {
22002201
if (this.options.touch) {
2201-
$modal.off("swipe.modal").on("swipe.modal", true)
2202+
$modal.off("swipe.modal").on("swipe.modal", function(){return true;})
22022203
.off("swipeend.modal").on("swipeend.modal", this.swipeend.bind(this));
22032204
}
22042205
}
@@ -2715,9 +2716,9 @@
27152716
},
27162717
debouncedInit = $.debounce(init, 500);
27172718

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

27222723
w.RESPONSIVE_MODAL = true;
27232724

@@ -2739,8 +2740,8 @@
27392740

27402741
// General variables and methods.
27412742
var $window = $(w),
2742-
eready = "ready" + ns + da,
2743-
echanged = ["domchanged" + ns + da, "shown.r.modal" + da].join(" "),
2743+
einit = "RBPinit" + ns + da,
2744+
echanged = ["RBPchanged" + ns + da, "shown.r.modal" + da].join(" "),
27442745
emodalShow = "show.r.modal" + da,
27452746
eclick = "click" + ns,
27462747
efocusin = "focusin" + ns,
@@ -2952,9 +2953,9 @@
29522953
},
29532954
debouncedInit = $.debounce(init, 500);
29542955

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

29592960
w.RESPONSIVE_NAVIGATION = true;
29602961

@@ -2974,8 +2975,8 @@
29742975
}
29752976

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

@@ -3102,9 +3103,9 @@
31023103
},
31033104
debouncedInit = $.debounce(init, 500);
31043105

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

31093110
w.RESPONSIVE_TABLE = true;
31103111

@@ -3125,8 +3126,8 @@
31253126

31263127
// General variables.
31273128
var rtl = $.support.rtl,
3128-
eready = "ready" + ns + da,
3129-
echanged = ["domchanged" + ns + da, "shown.r.modal" + da].join(" "),
3129+
einit = "RBPinit" + ns + da,
3130+
echanged = ["RBPchanged" + ns + da, "shown.r.modal" + da].join(" "),
31303131
eclick = "click",
31313132
ekeydown = "keydown",
31323133
eshow = "show" + ns,
@@ -3333,9 +3334,9 @@
33333334
},
33343335
debouncedInit = $.debounce(init, 500);
33353336

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

33403341
w.RESPONSIVE_TABS = true;
33413342

‎build/responsive.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/responsive.min.js‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/responsive.zip‎

134 Bytes
Binary file not shown.

‎src/js/responsive.autosize.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
}
1414

1515
// General variables and methods.
16-
var eready = "ready" + ns + da,
17-
echanged = ["domchanged" + ns + da, "shown.r.modal" + da].join(" "),
16+
var einit = "RBPinit" + ns + da,
17+
echanged = ["RBPchanged" + ns + da, "shown.r.modal" + da].join(" "),
1818
eresize = ["resize" + ns, "orientationchange" + ns].join(" "),
1919
einput = "input",
2020
ekeyup = "keyup",
@@ -162,9 +162,9 @@
162162
},
163163
debouncedInit = $.debounce(init, 500);
164164

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

169169
w.RESPONSIVE_AUTOSIZE = true;
170170

‎src/js/responsive.carousel.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
emouseleave = "mouseleave",
2020
ekeydown = "keydown",
2121
eclick = "click",
22-
eready = "ready" + ns + da,
23-
echanged = ["domchanged" + ns + da, "shown.r.modal" + da].join(" "),
22+
einit = "RBPinit" + ns + da,
23+
echanged = ["RBPchanged" + ns + da, "shown.r.modal" + da].join(" "),
2424
eslide = "slide" + ns,
2525
eslid = "slid" + ns;
2626

@@ -124,7 +124,7 @@
124124

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

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

600600
w.RESPONSIVE_CAROUSEL = true;
601601

0 commit comments

Comments
 (0)