<!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>[23851] trunk/wp-admin/js/post-formats.js: Defer JS to document ready</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, #logmsg > ol { margin-left: 0; 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/23851">23851</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2013-03-29 06:42:54 +0000 (Fri, 29 Mar 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Defer JS to document ready</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminjspostformatsjs">trunk/wp-admin/js/post-formats.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminjspostformatsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/post-formats.js (23850 => 23851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/post-formats.js 2013-03-29 06:33:55 UTC (rev 23850)
+++ trunk/wp-admin/js/post-formats.js 2013-03-29 06:42:54 UTC (rev 23851)
</span><span class="lines">@@ -2,129 +2,130 @@
</span><span class="cx">
</span><span class="cx"> (function($) {
</span><span class="cx"> var mediaFrame, lastMimeType, lastMenu, mediaPreview;
</span><ins>+ $(function(){
+ // Post formats selection
+ $('.post-format-options a').on( 'click', function(e){
+ var $this = $(this), editor, body,
+ parent = $this.parent(),
+ format = $this.data('wp-format'),
+ container = $('#post-body-content'),
+ description = $('.post-format-description');
</ins><span class="cx">
</span><del>- // Post formats selection
- $('.post-format-options a').on( 'click', function(e){
- var $this = $(this), editor, body,
- parent = $this.parent(),
- format = $this.data('wp-format'),
- container = $('#post-body-content'),
- description = $('.post-format-description');
</del><ins>+ parent.find('a.active').removeClass('active');
+ $this.addClass('active');
+ $('#icon-edit').removeClass(postFormats.currentPostFormat).addClass(format);
+ $('#post_format').val(format);
</ins><span class="cx">
</span><del>- parent.find('a.active').removeClass('active');
- $this.addClass('active');
- $('#icon-edit').removeClass(postFormats.currentPostFormat).addClass(format);
- $('#post_format').val(format);
</del><ins>+ container.get(0).className = container.get(0).className.replace( /\bwp-format-[^ ]+/, '' );
+ container.addClass('wp-format-' + format);
+ $('#title').focus();
</ins><span class="cx">
</span><del>- container.get(0).className = container.get(0).className.replace( /\bwp-format-[^ ]+/, '' );
- container.addClass('wp-format-' + format);
- $('#title').focus();
</del><ins>+ // Update description line
+ description.html($this.data('description'));
</ins><span class="cx">
</span><del>- // Update description line
- description.html($this.data('description'));
</del><ins>+ if (description.not(':visible'))
+ description.slideDown('fast');
</ins><span class="cx">
</span><del>- if (description.not(':visible'))
- description.slideDown('fast');
</del><ins>+ if ( typeof tinymce != 'undefined' ) {
+ editor = tinymce.get('content');
</ins><span class="cx">
</span><del>- if ( typeof tinymce != 'undefined' ) {
- editor = tinymce.get('content');
-
- if ( editor ) {
- body = editor.getBody();
- body.className = body.className.replace( /\bpost-format-[^ ]+/, '' );
- editor.dom.addClass( body, 'post-format-' + format );
</del><ins>+ if ( editor ) {
+ body = editor.getBody();
+ body.className = body.className.replace( /\bpost-format-[^ ]+/, '' );
+ editor.dom.addClass( body, 'post-format-' + format );
+ }
</ins><span class="cx"> }
</span><del>- }
</del><span class="cx">
</span><del>- postFormats.currentPostFormat = format;
</del><ins>+ postFormats.currentPostFormat = format;
</ins><span class="cx">
</span><del>- e.preventDefault();
- }).on('mouseenter focusin', function () {
- $('.post-format-tip').html( $(this).prop('title') );
- }).on('mouseleave focusout', function () {
- $('.post-format-tip').html( $('.post-format-options a.active').prop('title') );
- });
</del><ins>+ e.preventDefault();
+ }).on('mouseenter focusin', function () {
+ $('.post-format-tip').html( $(this).prop('title') );
+ }).on('mouseleave focusout', function () {
+ $('.post-format-tip').html( $('.post-format-options a.active').prop('title') );
+ });
</ins><span class="cx">
</span><del>- // Media selection
- $('.wp-format-media-select').click(function (event) {
- event.preventDefault();
- var $el = $(this), $holder, $field, mime = 'image', menu = '',
- $holder = $el.closest('.wp-format-media-holder'),
- $field = $( '#wp_format_' + $holder.data('format') );
</del><ins>+ // Media selection
+ $('.wp-format-media-select').click(function (event) {
+ event.preventDefault();
+ var $el = $(this), $holder, $field, mime = 'image', menu = '',
+ $holder = $el.closest('.wp-format-media-holder'),
+ $field = $( '#wp_format_' + $holder.data('format') );
</ins><span class="cx">
</span><del>- switch ( $holder.data('format') ) {
- case 'audio':
- mime = 'audio';
- break;
- case 'video':
- mime = 'video';
- break;
- }
</del><ins>+ switch ( $holder.data('format') ) {
+ case 'audio':
+ mime = 'audio';
+ break;
+ case 'video':
+ mime = 'video';
+ break;
+ }
</ins><span class="cx">
</span><del>- // If the media frame already exists, reopen it.
- if ( mediaFrame && lastMimeType === mime && lastMenu === menu ) {
- mediaFrame.open();
- return;
- }
</del><ins>+ // If the media frame already exists, reopen it.
+ if ( mediaFrame && lastMimeType === mime && lastMenu === menu ) {
+ mediaFrame.open();
+ return;
+ }
</ins><span class="cx">
</span><del>- lastMimeType = mime;
- lastMenu = menu;
</del><ins>+ lastMimeType = mime;
+ lastMenu = menu;
</ins><span class="cx">
</span><del>- // Create the media frame.
- mediaFrame = wp.media.frames.formatMedia = wp.media({
- // Set the title of the modal.
- title: $el.data('choose'),
</del><ins>+ // Create the media frame.
+ mediaFrame = wp.media.frames.formatMedia = wp.media({
+ // Set the title of the modal.
+ title: $el.data('choose'),
</ins><span class="cx">
</span><del>- // Set the menu sidebar of the modal, if applicable
- toolbar: menu,
</del><ins>+ // Set the menu sidebar of the modal, if applicable
+ toolbar: menu,
</ins><span class="cx">
</span><del>- // Tell the modal to show only items matching the current mime type.
- library: {
- type: mime
- },
</del><ins>+ // Tell the modal to show only items matching the current mime type.
+ library: {
+ type: mime
+ },
</ins><span class="cx">
</span><del>- // Customize the submit button.
- button: {
- // Set the text of the button.
- text: $el.data('update')
- }
- });
</del><ins>+ // Customize the submit button.
+ button: {
+ // Set the text of the button.
+ text: $el.data('update')
+ }
+ });
</ins><span class="cx">
</span><del>- mediaPreview = function (format, url, mime) {
- $('#' + format + '-preview').remove();
- $holder.parent().prepend( '<div id="' + format + '-preview" class="wp-format-media-preview">' +
- '<' + format + ' class="wp-' + format + '-shortcode" controls="controls" preload="none">' +
- '<source type="' + mime + '" src="' + url + '" />' +
- '</' + format + '></div>' );
- $('.wp-' + format + '-shortcode').mediaelementplayer();
- };
</del><ins>+ mediaPreview = function (format, url, mime) {
+ $('#' + format + '-preview').remove();
+ $holder.parent().prepend( '<div id="' + format + '-preview" class="wp-format-media-preview">' +
+ '<' + format + ' class="wp-' + format + '-shortcode" controls="controls" preload="none">' +
+ '<source type="' + mime + '" src="' + url + '" />' +
+ '</' + format + '></div>' );
+ $('.wp-' + format + '-shortcode').mediaelementplayer();
+ };
</ins><span class="cx">
</span><del>- // When an image is selected, run a callback.
- mediaFrame.on( 'select', function () {
- // Grab the selected attachment.
- var attachment = mediaFrame.state().get('selection').first(), mime, url, id;
</del><ins>+ // When an image is selected, run a callback.
+ mediaFrame.on( 'select', function () {
+ // Grab the selected attachment.
+ var attachment = mediaFrame.state().get('selection').first(), mime, url, id;
</ins><span class="cx">
</span><del>- id = attachment.get('id');
- url = attachment.get('url');
- mime = attachment.get('mime');
</del><ins>+ id = attachment.get('id');
+ url = attachment.get('url');
+ mime = attachment.get('mime');
</ins><span class="cx">
</span><del>- if ( 0 === mime.indexOf('audio') ) {
- $field.val(url);
- // show one preview at a time
- mediaPreview('audio', url, mime);
- } else if ( 0 === mime.indexOf('video') ) {
- $field.val(url);
- // show one preview at a time
- mediaPreview('video', url, mime);
- } else {
- // set the hidden input's value
- $field.val(id);
- // Show the image in the placeholder
- $el.html('<img src="' + url + '" />');
- $holder.removeClass('empty').show();
- }
</del><ins>+ if ( 0 === mime.indexOf('audio') ) {
+ $field.val(url);
+ // show one preview at a time
+ mediaPreview('audio', url, mime);
+ } else if ( 0 === mime.indexOf('video') ) {
+ $field.val(url);
+ // show one preview at a time
+ mediaPreview('video', url, mime);
+ } else {
+ // set the hidden input's value
+ $field.val(id);
+ // Show the image in the placeholder
+ $el.html('<img src="' + url + '" />');
+ $holder.removeClass('empty').show();
+ }
+ });
+
+ mediaFrame.open();
</ins><span class="cx"> });
</span><del>-
- mediaFrame.open();
</del><span class="cx"> });
</span><span class="cx"> })(jQuery);
</span></span></pre>
</div>
</div>
</body>
</html>