<!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>[26390] trunk/src/wp-admin/js/dashboard.js: Dashboard JS cleanup.</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/26390">26390</a></dd>
<dt>Author</dt> <dd>helen</dd>
<dt>Date</dt> <dd>2013-11-26 04:37:27 +0000 (Tue, 26 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Dashboard JS cleanup. props kadamwhite, helen. see <a href="http://core.trac.wordpress.org/ticket/25824">#25824</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjsdashboardjs">trunk/src/wp-admin/js/dashboard.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjsdashboardjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/dashboard.js (26389 => 26390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/dashboard.js 2013-11-26 04:13:10 UTC (rev 26389)
+++ trunk/src/wp-admin/js/dashboard.js 2013-11-26 04:37:27 UTC (rev 26390)
</span><span class="lines">@@ -2,17 +2,21 @@
</span><span class="cx"> var ajaxWidgets, ajaxPopulateWidgets, quickPressLoad;
</span><span class="cx">
</span><span class="cx"> jQuery(document).ready( function($) {
</span><del>- /* Dashboard Welcome Panel */
- var welcomePanel = $('#welcome-panel'),
</del><ins>+ var $window = $( window ),
+ welcomePanel = $( '#welcome-panel' ),
</ins><span class="cx"> welcomePanelHide = $('#wp_welcome_panel-hide'),
</span><del>- updateWelcomePanel = function( visible ) {
- $.post( ajaxurl, {
- action: 'update-welcome-panel',
- visible: visible,
- welcomepanelnonce: $('#welcomepanelnonce').val()
- });
- };
</del><ins>+ updateWelcomePanel,
+ metaboxHolder = $( '.metabox-holder' ),
+ updateColumnCount;
</ins><span class="cx">
</span><ins>+ updateWelcomePanel = function( visible ) {
+ $.post( ajaxurl, {
+ action: 'update-welcome-panel',
+ visible: visible,
+ welcomepanelnonce: $( '#welcomepanelnonce' ).val()
+ });
+ };
+
</ins><span class="cx"> if ( welcomePanel.hasClass('hidden') && welcomePanelHide.prop('checked') ) {
</span><span class="cx"> welcomePanel.removeClass('hidden');
</span><span class="cx"> }
</span><span class="lines">@@ -128,19 +132,9 @@
</span><span class="cx"> e.preventDefault();
</span><span class="cx"> });
</span><span class="cx">
</span><del>- // Dashboard columns
- jQuery(document).ready(function () {
- // Update main column count on load
- updateColumnCount();
- });
-
- jQuery(window).resize( _.debounce( function(){
- updateColumnCount();
- }, 30) );
-
- function updateColumnCount() {
</del><ins>+ updateColumnCount = function( $window, $holder ) {
</ins><span class="cx"> var cols = 1,
</span><del>- windowWidth = parseInt(jQuery(window).width(), 10);
</del><ins>+ windowWidth = parseInt( $window.width(), 10 );
</ins><span class="cx">
</span><span class="cx"> if (799 < windowWidth && 1299 > windowWidth) {
</span><span class="cx"> cols = 2;
</span><span class="lines">@@ -153,7 +147,15 @@
</span><span class="cx"> if (1800 < windowWidth) {
</span><span class="cx"> cols = 4;
</span><span class="cx"> }
</span><del>- jQuery('.metabox-holder').attr('class', jQuery('.metabox-holder').attr('class').replace(/columns-\d+/, 'columns-' + cols));
- }
</del><span class="cx">
</span><ins>+ $holder.attr( 'class', $holder.attr( 'class' ).replace( /columns-\d+/, 'columns-' + cols ) );
+ };
+
+ // Update main column count on load
+ updateColumnCount( $window, metaboxHolder );
+
+ $window.on( 'resize', _.debounce(function() {
+ updateColumnCount( $window, metaboxHolder );
+ }, 30 ) );
+
</ins><span class="cx"> } );
</span></span></pre>
</div>
</div>
</body>
</html>