<!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>[32466] trunk/src/wp-includes/js: Media Grid: clean up our flawed `Backbone.Router` implementation so that the browser forward/back buttons work the same way as the left/right keys when the Edit Attachment frame is open.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/32466">32466</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/32466","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-05-09 05:41:01 +0000 (Sat, 09 May 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Media Grid: clean up our flawed `Backbone.Router` implementation so that the browser forward/back buttons work the same way as the left/right keys when the Edit Attachment frame is open.
Fixes <a href="https://core.trac.wordpress.org/ticket/31846">#31846</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjsmediaroutersmanagejs">trunk/src/wp-includes/js/media/routers/manage.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsframemanagejs">trunk/src/wp-includes/js/media/views/frame/manage.js</a></li>
<li><a href="#trunksrcwpincludesjsmediagridjs">trunk/src/wp-includes/js/media-grid.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjsmediaroutersmanagejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/routers/manage.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/routers/manage.js 2015-05-09 00:27:11 UTC (rev 32465)
+++ trunk/src/wp-includes/js/media/routers/manage.js 2015-05-09 05:41:01 UTC (rev 32466)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,11 +9,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @augments Backbone.Router
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> var Router = Backbone.Router.extend({
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ initialize: function ( options ) {
+ this.controller = options.controller;
+ this.library = options.library;
+ this.on( 'route', this.checkRoute );
+ },
+
</ins><span class="cx" style="display: block; padding: 0 10px"> routes: {
</span><span class="cx" style="display: block; padding: 0 10px"> 'upload.php?item=:slug': 'showItem',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'upload.php?search=:query': 'search'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'upload.php?search=:query': 'search',
+ 'upload.php': 'defaultRoute'
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ checkRoute: function ( event ) {
+ if ( 'defaultRoute' !== event ) {
+ this.modal = true;
+ }
+ },
+
+ defaultRoute: function () {
+ if ( this.modal ) {
+ wp.media.frame.close();
+ this.modal = false;
+ }
+ },
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Map routes against the page URL
</span><span class="cx" style="display: block; padding: 0 10px"> baseUrl: function( url ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return 'upload.php' + url;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,19 +46,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Show the modal with a specific item
</span><span class="cx" style="display: block; padding: 0 10px"> showItem: function( query ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var media = wp.media,
- library = media.frame.state().get('library'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var frame = this.controller,
</ins><span class="cx" style="display: block; padding: 0 10px"> item;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Trigger the media frame to open the correct item
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- item = library.findWhere( { id: parseInt( query, 10 ) } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ item = this.library.findWhere( { id: parseInt( query, 10 ) } );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( item ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- media.frame.trigger( 'edit:attachment', item );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ frame.trigger( 'edit:attachment', item );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- item = media.attachment( query );
- media.frame.listenTo( item, 'change', function( model ) {
- media.frame.stopListening( item );
- media.frame.trigger( 'edit:attachment', model );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ item = wp.media.attachment( query );
+ frame.listenTo( item, 'change', function( model ) {
+ frame.stopListening( item );
+ frame.trigger( 'edit:attachment', model );
</ins><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> item.fetch();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsframemanagejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/frame/manage.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/frame/manage.js 2015-05-09 00:27:11 UTC (rev 32465)
+++ trunk/src/wp-includes/js/media/views/frame/manage.js 2015-05-09 05:41:01 UTC (rev 32466)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,25 +62,36 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }).render();
</span><span class="cx" style="display: block; padding: 0 10px"> this.uploader.ready();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $('body').append( this.uploader.el );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.$body.append( this.uploader.el );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.options.uploader = false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.gridRouter = new wp.media.view.MediaFrame.Manage.Router();
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Call 'initialize' directly on the parent class.
</span><span class="cx" style="display: block; padding: 0 10px"> MediaFrame.prototype.initialize.apply( this, arguments );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Append the frame view directly the supplied container.
</span><span class="cx" style="display: block; padding: 0 10px"> this.$el.appendTo( this.options.container );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.setLibrary( this.options );
+ this.setRouter();
</ins><span class="cx" style="display: block; padding: 0 10px"> this.createStates();
</span><span class="cx" style="display: block; padding: 0 10px"> this.bindRegionModeHandlers();
</span><span class="cx" style="display: block; padding: 0 10px"> this.render();
</span><span class="cx" style="display: block; padding: 0 10px"> this.bindSearchHandler();
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ setLibrary: function ( options ) {
+ this.library = wp.media.query( options.library );
+ },
+
+ setRouter: function () {
+ this.gridRouter = new wp.media.view.MediaFrame.Manage.Router({
+ controller: this,
+ library: this.library
+ });
+ },
+
</ins><span class="cx" style="display: block; padding: 0 10px"> bindSearchHandler: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var search = this.$( '#media-search-input' ),
</span><span class="cx" style="display: block; padding: 0 10px"> currentSearch = this.options.container.data( 'search' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,7 +110,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Update the URL when entering search string (at most once per second)
</span><span class="cx" style="display: block; padding: 0 10px"> search.on( 'input', _.bind( input, this ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- searchView.val( currentSearch ).trigger( 'input' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( currentSearch ) {
+ searchView.val( currentSearch ).trigger( 'input' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.gridRouter.on( 'route:search', function () {
</span><span class="cx" style="display: block; padding: 0 10px"> var href = window.location.href;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,7 +139,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Add the default states.
</span><span class="cx" style="display: block; padding: 0 10px"> this.states.add([
</span><span class="cx" style="display: block; padding: 0 10px"> new Library({
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- library: wp.media.query( options.library ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ library: this.library,
</ins><span class="cx" style="display: block; padding: 0 10px"> multiple: options.multiple,
</span><span class="cx" style="display: block; padding: 0 10px"> title: options.title,
</span><span class="cx" style="display: block; padding: 0 10px"> content: 'browse',
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediagridjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media-grid.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media-grid.js 2015-05-09 00:27:11 UTC (rev 32465)
+++ trunk/src/wp-includes/js/media-grid.js 2015-05-09 05:41:01 UTC (rev 32466)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,11 +55,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @augments Backbone.Router
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> var Router = Backbone.Router.extend({
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ initialize: function ( options ) {
+ this.controller = options.controller;
+ this.library = options.library;
+ this.on( 'route', this.checkRoute );
+ },
+
</ins><span class="cx" style="display: block; padding: 0 10px"> routes: {
</span><span class="cx" style="display: block; padding: 0 10px"> 'upload.php?item=:slug': 'showItem',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'upload.php?search=:query': 'search'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'upload.php?search=:query': 'search',
+ 'upload.php': 'defaultRoute'
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ checkRoute: function ( event ) {
+ if ( 'defaultRoute' !== event ) {
+ this.modal = true;
+ }
+ },
+
+ defaultRoute: function () {
+ if ( this.modal ) {
+ wp.media.frame.close();
+ this.modal = false;
+ }
+ },
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Map routes against the page URL
</span><span class="cx" style="display: block; padding: 0 10px"> baseUrl: function( url ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return 'upload.php' + url;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,19 +92,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Show the modal with a specific item
</span><span class="cx" style="display: block; padding: 0 10px"> showItem: function( query ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var media = wp.media,
- library = media.frame.state().get('library'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var frame = this.controller,
</ins><span class="cx" style="display: block; padding: 0 10px"> item;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Trigger the media frame to open the correct item
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- item = library.findWhere( { id: parseInt( query, 10 ) } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ item = this.library.findWhere( { id: parseInt( query, 10 ) } );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( item ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- media.frame.trigger( 'edit:attachment', item );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ frame.trigger( 'edit:attachment', item );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- item = media.attachment( query );
- media.frame.listenTo( item, 'change', function( model ) {
- media.frame.stopListening( item );
- media.frame.trigger( 'edit:attachment', model );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ item = wp.media.attachment( query );
+ frame.listenTo( item, 'change', function( model ) {
+ frame.stopListening( item );
+ frame.trigger( 'edit:attachment', model );
</ins><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> item.fetch();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -655,25 +674,36 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }).render();
</span><span class="cx" style="display: block; padding: 0 10px"> this.uploader.ready();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $('body').append( this.uploader.el );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.$body.append( this.uploader.el );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.options.uploader = false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.gridRouter = new wp.media.view.MediaFrame.Manage.Router();
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Call 'initialize' directly on the parent class.
</span><span class="cx" style="display: block; padding: 0 10px"> MediaFrame.prototype.initialize.apply( this, arguments );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Append the frame view directly the supplied container.
</span><span class="cx" style="display: block; padding: 0 10px"> this.$el.appendTo( this.options.container );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.setLibrary( this.options );
+ this.setRouter();
</ins><span class="cx" style="display: block; padding: 0 10px"> this.createStates();
</span><span class="cx" style="display: block; padding: 0 10px"> this.bindRegionModeHandlers();
</span><span class="cx" style="display: block; padding: 0 10px"> this.render();
</span><span class="cx" style="display: block; padding: 0 10px"> this.bindSearchHandler();
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ setLibrary: function ( options ) {
+ this.library = wp.media.query( options.library );
+ },
+
+ setRouter: function () {
+ this.gridRouter = new wp.media.view.MediaFrame.Manage.Router({
+ controller: this,
+ library: this.library
+ });
+ },
+
</ins><span class="cx" style="display: block; padding: 0 10px"> bindSearchHandler: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var search = this.$( '#media-search-input' ),
</span><span class="cx" style="display: block; padding: 0 10px"> currentSearch = this.options.container.data( 'search' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -692,7 +722,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Update the URL when entering search string (at most once per second)
</span><span class="cx" style="display: block; padding: 0 10px"> search.on( 'input', _.bind( input, this ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- searchView.val( currentSearch ).trigger( 'input' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( currentSearch ) {
+ searchView.val( currentSearch ).trigger( 'input' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.gridRouter.on( 'route:search', function () {
</span><span class="cx" style="display: block; padding: 0 10px"> var href = window.location.href;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -719,7 +751,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Add the default states.
</span><span class="cx" style="display: block; padding: 0 10px"> this.states.add([
</span><span class="cx" style="display: block; padding: 0 10px"> new Library({
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- library: wp.media.query( options.library ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ library: this.library,
</ins><span class="cx" style="display: block; padding: 0 10px"> multiple: options.multiple,
</span><span class="cx" style="display: block; padding: 0 10px"> title: options.title,
</span><span class="cx" style="display: block; padding: 0 10px"> content: 'browse',
</span></span></pre>
</div>
</div>
</body>
</html>