Ticket #44371: explicit-globals.3.patch

src/js/_enqueues/admin/common.js

@@ -3 +3 @@
  */
 
 /* global setUserSetting, ajaxurl, commonL10n, alert, confirm, pagenow */
-var showNotice, adminMenu, columns, validateForm, screenMeta;
+/* global columns, screenMeta */
 
 /**
  *  Adds common WordPress functionality to the window.
@@ -23 +23 @@
  * @since 2.7.0
  * @deprecated 3.3.0
  */
-adminMenu = {
+window.adminMenu = {
         init : function() {},
         fold : function() {},
         restoreMenuState : function() {},
@@ -32 +32 @@
 };
 
 // Show/hide/save table columns.
-columns = {
+window.columns = {
 
         /**
          * Initializes the column toggles in the screen options.
@@ -158 +158 @@
  *
  * @returns {boolean} Returns true if all required fields are not an empty string.
  */
-validateForm = function( form ) {
+window.validateForm = function( form ) {
         return !$( form )
                 .find( '.form-required' )
                 .filter( function() { return $( ':input:visible', this ).val() === ''; } )
@@ -178 +178 @@
  *
  * @returns {void}
  */
-showNotice = {
+window.showNotice = {
 
         /**
          * Shows a delete confirmation pop-up message.
@@ -219 +219 @@
  *
  * @returns {void}
  */
-screenMeta = {
+window.screenMeta = {
         element: null, // #screen-meta
         toggles: null, // .screen-meta-toggle
         page:    null, // #wpcontent

src/js/_enqueues/admin/edit-comments.js

@@ -3 +3 @@
  */
 
 /* global adminCommentsL10n, thousandsSeparator, list_args, QTags, ajaxurl, wpAjax */
-var setCommentsList, theList, theExtraList, commentReply;
+/* global commentReply, theExtraList, theList, setCommentsList */
 
 (function($) {
 var getCount, updateCount, updateCountText, updatePending, updateApproved,
@@ -188 +188 @@
                 });
         };
 
-setCommentsList = function() {
+window.setCommentsList = function() {
         var totalInput, perPageInput, pageInput, dimAfter, delBefore, updateTotalCount, delAfter, refillTheExtraList, diff,
                 lastConfidentTime = 0;
 
@@ -564 +564 @@
                 });
         };
 
-        theExtraList = $('#the-extra-comment-list').wpList( { alt: '', delColor: 'none', addColor: 'none' } );
-        theList = $('#the-comment-list').wpList( { alt: '', delBefore: delBefore, dimAfter: dimAfter, delAfter: delAfter, addColor: 'none' } )
+        window.theExtraList = $('#the-extra-comment-list').wpList( { alt: '', delColor: 'none', addColor: 'none' } );
+        window.theList = $('#the-comment-list').wpList( { alt: '', delBefore: delBefore, dimAfter: dimAfter, delAfter: delAfter, addColor: 'none' } )
                 .bind('wpListDelEnd', function(e, s){
                         var wpListsData = $(s.target).attr('data-wp-lists'), id = s.element.replace(/[^0-9]+/g, '');
 
@@ -574 +574 @@
                 });
 };
 
-commentReply = {
+window.commentReply = {
         cid : '',
         act : '',
         originalContent : '',

src/js/_enqueues/admin/inline-edit-post.js

@@ -5 +5 @@
  * @output wp-admin/js/inline-edit-post.js
  */
 
-/* global inlineEditL10n, ajaxurl, typenow */
+/* global inlineEditL10n, ajaxurl, typenow, inlineEditPost */
 
 window.wp = window.wp || {};
 
@@ -22 +22 @@
  * @property {string} what The prefix before the post id.
  *
  */
-var inlineEditPost;
 ( function( $, wp ) {
 
-        inlineEditPost = {
+        window.inlineEditPost = {
 
         /**
          * Initializes the inline and bulk post editor.

src/js/_enqueues/admin/inline-edit-tax.js

@@ -4 +4 @@
  * @output wp-admin/js/inline-edit-tax.js
  */
 
-/* global inlineEditL10n, ajaxurl */
+/* global inlineEditL10n, ajaxurl, inlineEditTax */
 
 window.wp = window.wp || {};
 
@@ -17 +17 @@
  * @property {string} what The type property with a hash prefixed and a dash
  *                         suffixed.
  */
-var inlineEditTax;
-
 ( function( $, wp ) {
 
-inlineEditTax = {
+window.inlineEditTax = {
 
         /**
          * Initializes the inline taxonomy editor by adding event handlers to be able to

src/js/_enqueues/admin/media-upload.js

@@ -12 +12 @@
  * @requires jQuery
  */
 
-/* global tinymce, QTags */
-
-var wpActiveEditor, send_to_editor;
+/* global tinymce, QTags, wpActiveEditor, tb_position */
 
 /**
  * Sends the HTML passed in the parameters to TinyMCE.
@@ -28 +26 @@
  *                         are unavailable. This means that the HTML was not
  *                         sent to the editor.
  */
-send_to_editor = function( html ) {
+window.send_to_editor = function( html ) {
         var editor,
                 hasTinymce = typeof tinymce !== 'undefined',
                 hasQuicktags = typeof QTags !== 'undefined';
@@ -37 +35 @@
         if ( ! wpActiveEditor ) {
                 if ( hasTinymce && tinymce.activeEditor ) {
                         editor = tinymce.activeEditor;
-                        wpActiveEditor = editor.id;
+                        window.wpActiveEditor = editor.id;
                 } else if ( ! hasQuicktags ) {
                         return false;
                 }
@@ -64 +62 @@
         }
 };
 
-var tb_position;
 (function($) {
         /**
          * Recalculates and applies the new ThickBox position based on the current
@@ -77 +74 @@
          * @returns {Object[]} Array containing jQuery objects for all the found
          *                     ThickBox anchors.
          */
-        tb_position = function() {
+        window.tb_position = function() {
                 var tbWindow = $('#TB_window'),
                         width = $(window).width(),
                         H = $(window).height(),

src/js/_enqueues/admin/media.js

@@ -10 +10 @@
  * @requires jQuery
  */
 
-/* global ajaxurl, attachMediaBoxL10n, _wpMediaGridSettings, showNotice */
-
-var findPosts;
+/* global ajaxurl, attachMediaBoxL10n, _wpMediaGridSettings, showNotice, findPosts */
 
 ( function( $ ){
-        findPosts = {
+        window.findPosts = {
                 /**
                  * Opens a dialog to attach media to a post.
                  *

src/js/_enqueues/admin/plugin-install.js

@@ -4 +4 @@
  * @output wp-admin/js/plugin-install.js
  */
 
-/* global plugininstallL10n, tb_click, tb_remove */
-var tb_position;
+/* global plugininstallL10n, tb_click, tb_remove, tb_position */
+
 jQuery( document ).ready( function( $ ) {
 
         var tbWindow,
@@ -18 +18 @@
                 $wrap = $ ( '.wrap' ),
                 $body = $( document.body );
 
-        tb_position = function() {
+        window.tb_position = function() {
                 var width = $( window ).width(),
                         H = $( window ).height() - ( ( 792 < width ) ? 60 : 20 ),
                         W = ( 792 < width ) ? 772 : width - 20;

src/js/_enqueues/admin/post.js

@@ -5 +5 @@
  */
 
  /* global postL10n, ajaxurl, wpAjax, setPostThumbnailL10n, postboxes, pagenow, tinymce, alert, deleteUserSetting */
- /* global theList:true, theExtraList:true, getUserSetting, setUserSetting, commentReply */
+ /* global theList:true, theExtraList:true, getUserSetting, setUserSetting, commentReply, commentsBox */
+ /* global WPSetThumbnailHTML, wptitlehint */
 
-var commentsBox, WPSetThumbnailHTML, WPSetThumbnailID, WPRemoveThumbnail, wptitlehint, makeSlugeditClickable, editPermalink;
 // Backwards compatibility: prevent fatal errors.
-makeSlugeditClickable = editPermalink = function(){};
+window.makeSlugeditClickable = window.editPermalink = function(){};
 
 // Make sure the wp object exists.
 window.wp = window.wp || {};
@@ -24 +24 @@
          *
          * @namespace commentsBox
          */
-        commentsBox = {
+        window.commentsBox = {
                 // Comment offset to use when fetching new comments.
                 st : 0,
 
@@ -108 +108 @@
          *
          * @global
          */
-        WPSetThumbnailHTML = function(html){
+        window.WPSetThumbnailHTML = function(html){
                 $('.inside', '#postimagediv').html(html);
         };
 
@@ -119 +119 @@
          *
          * @global
          */
-        WPSetThumbnailID = function(id){
+        window.WPSetThumbnailID = function(id){
                 var field = $('input[value="_thumbnail_id"]', '#list-table');
                 if ( field.length > 0 ) {
                         $('#meta\\[' + field.attr('id').match(/[0-9]+/) + '\\]\\[value\\]').text(id);
@@ -133 +133 @@
          *
          * @global
          */
-        WPRemoveThumbnail = function(nonce){
+        window.WPRemoveThumbnail = function(nonce){
                 $.post(ajaxurl, {
                         action: 'set-post-thumbnail', post_id: $( '#post_ID' ).val(), thumbnail_id: -1, _ajax_nonce: nonce, cookie: encodeURIComponent( document.cookie )
                 },
@@ -1048 +1048 @@
          *
          * @returns void
          */
-        wptitlehint = function(id) {
+        window.wptitlehint = function(id) {
                 id = id || 'title';
 
                 var title = $('#' + id), titleprompt = $('#' + id + '-prompt-text');

src/js/_enqueues/admin/postbox.js

@@ -7 +7 @@
  * @output wp-admin/js/postbox.js
  */
 
-/* global ajaxurl, postBoxL10n */
-
-/**
- * This object contains all function to handle the behaviour of the post boxes. The post boxes are the boxes you see
- * around the content on the edit page.
- *
- * @since 2.7.0
- *
- * @namespace postboxes
- *
- * @type {Object}
- */
-var postboxes;
+/* global ajaxurl, postBoxL10n, postboxes */
 
 (function($) {
         var $document = $( document );
 
-        postboxes = {
+        /**
+         * This object contains all function to handle the behaviour of the post boxes. The post boxes are the boxes you see
+         * around the content on the edit page.
+         *
+         * @since 2.7.0
+         *
+         * @namespace postboxes
+         *
+         * @type {Object}
+         */
+        window.postboxes = {
 
                 /**
                  * Handles a click on either the postbox heading or the postbox open/close icon.

src/js/_enqueues/admin/set-post-thumbnail.js

@@ -5 +5 @@
 /* global setPostThumbnailL10n, ajaxurl, post_id, alert */
 /* exported WPSetAsThumbnail */
 
-function WPSetAsThumbnail( id, nonce ) {
+window.WPSetAsThumbnail = function( id, nonce ) {
         var $link = jQuery('a#wp-post-thumbnail-' + id);
 
         $link.text( setPostThumbnailL10n.saving );
@@ -25 +25 @@
                 }
         }
         );
-}
+};

src/js/_enqueues/admin/tags-box.js

@@ -3 +3 @@
  */
 
 /* jshint curly: false, eqeqeq: false */
-/* global ajaxurl */
-
-var tagBox, array_unique_noempty;
+/* global ajaxurl, tagBox, array_unique_noempty */
 
 ( function( $ ) {
         var tagDelimiter = ( window.tagsSuggestL10n && window.tagsSuggestL10n.tagDelimiter ) || ',';
@@ -24 +22 @@
          *
          * @return {Array} A new array containing only the unique items.
          */
-        array_unique_noempty = function( array ) {
+        window.array_unique_noempty = function( array ) {
                 var out = [];
 
                 // Trim the values and ensure they are unique.
@@ -49 +47 @@
          *
          * @global
          */
-        tagBox = {
+        window.tagBox = {
                 /**
                  * Cleans up tags by removing redundant characters.
                  *

src/js/_enqueues/admin/widgets.js

@@ -2 +2 @@
  * @output wp-admin/js/widgets.js
  */
 
-/* global ajaxurl, isRtl */
-var wpWidgets;
+/* global ajaxurl, isRtl, wpWidgets */
+
 (function($) {
         var $document = $( document );
 
-wpWidgets = {
+window.wpWidgets = {
         /**
          * A closed Sidebar that gets a Widget dragged over it.
          *

src/js/_enqueues/lib/ajax-response.js

@@ -2 +2 @@
  * @output wp-includes/js/wp-ajax-response.js
  */
 
-var wpAjax = jQuery.extend( {
+ /* global wpAjax */
+
+window.wpAjax = jQuery.extend( {
         unserialize: function( s ) {
                 var r = {}, q, pp, i, p;
                 if ( !s ) { return r; }

src/js/_enqueues/lib/comment-reply.js

@@ -8 +8 @@
  *
  * @type {Object}
  */
-var addComment;
-addComment = ( function( window ) {
+window.addComment = ( function( window ) {
         // Avoid scope lookups on commonly used variables.
         var document = window.document;
 

src/js/_enqueues/lib/cookies.js

@@ -4 +4 @@
  * @output wp-includes/js/utils.js
  */
 
-/* global userSettings */
+/* global userSettings, getAllUserSettings, wpCookies, setUserSetting */
 /* exported getUserSetting, setUserSetting, deleteUserSetting */
 
-var wpCookies = {
+window.wpCookies = {
 // The following functions are from Cookie.js class in TinyMCE 3, Moxiecode, used under LGPL.
 
         each: function( obj, cb, scope ) {
@@ -139 +139 @@
 };
 
 // Returns the value as string. Second arg or empty string is returned when value is not set.
-function getUserSetting( name, def ) {
+window.getUserSetting = function( name, def ) {
         var settings = getAllUserSettings();
 
         if ( settings.hasOwnProperty( name ) ) {
@@ -151 +151 @@
         }
 
         return '';
-}
+};
 
 // Both name and value must be only ASCII letters, numbers or underscore
 // and the shorter, the better (cookies can store maximum 4KB). Not suitable to store text.
 // The value is converted and stored as string.
-function setUserSetting( name, value, _del ) {
+window.setUserSetting = function( name, value, _del ) {
         if ( 'object' !== typeof userSettings ) {
                 return false;
         }
@@ -186 +186 @@
         wpCookies.set( 'wp-settings-time-' + uid, userSettings.time, 31536000, path, '', secure );
 
         return name;
-}
+};
 
-function deleteUserSetting( name ) {
+window.deleteUserSetting = function( name ) {
         return setUserSetting( name, '', 1 );
-}
+};
 
 // Returns all settings as js object.
-function getAllUserSettings() {
+window.getAllUserSettings = function() {
         if ( 'object' !== typeof userSettings ) {
                 return {};
         }
 
         return wpCookies.getHash( 'wp-settings-' + userSettings.uid ) || {};
-}
+};

src/js/_enqueues/lib/gallery.js

@@ -2 +2 @@
  * @output wp-admin/js/gallery.js
  */
 
-/* global unescape, getUserSetting, setUserSetting */
+/* global unescape, getUserSetting, setUserSetting, wpgallery, tinymce */
 
 jQuery(document).ready(function($) {
         var gallerySortable, gallerySortableInit, sortIt, clearAll, w, desc = false;
@@ -88 +88 @@
         }
 });
 
-jQuery(window).unload( function () { tinymce = tinyMCE = wpgallery = null; } ); // Cleanup
+jQuery(window).unload( function () { window.tinymce = window.tinyMCE = window.wpgallery = null; } ); // Cleanup
 
 /* gallery settings */
-var tinymce = null, tinyMCE, wpgallery;
+window.tinymce = null;
 
-wpgallery = {
+window.wpgallery = {
         mcemode : false,
         editor : {},
         dom : {},
@@ -123 +123 @@
                 }
 
                 // Find window & API
-                tinymce = w.tinymce;
-                tinyMCE = w.tinyMCE;
+                window.tinymce = w.tinymce;
+                window.tinyMCE = w.tinyMCE;
                 t.editor = tinymce.EditorManager.activeEditor;
 
                 t.setup();

src/js/_enqueues/lib/link.js

@@ -2 +2 @@
  * @output wp-includes/js/wplink.js
  */
 
-var wpLink;
+ /* global wpLink */
 
 ( function( $, wpLinkL10n, wp ) {
         var editor, searchTimer, River, Query, correctedURL, linkNode,
@@ -16 +16 @@
                 return linkNode || editor.dom.getParent( editor.selection.getNode(), 'a[href]' );
         }
 
-        wpLink = {
+        window.wpLink = {
                 timeToTriggerRiver: 150,
                 minRiverAJAXDuration: 200,
                 riverBottomThreshold: 5,

src/js/_enqueues/lib/nav-menu.js

@@ -9 +9 @@
  * @output wp-admin/js/nav-menu.js
  */
 
-/* global menus, postboxes, columns, isRtl, navMenuL10n, ajaxurl */
-
-/**
- * Contains all the functions to handle WordPress navigation menus administration.
- *
- * @namespace
- */
-var wpNavMenu;
+/* global menus, postboxes, columns, isRtl, navMenuL10n, ajaxurl, wpNavMenu */
 
 (function($) {
 
         var api;
 
-        api = wpNavMenu = {
+        /**
+         * Contains all the functions to handle WordPress navigation menus administration.
+         *
+         * @namespace wpNavMenu
+         */
+        api = window.wpNavMenu = {
 
                 options : {
                         menuItemDepthPerLevel : 30, // Do not use directly. Use depthToPx and pxToDepth instead.

src/js/_enqueues/lib/quicktags.js

@@ -24 +24 @@
 // by Alex King
 // http://www.alexking.org/
 
-/* global adminpage, wpActiveEditor, quicktagsL10n, wpLink, prompt */
+/* global adminpage, wpActiveEditor, quicktagsL10n, wpLink, prompt, edButtons */
 
-var QTags, edCanvas,
-        edButtons = [];
+window.edButtons = [];
 
 /* jshint ignore:start */
 
@@ -36 +35 @@
  *
  * Define all former global functions so plugins that hack quicktags.js directly don't cause fatal errors.
  */
-var edAddTag = function(){},
-edCheckOpenTags = function(){},
-edCloseAllTags = function(){},
-edInsertImage = function(){},
-edInsertLink = function(){},
-edInsertTag = function(){},
-edLink = function(){},
-edQuickLink = function(){},
-edRemoveTag = function(){},
-edShowButton = function(){},
-edShowLinks = function(){},
-edSpell = function(){},
-edToolbar = function(){};
+window.edAddTag = function(){},
+window.edCheckOpenTags = function(){},
+window.edCloseAllTags = function(){},
+window.edInsertImage = function(){},
+window.edInsertLink = function(){},
+window.edInsertTag = function(){},
+window.edLink = function(){},
+window.edQuickLink = function(){},
+window.edRemoveTag = function(){},
+window.edShowButton = function(){},
+window.edShowLinks = function(){},
+window.edSpell = function(){},
+window.edToolbar = function(){};
 
 /**
  * Initialize new instance of the Quicktags editor
  */
-function quicktags(settings) {
+window.quicktags = function(settings) {
         return new QTags(settings);
 }
 
@@ -63 +62 @@
  * Added for back compatibility
  * @see QTags.insertContent()
  */
-function edInsertContent(bah, txt) {
+window.edInsertContent = function(bah, txt) {
         return QTags.insertContent(txt);
 }
 
@@ -73 +72 @@
  * Added for back compatibility, use QTags.addButton() as it gives more flexibility like type of button, button placement, etc.
  * @see QTags.addButton()
  */
-function edButton(id, display, tagStart, tagEnd, access) {
+window.edButton = function(id, display, tagStart, tagEnd, access) {
         return QTags.addButton( id, display, tagStart, tagEnd, access, '', -1 );
 }
 
@@ -156 +155 @@
         })(),
         qt;
 
-        qt = QTags = function(settings) {
+        qt = window.QTags = function(settings) {
                 if ( typeof(settings) === 'string' ) {
                         settings = {id: settings};
                 } else if ( typeof(settings) !== 'object' ) {
@@ -180 +179 @@
 
                 if ( id === 'content' && typeof(adminpage) === 'string' && ( adminpage === 'post-new-php' || adminpage === 'post-php' ) ) {
                         // back compat hack :-(
-                        edCanvas = canvas;
+                        window.edCanvas = canvas;
                         toolbar_id = 'ed_toolbar';
                 } else {
                         toolbar_id = name + '_toolbar';

src/js/_enqueues/wp/dashboard.js

@@ -3 +3 @@
  */
 
 /* global pagenow, ajaxurl, postboxes, wpActiveEditor:true */
-var ajaxWidgets, ajaxPopulateWidgets, quickPressLoad;
 window.wp = window.wp || {};
 
 /**
@@ -61 +60 @@
          *
          * @global
          */
-        ajaxWidgets = ['dashboard_primary'];
+        window.ajaxWidgets = ['dashboard_primary'];
 
         /**
          * Triggers widget updates via AJAX.
@@ -74 +73 @@
          *
          * @returns {void}
          */
-        ajaxPopulateWidgets = function(el) {
+        window.ajaxPopulateWidgets = function(el) {
                 /**
                  * Fetch the latest representation of the widget via Ajax and show it.
                  *
@@ -104 +103 @@
                 if ( el ) {
                         el = el.toString();
                         // If the element is available as AJAX widget, show it.
-                        if ( $.inArray(el, ajaxWidgets) !== -1 ) {
+                        if ( $.inArray(el, window.ajaxWidgets) !== -1 ) {
                                 // Show element without any delay.
                                 show(0, el);
                         }
                 } else {
                         // Walk through all ajaxWidgets, loading them after each other.
-                        $.each( ajaxWidgets, show );
+                        $.each( window.ajaxWidgets, show );
                 }
         };
 
         // Initially populate ajax widgets.
-        ajaxPopulateWidgets();
+        window.ajaxPopulateWidgets();
 
         // Register ajax widgets as postbox toggles.
-        postboxes.add_postbox_toggles(pagenow, { pbshow: ajaxPopulateWidgets } );
+        postboxes.add_postbox_toggles(pagenow, { pbshow: window.ajaxPopulateWidgets } );
 
         /**
          * Control the Quick Press (Quick Draft) widget.
@@ -129 +128 @@
          *
          * @returns {void}
          */
-        quickPressLoad = function() {
+        window.quickPressLoad = function() {
                 var act = $('#quickpost-action'), t;
 
                 // Enable the submit buttons.
@@ -149 +148 @@
                                 // Replace the form, and prepend the published post.
                                 $('#dashboard_quick_press .inside').html( data );
                                 $('#quick-press').removeClass('initial-form');
-                                quickPressLoad();
+                                window.quickPressLoad();
                                 highlightLatestPost();
 
                                 // Focus the title to allow for quickly drafting another post.
@@ -210 +209 @@
 
                 autoResizeTextarea();
         };
-        quickPressLoad();
+        window.quickPressLoad();
 
         // Enable the dragging functionality of the widgets.
         $( '.meta-box-sortables' ).sortable( 'option', 'containment', '#wpwrap' );

src/js/_enqueues/wp/password-strength-meter.js

@@ -5 +5 @@
 /* global zxcvbn */
 window.wp = window.wp || {};
 
-var passwordStrength;
 (function($){
 
         /**
@@ -118 +117 @@
          *
          * @type {wp.passwordStrength.meter}
          */
-        passwordStrength = wp.passwordStrength.meter;
+        window.passwordStrength = wp.passwordStrength.meter;
 })(jQuery);

src/js/_enqueues/wp/theme.js

@@ -2 +2 @@
  * @output wp-admin/js/theme.js
  */
 
-/* global _wpThemeSettings, confirm */
+/* global _wpThemeSettings, confirm, tb_position */
 window.wp = window.wp || {};
 
 ( function($) {
@@ -2041 +2041 @@
 })( jQuery );
 
 // Align theme browser thickbox
-var tb_position;
 jQuery(document).ready( function($) {
-        tb_position = function() {
+        window.tb_position = function() {
                 var tbWindow = $('#TB_window'),
                         width = $(window).width(),
                         H = $(window).height(),