<!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>[26989] trunk/src/wp-includes/js/media-editor.js: Disambiguate `this` and use the `@this` annotation in `media-editor.js`.</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/26989">26989</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-01-21 16:29:30 +0000 (Tue, 21 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Disambiguate `this` and use the `@this` annotation in `media-editor.js`. This will become way more necessary in other places, but a few examples here show how confusing it can be.
See <a href="http://core.trac.wordpress.org/ticket/26870">#26870</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 (26988 => 26989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-editor.js 2014-01-21 15:56:49 UTC (rev 26988)
+++ trunk/src/wp-includes/js/media-editor.js 2014-01-21 16:29:30 UTC (rev 26989)
</span><span class="lines">@@ -503,6 +503,7 @@
</span><span class="cx"> * wp.media.featuredImage
</span><span class="cx"> */
</span><span class="cx"> wp.media.featuredImage = {
</span><ins>+ scott: 'yes',
</ins><span class="cx"> /**
</span><span class="cx"> * Get the featured image post ID
</span><span class="cx"> *
</span><span class="lines">@@ -543,6 +544,8 @@
</span><span class="cx"> * @global wp.media.controller.FeaturedImage
</span><span class="cx"> * @global wp.media.view.l10n
</span><span class="cx"> *
</span><ins>+ * @this wp.media.featuredImage
+ *
</ins><span class="cx"> * @returns {wp.media.view.MediaFrame.Select} A media workflow.
</span><span class="cx"> */
</span><span class="cx"> frame: function() {
</span><span class="lines">@@ -556,6 +559,9 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> this._frame.on( 'toolbar:create:featured-image', function( toolbar ) {
</span><ins>+ /**
+ * @this wp.media.view.MediaFrame.Select
+ */
</ins><span class="cx"> this.createSelectToolbar( toolbar, {
</span><span class="cx"> text: wp.media.view.l10n.setFeaturedImage
</span><span class="cx"> });
</span><span class="lines">@@ -566,6 +572,8 @@
</span><span class="cx"> },
</span><span class="cx"> /**
</span><span class="cx"> * @global wp.media.view.settings
</span><ins>+ *
+ * @this wp.media.controller.FeaturedImage
</ins><span class="cx"> */
</span><span class="cx"> select: function() {
</span><span class="cx"> var settings = wp.media.view.settings,
</span><span class="lines">@@ -657,6 +665,8 @@
</span><span class="cx"> * @param {string} id A slug used to identify the workflow.
</span><span class="cx"> * @param {Object} [options={}]
</span><span class="cx"> *
</span><ins>+ * @this wp.media.editor
+ *
</ins><span class="cx"> * @returns {wp.media.view.MediaFrame.Select} A media workflow.
</span><span class="cx"> */
</span><span class="cx"> add: function( id, options ) {
</span><span class="lines">@@ -684,6 +694,9 @@
</span><span class="cx">
</span><span class="cx"> $.when.apply( $, selection.map( function( attachment ) {
</span><span class="cx"> var display = state.display( attachment ).toJSON();
</span><ins>+ /**
+ * @this wp.media.editor
+ */
</ins><span class="cx"> return this.send.attachment( display, attachment.toJSON() );
</span><span class="cx"> }, this ) ).done( function() {
</span><span class="cx"> wp.media.editor.insert( _.toArray( arguments ).join('\n\n') );
</span><span class="lines">@@ -691,10 +704,16 @@
</span><span class="cx"> }, this );
</span><span class="cx">
</span><span class="cx"> workflow.state('gallery-edit').on( 'update', function( selection ) {
</span><ins>+ /**
+ * @this wp.media.editor
+ */
</ins><span class="cx"> this.insert( wp.media.gallery.shortcode( selection ).string() );
</span><span class="cx"> }, this );
</span><span class="cx">
</span><span class="cx"> workflow.state('embed').on( 'select', function() {
</span><ins>+ /**
+ * @this wp.media.editor
+ */
</ins><span class="cx"> var state = workflow.state(),
</span><span class="cx"> type = state.get('type'),
</span><span class="cx"> embed = state.props.toJSON();
</span><span class="lines">@@ -764,6 +783,9 @@
</span><span class="cx"> * Return the workflow specified by id
</span><span class="cx"> *
</span><span class="cx"> * @param {string} id
</span><ins>+ *
+ * @this wp.media.editor
+ *
</ins><span class="cx"> * @returns {wp.media.view.MediaFrame} A media workflow.
</span><span class="cx"> */
</span><span class="cx"> get: function( id ) {
</span><span class="lines">@@ -774,6 +796,8 @@
</span><span class="cx"> * Remove the workflow represented by id from the workflow cache
</span><span class="cx"> *
</span><span class="cx"> * @param {string} id
</span><ins>+ *
+ * @this wp.media.editor
</ins><span class="cx"> */
</span><span class="cx"> remove: function( id ) {
</span><span class="cx"> id = this.id( id );
</span><span class="lines">@@ -861,6 +885,9 @@
</span><span class="cx"> /**
</span><span class="cx"> * @param {string} id
</span><span class="cx"> * @param {Object} options
</span><ins>+ *
+ * @this wp.media.editor
+ *
</ins><span class="cx"> * @returns {wp.media.view.MediaFrame}
</span><span class="cx"> */
</span><span class="cx"> open: function( id, options ) {
</span><span class="lines">@@ -897,8 +924,8 @@
</span><span class="cx"> */
</span><span class="cx"> init: function() {
</span><span class="cx"> $(document.body).on( 'click', '.insert-media', function( event ) {
</span><del>- var $this = $(this),
- editor = $this.data('editor'),
</del><ins>+ var elem = $( event.currentTarget ),
+ editor = elem.data('editor'),
</ins><span class="cx"> options = {
</span><span class="cx"> frame: 'post',
</span><span class="cx"> state: 'insert',
</span><span class="lines">@@ -913,9 +940,9 @@
</span><span class="cx"> // above the modal.
</span><span class="cx"> //
</span><span class="cx"> // See: http://core.trac.wordpress.org/ticket/22445
</span><del>- $this.blur();
</del><ins>+ elem.blur();
</ins><span class="cx">
</span><del>- if ( $this.hasClass( 'gallery' ) ) {
</del><ins>+ if ( elem.hasClass( 'gallery' ) ) {
</ins><span class="cx"> options.state = 'gallery';
</span><span class="cx"> options.title = wp.media.view.l10n.createGalleryTitle;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>