<!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>[27080] trunk/src: Consolidate "close on Escape" in the media modal, DFW, wpLink and Thickbox.</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/27080">27080</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2014-02-03 05:30:12 +0000 (Mon, 03 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Consolidate "close on Escape" in the media modal, DFW, wpLink and Thickbox. Props kovshenin, fixes <a href="http://core.trac.wordpress.org/ticket/26854">#26854</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjscommonjs">trunk/src/wp-admin/js/common.js</a></li>
<li><a href="#trunksrcwpadminjswpfullscreenjs">trunk/src/wp-admin/js/wp-fullscreen.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsjs">trunk/src/wp-includes/js/media-views.js</a></li>
<li><a href="#trunksrcwpincludesjsthickboxthickboxjs">trunk/src/wp-includes/js/thickbox/thickbox.js</a></li>
<li><a href="#trunksrcwpincludesjswplinkjs">trunk/src/wp-includes/js/wplink.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjscommonjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/common.js (27079 => 27080)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/common.js 2014-02-02 23:49:05 UTC (rev 27079)
+++ trunk/src/wp-admin/js/common.js 2014-02-03 05:30:12 UTC (rev 27080)
</span><span class="lines">@@ -701,15 +701,4 @@
</span><span class="cx"> }
</span><span class="cx"> })();
</span><span class="cx">
</span><del>-// internal use
-$(document).bind( 'wp_CloseOnEscape', function( e, data ) {
- if ( typeof(data.cb) != 'function' )
- return;
-
- if ( typeof(data.condition) != 'function' || data.condition() )
- data.cb();
-
- return true;
-});
-
</del><span class="cx"> }( jQuery, window ));
</span></span></pre></div>
<a id="trunksrcwpadminjswpfullscreenjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/wp-fullscreen.js (27079 => 27080)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/wp-fullscreen.js 2014-02-02 23:49:05 UTC (rev 27079)
+++ trunk/src/wp-admin/js/wp-fullscreen.js 2014-02-03 05:30:12 UTC (rev 27080)
</span><span class="lines">@@ -477,23 +477,6 @@
</span><span class="cx"> a = e.altKey; // Alt key for Win & Linux
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( 27 == c ) { // Esc
- data = {
- event: e,
- what: 'dfw',
- cb: api.off,
- condition: function(){
- if ( $('#TB_window').is(':visible') || $('.wp-dialog').is(':visible') )
- return false;
- return true;
- }
- };
-
- if ( ! $(document).triggerHandler( 'wp_CloseOnEscape', [data] ) ) {
- api.off();
- }
- }
-
</del><span class="cx"> if ( a && (61 == c || 107 == c || 187 == c) ) { // +
</span><span class="cx"> api.dfwWidth( 25 );
</span><span class="cx"> e.preventDefault();
</span><span class="lines">@@ -510,6 +493,13 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ $document.on( 'keydown.wp-fullscreen', function( event ) {
+ if ( 27 === event.which && s.visible ) { // Esc
+ api.off();
+ event.stopImmediatePropagation();
+ }
+ });
+
</ins><span class="cx"> toolbar.on( 'mouseenter', function() {
</span><span class="cx"> toggleUI('show');
</span><span class="cx"> }).on( 'mouseleave', function() {
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-views.js (27079 => 27080)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-views.js 2014-02-02 23:49:05 UTC (rev 27079)
+++ trunk/src/wp-includes/js/media-views.js 2014-02-03 05:30:12 UTC (rev 27080)
</span><span class="lines">@@ -2347,10 +2347,9 @@
</span><span class="cx"> */
</span><span class="cx"> keydown: function( event ) {
</span><span class="cx"> // Close the modal when escape is pressed.
</span><del>- if ( 27 === event.which ) {
- event.preventDefault();
</del><ins>+ if ( 27 === event.which && this.$el.is(':visible') ) {
</ins><span class="cx"> this.escape();
</span><del>- return;
</del><ins>+ event.stopImmediatePropagation();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunksrcwpincludesjsthickboxthickboxjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/thickbox/thickbox.js (27079 => 27080)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/thickbox/thickbox.js 2014-02-02 23:49:05 UTC (rev 27079)
+++ trunk/src/wp-includes/js/thickbox/thickbox.js 2014-02-03 05:30:12 UTC (rev 27080)
</span><span class="lines">@@ -156,11 +156,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> jQuery(document).bind('keydown.thickbox', function(e){
</span><del>- e.stopImmediatePropagation();
-
</del><span class="cx"> if ( e.which == 27 ){ // close
</span><del>- if ( ! jQuery(document).triggerHandler( 'wp_CloseOnEscape', [{ event: e, what: 'thickbox', cb: tb_remove }] ) )
- tb_remove();
</del><ins>+ tb_remove();
</ins><span class="cx">
</span><span class="cx"> } else if ( e.which == 190 ){ // display previous image
</span><span class="cx"> if(!(TB_NextHTML == "")){
</span><span class="lines">@@ -244,13 +241,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if(!params['modal']){
</span><del>- jQuery(document).bind('keyup.thickbox', function(e){
-
</del><ins>+ jQuery(document).bind('keydown.thickbox', function(e){
</ins><span class="cx"> if ( e.which == 27 ){ // close
</span><del>- e.stopImmediatePropagation();
- if ( ! jQuery(document).triggerHandler( 'wp_CloseOnEscape', [{ event: e, what: 'thickbox', cb: tb_remove }] ) )
- tb_remove();
-
</del><ins>+ tb_remove();
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunksrcwpincludesjswplinkjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/wplink.js (27079 => 27080)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/wplink.js 2014-02-02 23:49:05 UTC (rev 27079)
+++ trunk/src/wp-includes/js/wplink.js 2014-02-03 05:30:12 UTC (rev 27080)
</span><span class="lines">@@ -304,6 +304,11 @@
</span><span class="cx"> keydown: function( event ) {
</span><span class="cx"> var fn, key = $.ui.keyCode;
</span><span class="cx">
</span><ins>+ if ( key.ESCAPE === event.which ) {
+ wpLink.close();
+ event.stopImmediatePropagation();
+ }
+
</ins><span class="cx"> if ( event.which !== key.UP && event.which !== key.DOWN ) {
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -318,13 +323,6 @@
</span><span class="cx"> keyup: function( event ) {
</span><span class="cx"> var key = $.ui.keyCode;
</span><span class="cx">
</span><del>- if ( event.which === key.ESCAPE ) {
- event.stopImmediatePropagation();
- if ( ! $(document).triggerHandler( 'wp_CloseOnEscape', [{ event: event, what: 'wplink', cb: wpLink.close }] ) )
- wpLink.close();
- return false;
- }
-
</del><span class="cx"> if ( event.which === key.UP || event.which === key.DOWN ) {
</span><span class="cx"> clearInterval( wpLink.keyInterval );
</span><span class="cx"> event.preventDefault();
</span></span></pre>
</div>
</div>
</body>
</html>