Skip to content

Commit f296f08

Browse files
authored
Merge pull request #1 from praabjerg/edgeFix
Fix mediaQueries selector match for MS Edge
2 parents 7d58a6a + 08fc84b commit f296f08

3 files changed

Lines changed: 13 additions & 3 deletions

File tree

angular-deckgrid.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,12 @@ angular.module('akoenig.deckgrid').factory('Deckgrid', [
248248
}
249249

250250
function hasDeckgridStyles (rule) {
251-
var regexe = /\[(\w*-)?deckgrid\]::?before/g,
251+
//
252+
// In MS Edge, the selector .deckgrid[deckgrid]::before comes out
253+
// as [deckgrid].deckgrid::before, so to accommodate this, we allow
254+
// matches on alphanumeric characters between [deckgrid] and ::before
255+
//
256+
var regexe = /\[(\w*-)?deckgrid\]\w*::?before/g,
252257
i = 0,
253258
selector = '';
254259

angular-deckgrid.min.js

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

src/deckgrid.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,12 @@ angular.module('akoenig.deckgrid').factory('Deckgrid', [
100100
}
101101

102102
function hasDeckgridStyles (rule) {
103-
var regexe = /\[(\w*-)?deckgrid\]::?before/g,
103+
//
104+
// In MS Edge, the selector .deckgrid[deckgrid]::before comes out
105+
// as [deckgrid].deckgrid::before, so to accommodate this, we allow
106+
// matches on alphanumeric characters between [deckgrid] and ::before
107+
//
108+
var regexe = /\[(\w*-)?deckgrid\]\w*::?before/g,
104109
i = 0,
105110
selector = '';
106111

0 commit comments

Comments
 (0)