Skip to content

Commit eb8170d

Browse files
committed
Fixed FocusPlugin on Firefox (Gecko)
1 parent 7664aaa commit eb8170d

File tree

6 files changed

+32
-8
lines changed

6 files changed

+32
-8
lines changed

bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "springroll-container",
3-
"version": "0.5.0",
3+
"version": "0.5.1",
44
"main": "dist/container.min.js",
55
"dependencies":
66
{

dist/container.js

+14-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! SpringRoll Container 0.5.0 */
1+
/*! SpringRoll Container 0.5.1 */
22
/**
33
* @module Core
44
* @namespace window
@@ -2254,9 +2254,21 @@
22542254
{
22552255
if (!this.loaded) return;
22562256

2257-
if (!$(e.target).filter(this.options.pauseFocusSelector).length)
2257+
var target;
2258+
2259+
// Firefox support
2260+
if (e.originalEvent.explicitOriginalTarget)
2261+
{
2262+
target = $(e.originalEvent.explicitOriginalTarget);
2263+
}
2264+
else
2265+
{
2266+
target = $(e.target);
2267+
}
2268+
if (!target.filter(this.options.pauseFocusSelector).length)
22582269
{
22592270
this.focus();
2271+
return false;
22602272
}
22612273
};
22622274

dist/container.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

library.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "SpringRoll Container",
3-
"version": "0.5.0",
3+
"version": "0.5.1",
44
"description": "The iframe controller for interacting with SpringRoll applications",
55
"url": "https://github.com/SpringRoll/SpringRollContainer",
66
"output": "container",

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "springroll-container",
3-
"version": "0.5.0",
3+
"version": "0.5.1",
44
"description": "The iframe controller for interacting with SpringRoll applications",
55
"main": "./dist/container.min.js",
66
"author":

src/container/plugins/FocusPlugin.js

+13-1
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,21 @@
156156
{
157157
if (!this.loaded) return;
158158

159-
if (!$(e.target).filter(this.options.pauseFocusSelector).length)
159+
var target;
160+
161+
// Firefox support
162+
if (e.originalEvent.explicitOriginalTarget)
163+
{
164+
target = $(e.originalEvent.explicitOriginalTarget);
165+
}
166+
else
167+
{
168+
target = $(e.target);
169+
}
170+
if (!target.filter(this.options.pauseFocusSelector).length)
160171
{
161172
this.focus();
173+
return false;
162174
}
163175
};
164176

0 commit comments

Comments
 (0)