<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[27542] trunk/src/wp-includes/js/media-editor.js: In `wp.media.mixin`, add `ua` and a `compat` map to separate and clarify browser detection and support.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/27542">27542</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-03-14 20:25:31 +0000 (Fri, 14 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>In `wp.media.mixin`, add `ua` and a `compat` map to separate and clarify browser detection and support. Leverage Underscore list iterators in `isCompatible()`.
See <a href="http://core.trac.wordpress.org/ticket/27389">#27389</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjsmediaeditorjs">trunk/src/wp-includes/js/media-editor.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjsmediaeditorjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-editor.js (27541 => 27542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-editor.js 2014-03-14 20:00:09 UTC (rev 27541)
+++ trunk/src/wp-includes/js/media-editor.js 2014-03-14 20:25:31 UTC (rev 27542)
</span><span class="lines">@@ -307,69 +307,88 @@
</span><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ ua: {
+ is : function (browser) {
+ var passes = false, ua = window.navigator.userAgent;
+
+ switch ( browser ) {
+ case 'oldie':
+ passes = ua.match(/MSIE [6-8]/gi) !== null;
+ break;
+ case 'ie':
+ passes = ua.match(/MSIE/gi) !== null;
+ break;
+ case 'ff':
+ passes = ua.match(/firefox/gi) !== null;
+ break;
+ case 'opera':
+ passes = ua.match(/OPR/) !== null;
+ break;
+ case 'safari':
+ passes = ua.match(/safari/gi) !== null && ua.match(/chrome/gi) === null;
+ break;
+ case 'chrome':
+ passes = ua.match(/safari/gi) && ua.match(/chrome/gi) !== null;
+ break;
+ }
+
+ return passes;
+ }
+ },
+
+ compat :{
+ 'opera' : {
+ audio: ['ogg', 'wav'],
+ video: ['ogg', 'webm']
+ },
+ 'chrome' : {
+ audio: ['ogg', 'mpeg', 'x-ms-wma'],
+ video: ['ogg', 'webm', 'mp4', 'm4v', 'mpeg']
+ },
+ 'ff' : {
+ audio: ['ogg', 'mpeg'],
+ video: ['ogg', 'webm']
+ },
+ 'safari' : {
+ audio: ['mpeg', 'wav'],
+ video: ['mp4', 'm4v', 'mpeg', 'x-ms-wmv', 'quicktime']
+ },
+ 'ie' : {
+ audio: ['mpeg'],
+ video: ['mp4', 'm4v', 'mpeg']
+ }
+ },
+
</ins><span class="cx"> isCompatible: function ( media ) {
</span><span class="cx"> if ( ! media.find( 'source' ).length ) {
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- var ua = window.navigator.userAgent.toLowerCase(),
- ff, chrome, opera, safari,
- isIE = ua.match(/MSIE/gi) !== null,
- isOpera = window.navigator.userAgent.match(/OPR/) !== null,
- isOldIE = ua.match(/MSIE [6-8]/gi) !== null,
- isChrome = ua.match(/safari/gi) && ua.match(/chrome/gi) !== null,
- isFirefox = ua.match(/firefox/gi) !== null,
- isSafari = ua.match(/safari/gi) !== null && ua.match(/chrome/gi) === null;
</del><ins>+ var ua = this.ua, test = false, found = false, sources;
</ins><span class="cx">
</span><del>- if ( isOldIE || isIE ) {
</del><ins>+ if ( ua.is( 'oldIE' ) ) {
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( isOpera ) {
- opera = false;
- media.find( 'source' ).each(function (i, elem) {
- if ( elem.type.match(/video\/(ogv|webm)/gi) !== null ||
- ( elem.type.match(/audio\/(ogg|wav)/gi) !== null ) ) {
- opera = true;
- }
- });
</del><ins>+ sources = media.find( 'source' );
</ins><span class="cx">
</span><del>- return opera;
- } else if ( isChrome ) {
- chrome = false;
- media.find( 'source' ).each(function (i, elem) {
- if ( elem.type.match(/video\/(mp4|m4v|mpeg|webm|ogg)/gi) !== null ||
- elem.type.match(/audio\/(ogg|mpeg|x-ms-wma)/gi) !== null ) {
- chrome = true;
- }
- });
</del><ins>+ _.find( this.compat, function (supports, browser) {
+ if ( ua.is( browser ) ) {
+ found = true;
+ _.each( sources, function (elem) {
+ var audio = new RegExp( 'audio\/(' + supports.audio.join('|') + ')', 'gi' ),
+ video = new RegExp( 'video\/(' + supports.video.join('|') + ')', 'gi' );
</ins><span class="cx">
</span><del>- return chrome;
</del><ins>+ if ( elem.type.match( video ) !== null || elem.type.match( audio ) !== null ) {
+ test = true;
+ }
+ } );
+ }
</ins><span class="cx">
</span><del>- } else if ( isFirefox ) {
- ff = false;
- media.find( 'source' ).each(function (i, elem) {
- if ( elem.type.match(/video\/(ogg|webm)/gi) !== null ||
- ( elem.type.match(/audio\/(ogg|mpeg)/gi) !== null && -1 === elem.src.indexOf('.m4a') ) ) {
- ff = true;
- }
- });
</del><ins>+ return test || found;
+ } );
</ins><span class="cx">
</span><del>- return ff;
-
- } else if ( isSafari ) {
- safari = false;
- media.find( 'source' ).each(function (i, elem) {
- if ( elem.type.match(/video\/(mp4|m4v|mpeg|x-ms-wmv|quicktime)/gi) !== null ||
- ( elem.type.match(/audio\/(mpeg|wav)/gi) !== null ) ) {
- safari = true;
- }
- });
-
- return safari;
- }
-
- return false;
</del><ins>+ return test;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>