Skip to content

Commit 34dcfd4

Browse files
committed
Removing the MatchMedia
1 parent 5682fa3 commit 34dcfd4

File tree

4 files changed

+31
-150
lines changed

4 files changed

+31
-150
lines changed

app/code/Magento/Theme/view/base/requirejs-config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ var config = {
3434
'domReady': 'requirejs/domReady',
3535
'spectrum': 'jquery/spectrum/spectrum',
3636
'tinycolor': 'jquery/spectrum/tinycolor',
37-
'jquery-ui-modules': 'jquery/ui-modules'
37+
'jquery-ui-modules': 'jquery/ui-modules',
38+
'matchMedia': 'mediaCheck'
3839
},
3940
deps: [
4041
'jquery/jquery-migrate'

app/design/adminhtml/Magento/backend/etc/view.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<item type="file">Lib::jquery/jquery.min.js</item>
5151
<item type="file">Lib::jquery/jquery.parsequery.js</item>
5252
<item type="file">Lib::jquery/jquery-ui.js</item>
53-
<item type="file">Lib::matchMedia.js</item>
53+
<item type="file">Lib::mediaCheck.js</item>
5454
<item type="file">Lib::requirejs/require.js</item>
5555
<item type="file">Lib::requirejs/text.js</item>
5656
<item type="file">Lib::varien/js.js</item>

lib/web/matchMedia.js

Lines changed: 0 additions & 148 deletions
This file was deleted.

lib/web/mediaCheck.js

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
window.mediaCheck = function(options) {
2+
if (typeof window.matchMedia === 'undefined' || !window.matchMedia('!').addListener) {
3+
throw new Error('No matchMedia support');
4+
}
5+
6+
function mqChange(mq, options) {
7+
if (mq.matches) {
8+
if (typeof options.entry === 'function') { options.entry(mq); }
9+
} else {
10+
if (typeof options.exit === 'function') { options.exit(mq); }
11+
}
12+
if (typeof options.both === 'function') { options.both(mq); }
13+
}
14+
15+
function createListener() {
16+
var mq = window.matchMedia(options.media);
17+
mq.addListener(function () { mqChange(mq, options); });
18+
19+
window.addEventListener('orientationchange', function () {
20+
mq = window.matchMedia(options.media);
21+
mqChange(mq, options);
22+
}, false);
23+
24+
mqChange(mq, options);
25+
}
26+
27+
createListener();
28+
};

0 commit comments

Comments
 (0)