Changeset 26269

Timestamp:

11/19/2013 11:09:01 AM (11 years ago)

Author:

SergeyBiryukov

Message:

Fix JSHint errors in gallery.js.

props dougwollison.
fixes #25999.

File:

• trunk/src/wp-admin/js/gallery.js (modified) (12 diffs)

trunk/src/wp-admin/js/gallery.js

@@ +1 @@
+/* global unescape, getUserSetting, setUserSetting */
+
 jQuery(document).ready(function($) {
-    var gallerySortable, gallerySortableInit, w, desc = false;
+    var gallerySortable, gallerySortableInit, sortIt, clearAll, w, desc = false;
 
     gallerySortableInit = function() {
@@ -9 +11 @@
             distance: 2,
             handle: 'div.filename',
-            stop: function(e, ui) {
+            stop: function() {
                 // When an update has occurred, adjust the order for each item
                 var all = $('#media-items').sortable('toArray'), len = all.length;
@@ -18 +20 @@
             }
         } );
-    }
+    };
 
     sortIt = function() {
@@ -26 +28 @@
             $(this).val(order);
         });
-    }
+    };
 
     clearAll = function(c) {
         c = c || 0;
-        $('.menu_order_input').each(function(){
-            if ( this.value == '0' || c ) this.value = '';
+        $('.menu_order_input').each( function() {
+            if ( this.value === '0' || c ) {
+                this.value = '';
+            }
         });
-    }
-
-    $('#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(){
+    };
+
+    $('#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() {
         $('#sort-buttons span a').toggle();
         $('a.describe-toggle-on').hide();
@@ -45 +60 @@
         return false;
     });
-    $('#hideall').click(function(){
+    $('#hideall').click( function() {
         $('#sort-buttons span a').toggle();
         $('a.describe-toggle-on').show();
@@ -61 +76 @@
 
         $('#save-all, #gallery-settings').show();
-        if ( typeof w.tinyMCE != 'undefined' && w.tinyMCE.activeEditor && ! w.tinyMCE.activeEditor.isHidden() ) {
+        if ( typeof w.tinyMCE !== 'undefined' && w.tinyMCE.activeEditor && ! w.tinyMCE.activeEditor.isHidden() ) {
             wpgallery.mcemode = true;
             wpgallery.init();
@@ -89 +104 @@
         var t = this, li, q, i, it, w = t.getWin();
 
-        if ( ! t.mcemode ) return;
+        if ( ! t.mcemode ) {
+            return;
+        }
 
         li = ('' + document.location.search).replace(/^\?/, '').split('&');
@@ -98 +115 @@
         }
 
-        if (q.mce_rdomain)
+        if ( q.mce_rdomain ) {
             document.domain = q.mce_rdomain;
+        }
 
         // Find window & API
@@ -115 +133 @@
     setup : function() {
         var t = this, a, ed = t.editor, g, columns, link, order, orderby;
-        if ( ! t.mcemode ) return;
+        if ( ! t.mcemode ) {
+            return;
+        }
 
         t.el = ed.selection.getNode();
 
-        if ( t.el.nodeName != 'IMG' || ! ed.dom.hasClass(t.el, 'wpGallery') ) {
-            if ( (g = ed.dom.select('img.wpGallery')) && g[0] ) {
+        if ( t.el.nodeName !== 'IMG' || ! ed.dom.hasClass(t.el, 'wpGallery') ) {
+            if ( ( g = ed.dom.select('img.wpGallery') ) && g[0] ) {
                 t.el = g[0];
             } else {
-                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');
+                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');
+                }
                 jQuery('#insert-gallery').show();
                 return;
@@ -144 +172 @@
             orderby = a.match(/orderby=['"]([^'"]+)['"]/i);
 
-            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];
+            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];
+            }
         } else {
             jQuery('#insert-gallery').show();
@@ -157 +193 @@
 
         if ( ! t.mcemode || ! t.is_update ) {
-            s = '[gallery'+t.getSettings()+']';
+            s = '[gallery' + t.getSettings() + ']';
             t.getWin().send_to_editor(s);
             return;
         }
 
-        if (t.el.nodeName != 'IMG') return;
-
-        all = ed.dom.decode(ed.dom.getAttrib(t.el, 'title'));
+        if ( t.el.nodeName !== 'IMG' ) {
+            return;
+        }
+
+        all = ed.dom.decode( ed.dom.getAttrib( t.el, 'title' ) );
         all = all.replace(/\s*(order|link|columns|orderby)=['"]([^'"]+)['"]/gi, '');
         all += t.getSettings();
@@ -185 +223 @@
         }
 
-        if ( I('columns').value != 3 ) {
-            s += ' columns="'+I('columns').value+'"';
+        if ( I('columns').value !== 3 ) {
+            s += ' columns="' + I('columns').value + '"';
             setUserSetting('galcols', I('columns').value);
         }
 
-        if ( I('orderby').value != 'menu_order' ) {
-            s += ' orderby="'+I('orderby').value+'"';
+        if ( I('orderby').value !== 'menu_order' ) {
+            s += ' orderby="' + I('orderby').value + '"';
             setUserSetting('galord', I('orderby').value);
         }