<!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>[26269] trunk/src/wp-admin/js/gallery.js: Fix JSHint errors in gallery.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/26269">26269</a></dd>
<dt>Author</dt> <dd>SergeyBiryukov</dd>
<dt>Date</dt> <dd>2013-11-19 11:09:01 +0000 (Tue, 19 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix JSHint errors in gallery.js.
props dougwollison.
fixes <a href="http://core.trac.wordpress.org/ticket/25999">#25999</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjsgalleryjs">trunk/src/wp-admin/js/gallery.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjsgalleryjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/gallery.js (26268 => 26269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/gallery.js 2013-11-19 10:41:05 UTC (rev 26268)
+++ trunk/src/wp-admin/js/gallery.js 2013-11-19 11:09:01 UTC (rev 26269)
</span><span class="lines">@@ -1,5 +1,7 @@
</span><ins>+/* global unescape, getUserSetting, setUserSetting */
+
</ins><span class="cx"> jQuery(document).ready(function($) {
</span><del>- var gallerySortable, gallerySortableInit, w, desc = false;
</del><ins>+ var gallerySortable, gallerySortableInit, sortIt, clearAll, w, desc = false;
</ins><span class="cx">
</span><span class="cx"> gallerySortableInit = function() {
</span><span class="cx"> gallerySortable = $('#media-items').sortable( {
</span><span class="lines">@@ -8,7 +10,7 @@
</span><span class="cx"> axis: 'y',
</span><span class="cx"> distance: 2,
</span><span class="cx"> handle: 'div.filename',
</span><del>- stop: function(e, ui) {
</del><ins>+ stop: function() {
</ins><span class="cx"> // When an update has occurred, adjust the order for each item
</span><span class="cx"> var all = $('#media-items').sortable('toArray'), len = all.length;
</span><span class="cx"> $.each(all, function(i, id) {
</span><span class="lines">@@ -17,7 +19,7 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> } );
</span><del>- }
</del><ins>+ };
</ins><span class="cx">
</span><span class="cx"> sortIt = function() {
</span><span class="cx"> var all = $('.menu_order_input'), len = all.length;
</span><span class="lines">@@ -25,26 +27,39 @@
</span><span class="cx"> var order = desc ? (len - i) : (1 + i);
</span><span class="cx"> $(this).val(order);
</span><span class="cx"> });
</span><del>- }
</del><ins>+ };
</ins><span class="cx">
</span><span class="cx"> clearAll = function(c) {
</span><span class="cx"> c = c || 0;
</span><del>- $('.menu_order_input').each(function(){
- if ( this.value == '0' || c ) this.value = '';
</del><ins>+ $('.menu_order_input').each( function() {
+ if ( this.value === '0' || c ) {
+ this.value = '';
+ }
</ins><span class="cx"> });
</span><del>- }
</del><ins>+ };
</ins><span class="cx">
</span><del>- $('#asc').click(function(){desc = false; sortIt(); return false;});
- $('#desc').click(function(){desc = true; sortIt(); return false;});
- $('#clear').click(function(){clearAll(1); return false;});
- $('#showall').click(function(){
</del><ins>+ $('#asc').click( function() {
+ desc = false;
+ sortIt();
+ return false;
+ });
+ $('#desc').click( function() {
+ desc = true;
+ sortIt();
+ return false;
+ });
+ $('#clear').click( function() {
+ clearAll(1);
+ return false;
+ });
+ $('#showall').click( function() {
</ins><span class="cx"> $('#sort-buttons span a').toggle();
</span><span class="cx"> $('a.describe-toggle-on').hide();
</span><span class="cx"> $('a.describe-toggle-off, table.slidetoggle').show();
</span><span class="cx"> $('img.pinkynail').toggle(false);
</span><span class="cx"> return false;
</span><span class="cx"> });
</span><del>- $('#hideall').click(function(){
</del><ins>+ $('#hideall').click( function() {
</ins><span class="cx"> $('#sort-buttons span a').toggle();
</span><span class="cx"> $('a.describe-toggle-on').show();
</span><span class="cx"> $('a.describe-toggle-off, table.slidetoggle').hide();
</span><span class="lines">@@ -60,7 +75,7 @@
</span><span class="cx"> w = wpgallery.getWin();
</span><span class="cx">
</span><span class="cx"> $('#save-all, #gallery-settings').show();
</span><del>- if ( typeof w.tinyMCE != 'undefined' && w.tinyMCE.activeEditor && ! w.tinyMCE.activeEditor.isHidden() ) {
</del><ins>+ if ( typeof w.tinyMCE !== 'undefined' && w.tinyMCE.activeEditor && ! w.tinyMCE.activeEditor.isHidden() ) {
</ins><span class="cx"> wpgallery.mcemode = true;
</span><span class="cx"> wpgallery.init();
</span><span class="cx"> } else {
</span><span class="lines">@@ -88,7 +103,9 @@
</span><span class="cx"> init: function() {
</span><span class="cx"> var t = this, li, q, i, it, w = t.getWin();
</span><span class="cx">
</span><del>- if ( ! t.mcemode ) return;
</del><ins>+ if ( ! t.mcemode ) {
+ return;
+ }
</ins><span class="cx">
</span><span class="cx"> li = ('' + document.location.search).replace(/^\?/, '').split('&');
</span><span class="cx"> q = {};
</span><span class="lines">@@ -97,8 +114,9 @@
</span><span class="cx"> q[unescape(it[0])] = unescape(it[1]);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (q.mce_rdomain)
</del><ins>+ if ( q.mce_rdomain ) {
</ins><span class="cx"> document.domain = q.mce_rdomain;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Find window & API
</span><span class="cx"> tinymce = w.tinymce;
</span><span class="lines">@@ -114,18 +132,28 @@
</span><span class="cx">
</span><span class="cx"> setup : function() {
</span><span class="cx"> var t = this, a, ed = t.editor, g, columns, link, order, orderby;
</span><del>- if ( ! t.mcemode ) return;
</del><ins>+ if ( ! t.mcemode ) {
+ return;
+ }
</ins><span class="cx">
</span><span class="cx"> t.el = ed.selection.getNode();
</span><span class="cx">
</span><del>- if ( t.el.nodeName != 'IMG' || ! ed.dom.hasClass(t.el, 'wpGallery') ) {
- if ( (g = ed.dom.select('img.wpGallery')) && g[0] ) {
</del><ins>+ if ( t.el.nodeName !== 'IMG' || ! ed.dom.hasClass(t.el, 'wpGallery') ) {
+ if ( ( g = ed.dom.select('img.wpGallery') ) && g[0] ) {
</ins><span class="cx"> t.el = g[0];
</span><span class="cx"> } else {
</span><del>- if ( getUserSetting('galfile') == '1' ) t.I('linkto-file').checked = "checked";
- if ( getUserSetting('galdesc') == '1' ) t.I('order-desc').checked = "checked";
- if ( getUserSetting('galcols') ) t.I('columns').value = getUserSetting('galcols');
- if ( getUserSetting('galord') ) t.I('orderby').value = getUserSetting('galord');
</del><ins>+ if ( getUserSetting('galfile') === '1' ) {
+ t.I('linkto-file').checked = 'checked';
+ }
+ if ( getUserSetting('galdesc') === '1' ) {
+ t.I('order-desc').checked = 'checked';
+ }
+ if ( getUserSetting('galcols') ) {
+ t.I('columns').value = getUserSetting('galcols');
+ }
+ if ( getUserSetting('galord') ) {
+ t.I('orderby').value = getUserSetting('galord');
+ }
</ins><span class="cx"> jQuery('#insert-gallery').show();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -143,10 +171,18 @@
</span><span class="cx"> order = a.match(/order=['"]([^'"]+)['"]/i);
</span><span class="cx"> orderby = a.match(/orderby=['"]([^'"]+)['"]/i);
</span><span class="cx">
</span><del>- if ( link && link[1] ) t.I('linkto-file').checked = "checked";
- if ( order && order[1] ) t.I('order-desc').checked = "checked";
- if ( columns && columns[1] ) t.I('columns').value = ''+columns[1];
- if ( orderby && orderby[1] ) t.I('orderby').value = orderby[1];
</del><ins>+ if ( link && link[1] ) {
+ t.I('linkto-file').checked = 'checked';
+ }
+ if ( order && order[1] ) {
+ t.I('order-desc').checked = 'checked';
+ }
+ if ( columns && columns[1] ) {
+ t.I('columns').value = '' + columns[1];
+ }
+ if ( orderby && orderby[1] ) {
+ t.I('orderby').value = orderby[1];
+ }
</ins><span class="cx"> } else {
</span><span class="cx"> jQuery('#insert-gallery').show();
</span><span class="cx"> }
</span><span class="lines">@@ -156,14 +192,16 @@
</span><span class="cx"> var t = this, ed = t.editor, all = '', s;
</span><span class="cx">
</span><span class="cx"> if ( ! t.mcemode || ! t.is_update ) {
</span><del>- s = '[gallery'+t.getSettings()+']';
</del><ins>+ s = '[gallery' + t.getSettings() + ']';
</ins><span class="cx"> t.getWin().send_to_editor(s);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (t.el.nodeName != 'IMG') return;
</del><ins>+ if ( t.el.nodeName !== 'IMG' ) {
+ return;
+ }
</ins><span class="cx">
</span><del>- all = ed.dom.decode(ed.dom.getAttrib(t.el, 'title'));
</del><ins>+ all = ed.dom.decode( ed.dom.getAttrib( t.el, 'title' ) );
</ins><span class="cx"> all = all.replace(/\s*(order|link|columns|orderby)=['"]([^'"]+)['"]/gi, '');
</span><span class="cx"> all += t.getSettings();
</span><span class="cx">
</span><span class="lines">@@ -184,13 +222,13 @@
</span><span class="cx"> setUserSetting('galdesc', '1');
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( I('columns').value != 3 ) {
- s += ' columns="'+I('columns').value+'"';
</del><ins>+ if ( I('columns').value !== 3 ) {
+ s += ' columns="' + I('columns').value + '"';
</ins><span class="cx"> setUserSetting('galcols', I('columns').value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( I('orderby').value != 'menu_order' ) {
- s += ' orderby="'+I('orderby').value+'"';
</del><ins>+ if ( I('orderby').value !== 'menu_order' ) {
+ s += ' orderby="' + I('orderby').value + '"';
</ins><span class="cx"> setUserSetting('galord', I('orderby').value);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>