summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan Van Etten <ryanve@gmail.com>2014-02-02 13:32:58 -0500
committerRyan Van Etten <ryanve@gmail.com>2014-02-02 13:32:58 -0500
commitc10da267eb3e6cc57c72e8032f8061f6671981fc (patch)
treea02d777547e6305c1f54f3cf43bc104fdfedff9f
parentc720edf02b5f69bd375506e356f8033b00a7327c (diff)
downloadverge-c10da267eb3e6cc57c72e8032f8061f6671981fc.zip
verge-c10da267eb3e6cc57c72e8032f8061f6671981fc.tar.gz
verge-c10da267eb3e6cc57c72e8032f8061f6671981fc.tar.bz2
For consistency, always use our .mq rather than Modernizr.mq
Someone usinge verge and Modernizr together could easily choose.
-rw-r--r--src/verge.js12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/verge.js b/src/verge.js
index 86fc493..0cf0684 100644
--- a/src/verge.js
+++ b/src/verge.js
@@ -3,11 +3,10 @@
else root[name] = make();
}(this, 'verge', function() {
- var xports = {}
+ var xports = {}
, win = typeof window != 'undefined' && window
, doc = typeof document != 'undefined' && document
, docElem = doc && doc.documentElement
- , Modernizr = win['Modernizr']
, matchMedia = win['matchMedia'] || win['msMatchMedia']
, mq = matchMedia ? function(q) {
return !!matchMedia.call(win, q).matches;
@@ -28,21 +27,22 @@
};
/**
- * Test if a media query is active. (Fallback uses Modernizr if avail.)
+ * Test if a media query is active. Like Modernizr.mq
* @since 1.6.0
* @return {boolean}
*/
- xports['mq'] = !matchMedia && Modernizr && Modernizr['mq'] || mq;
+ xports['mq'] = mq;
/**
- * Normalized, gracefully-degrading matchMedia.
+ * Normalized matchMedia
* @since 1.6.0
- * @return {Object}
+ * @return {MediaQueryList|Object}
*/
xports['matchMedia'] = matchMedia ? function() {
// matchMedia must be binded to window
return matchMedia.apply(win, arguments);
} : function() {
+ // Gracefully degrade to plain object
return {};
};