From 69504de9d85dba9ad8d343fb9ca259d2f7edffcb Mon Sep 17 00:00:00 2001 From: Boone Gorges Date: Thu, 5 Feb 2015 19:52:22 +0000 Subject: [PATCH] jshint fixes for shiny updates JS. As introduced in [31333]. Props iseulde. See #29820. Built from https://develop.svn.wordpress.org/trunk@31341 git-svn-id: http://core.svn.wordpress.org/trunk@31322 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/js/plugin-install.js | 2 +- wp-admin/js/updates.js | 23 +++++++++++------------ wp-admin/js/updates.min.js | 2 +- wp-includes/version.php | 2 +- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/wp-admin/js/plugin-install.js b/wp-admin/js/plugin-install.js index 36a6bdc57d..f3b3f578e0 100644 --- a/wp-admin/js/plugin-install.js +++ b/wp-admin/js/plugin-install.js @@ -1,4 +1,4 @@ -/* global plugininstallL10n, tb_click, confirm */ +/* global plugininstallL10n, tb_click */ /* Plugin Browser Thickbox related JS*/ var tb_position; diff --git a/wp-admin/js/updates.js b/wp-admin/js/updates.js index 025d977ece..e76b51025d 100644 --- a/wp-admin/js/updates.js +++ b/wp-admin/js/updates.js @@ -1,7 +1,6 @@ window.wp = window.wp || {}; -(function( $, wp ) { - +(function( $, wp, pagenow, ajaxurl ) { wp.updates = {}; /** @@ -52,7 +51,7 @@ window.wp = window.wp || {}; var count, pluginCount, $adminBarUpdateCount = $( '#wp-admin-bar-updates .ab-label' ), - $dashboardNavMenuUpdateCount = $( 'a[href="update-core.php"] .update-plugins' ) + $dashboardNavMenuUpdateCount = $( 'a[href="update-core.php"] .update-plugins' ), $pluginsMenuItem = $( '#menu-plugins' ); @@ -153,7 +152,7 @@ window.wp = window.wp || {}; if ( jqxhr.responseJSON && jqxhr.responseJSON.data && jqxhr.responseJSON.data.error ) { alertText += ': ' + jqxhr.responseJSON.data.error; } - alert( alertText ); + window.alert( alertText ); if ( jqxhr.responseJSON && jqxhr.responseJSON.data && jqxhr.responseJSON.data.slug ) { wp.updates.updateError( jqxhr.responseJSON ); } @@ -162,7 +161,7 @@ window.wp = window.wp || {}; * Check the queue. */ wp.updates.queueChecker(); - } + }; /** * On a successful plugin update, update the UI with the result. @@ -262,7 +261,7 @@ window.wp = window.wp || {}; if ( jqxhr.responseJSON && jqxhr.responseJSON.data && jqxhr.responseJSON.data.error ) { alertText += ': ' + jqxhr.responseJSON.data.error; } - alert( alertText ); + window.alert( alertText ); if ( jqxhr.responseJSON && jqxhr.responseJSON.data && jqxhr.responseJSON.data.slug ) { wp.updates.installError( jqxhr.responseJSON ); } @@ -322,8 +321,8 @@ window.wp = window.wp || {}; wp.updates.installPlugin( job.data.slug ); break; default: - console.log( 'Failed to exect queued update job.' ); - console.log( job ); + window.console.log( 'Failed to exect queued update job.' ); + window.console.log( job ); break; } }; @@ -336,7 +335,7 @@ window.wp = window.wp || {}; } ); $( '#bulk-action-form' ).on( 'submit', function( e ) { - var checkbox, plugin, slug; + var $checkbox, plugin, slug; if ( $( '#bulk-action-selector-top' ).val() == 'update-selected' ) { e.preventDefault(); @@ -355,13 +354,13 @@ window.wp = window.wp || {}; $( '.plugin-card .update-now' ).on( 'click', function( e ) { e.preventDefault(); - $button = $( e.target ); + var $button = $( e.target ); wp.updates.updatePlugin( $button.data( 'plugin' ), $button.data( 'slug' ) ); } ); $( '.plugin-card .install-now' ).on( 'click', function( e ) { e.preventDefault(); - $button = $( e.target ); + var $button = $( e.target ); if ( $button.hasClass( 'button-disabled' ) ) { return; } @@ -389,4 +388,4 @@ window.wp = window.wp || {}; } ); -})( jQuery, window.wp ); +})( jQuery, window.wp, window.pagenow, window.ajaxurl ); diff --git a/wp-admin/js/updates.min.js b/wp-admin/js/updates.min.js index bbf1d5a454..ea26260ee1 100644 --- a/wp-admin/js/updates.min.js +++ b/wp-admin/js/updates.min.js @@ -1 +1 @@ -window.wp=window.wp||{},function(a,b){b.updates={},b.updates.ajaxNonce=window._wpUpdatesSettings.ajax_nonce,b.updates.l10n=window._wpUpdatesSettings.l10n,b.updates.updateLock=!1,b.updates.updateQueue=[],b.updates.decrementCount=function(b){var c,d,e=a("#wp-admin-bar-updates .ab-label"),f=a('a[href="update-core.php"] .update-plugins');if($pluginsMenuItem=a("#menu-plugins"),c=e.text(),c=parseInt(c,10)-1,!(0>c||isNaN(c))&&(a("#wp-admin-bar-updates .ab-item").removeAttr("title"),e.text(c),f.each(function(a,b){b.className=b.className.replace(/count-\d+/,"count-"+c)}),f.removeAttr("title"),f.find(".update-count").text(c),"plugin"===b)){if(d=$pluginsMenuItem.find(".plugin-count").eq(0).text(),d=parseInt(d,10)-1,0>d||isNaN(d))return;$pluginsMenuItem.find(".plugin-count").text(d),$pluginsMenuItem.find(".update-plugins").each(function(a,b){b.className=b.className.replace(/count-\d+/,"count-"+d)}),d>0?a(".subsubsub .upgrade .count").text("("+d+")"):a(".subsubsub .upgrade").remove()}},b.updates.updatePlugin=function(c,d){var e;if("plugins"===pagenow||"plugins-network"===pagenow?e=a("#"+d).next().find(".update-message"):"plugin-install"===pagenow&&(e=a(".plugin-card-"+d).find(".update-now")),e.addClass("updating-message"),e.text(b.updates.l10n.updating),b.updates.updateLock)return void b.updates.updateQueue.push({type:"update-plugin",data:{plugin:c,slug:d}});b.updates.updateLock=!0;var f={action:"update-plugin",_ajax_nonce:b.updates.ajaxNonce,plugin:c,slug:d};a.ajax({type:"post",url:ajaxurl,data:f,complete:b.updates.updateRequestComplete})},b.updates.updateRequestComplete=function(a){if(b.updates.updateLock=!1,a.responseJSON&&a.responseJSON.success)b.updates.updateSuccess(a.responseJSON);else{var c=b.updates.l10n.updateFailed;a.responseJSON&&a.responseJSON.data&&a.responseJSON.data.error&&(c+=": "+a.responseJSON.data.error),alert(c),a.responseJSON&&a.responseJSON.data&&a.responseJSON.data.slug&&b.updates.updateError(a.responseJSON)}b.updates.queueChecker()},b.updates.updateSuccess=function(c){var d;"plugins"===pagenow||"plugins-network"===pagenow?(d=a("#"+c.data.slug).next().find(".update-message"),a("#"+c.data.slug).addClass("updated").removeClass("update"),a("#"+c.data.slug+"-update").addClass("updated").removeClass("update")):"plugin-install"===pagenow&&(d=a(".plugin-card-"+c.data.slug).find(".update-now"),d.addClass("button-disabled")),d.removeClass("updating-message").addClass("updated-message"),d.text(b.updates.l10n.updated),b.updates.decrementCount("plugin")},b.updates.updateError=function(c){var d;"plugins"===pagenow||"plugins-network"===pagenow?d=a("#"+c.data.slug).next().find(".update-message"):"plugin-install"===pagenow&&(d=a(".plugin-card-"+c.data.slug).find(".update-now")),d.removeClass("updating-message"),d.text(b.updates.l10n.updateFailed)},b.updates.installPlugin=function(c){var d=a(".plugin-card-"+c).find(".install-now");if(d.addClass("updating-message"),d.text(b.updates.l10n.installing),b.updates.updateLock)return void b.updates.updateQueue.push({type:"install-plugin",data:{slug:c}});b.updates.updateLock=!0;var e={action:"install-plugin",_ajax_nonce:b.updates.ajaxNonce,slug:c};a.ajax({type:"post",url:ajaxurl,data:e,complete:b.updates.installRequestComplete})},b.updates.installRequestComplete=function(a){if(b.updates.updateLock=!1,a.responseJSON&&a.responseJSON.success)b.updates.installSuccess(a.responseJSON);else{var c=b.updates.l10n.installFailed;a.responseJSON&&a.responseJSON.data&&a.responseJSON.data.error&&(c+=": "+a.responseJSON.data.error),alert(c),a.responseJSON&&a.responseJSON.data&&a.responseJSON.data.slug&&b.updates.installError(a.responseJSON)}b.updates.queueChecker()},b.updates.installSuccess=function(c){var d=a(".plugin-card-"+c.data.slug).find(".install-now");d.removeClass("updating-message").addClass("updated-message button-disabled"),d.text(b.updates.l10n.installed)},b.updates.installError=function(c){var d=a(".plugin-card-"+c.data.slug).find(".install-now");d.removeClass("updating-message"),d.text(b.updates.l10n.installNow)},b.updates.queueChecker=function(){if(!(b.updates.updateLock||b.updates.updateQueue.length<=0)){var a=b.updates.updateQueue.shift();switch(a.type){case"update-plugin":b.updates.updatePlugin(a.data.plugin,a.data.slug);break;case"install-plugin":b.updates.installPlugin(a.data.slug);break;default:console.log("Failed to exect queued update job."),console.log(a)}}},a(document).ready(function(){a(".plugin-update-tr .update-link").on("click",function(c){c.preventDefault();var d=a(c.target).parents(".plugin-update-tr");b.updates.updatePlugin(d.data("plugin"),d.data("slug"))}),a("#bulk-action-form").on("submit",function(c){var d,e;"update-selected"==a("#bulk-action-selector-top").val()&&(c.preventDefault(),a('input[name="checked[]"]:checked').each(function(c,f){$checkbox=a(f),d=$checkbox.val(),e=$checkbox.parents("tr").prop("id"),b.updates.updatePlugin(d,e),$checkbox.attr("checked",!1)}))}),a(".plugin-card .update-now").on("click",function(c){c.preventDefault(),$button=a(c.target),b.updates.updatePlugin($button.data("plugin"),$button.data("slug"))}),a(".plugin-card .install-now").on("click",function(c){c.preventDefault(),$button=a(c.target),$button.hasClass("button-disabled")||b.updates.installPlugin($button.data("slug"))})}),a(window).on("message",function(c){var d,e=c.originalEvent,f=document.location,g=f.protocol+"//"+f.hostname;e.origin===g&&(d=a.parseJSON(e.data),"undefined"!=typeof d.action&&"decrementUpdateCount"===d.action&&b.updates.decrementCount(d.upgradeType))})}(jQuery,window.wp); \ No newline at end of file +window.wp=window.wp||{},function(a,b,c,d){b.updates={},b.updates.ajaxNonce=window._wpUpdatesSettings.ajax_nonce,b.updates.l10n=window._wpUpdatesSettings.l10n,b.updates.updateLock=!1,b.updates.updateQueue=[],b.updates.decrementCount=function(b){var c,d,e=a("#wp-admin-bar-updates .ab-label"),f=a('a[href="update-core.php"] .update-plugins'),g=a("#menu-plugins");if(c=e.text(),c=parseInt(c,10)-1,!(0>c||isNaN(c))&&(a("#wp-admin-bar-updates .ab-item").removeAttr("title"),e.text(c),f.each(function(a,b){b.className=b.className.replace(/count-\d+/,"count-"+c)}),f.removeAttr("title"),f.find(".update-count").text(c),"plugin"===b)){if(d=g.find(".plugin-count").eq(0).text(),d=parseInt(d,10)-1,0>d||isNaN(d))return;g.find(".plugin-count").text(d),g.find(".update-plugins").each(function(a,b){b.className=b.className.replace(/count-\d+/,"count-"+d)}),d>0?a(".subsubsub .upgrade .count").text("("+d+")"):a(".subsubsub .upgrade").remove()}},b.updates.updatePlugin=function(e,f){var g;if("plugins"===c||"plugins-network"===c?g=a("#"+f).next().find(".update-message"):"plugin-install"===c&&(g=a(".plugin-card-"+f).find(".update-now")),g.addClass("updating-message"),g.text(b.updates.l10n.updating),b.updates.updateLock)return void b.updates.updateQueue.push({type:"update-plugin",data:{plugin:e,slug:f}});b.updates.updateLock=!0;var h={action:"update-plugin",_ajax_nonce:b.updates.ajaxNonce,plugin:e,slug:f};a.ajax({type:"post",url:d,data:h,complete:b.updates.updateRequestComplete})},b.updates.updateRequestComplete=function(a){if(b.updates.updateLock=!1,a.responseJSON&&a.responseJSON.success)b.updates.updateSuccess(a.responseJSON);else{var c=b.updates.l10n.updateFailed;a.responseJSON&&a.responseJSON.data&&a.responseJSON.data.error&&(c+=": "+a.responseJSON.data.error),window.alert(c),a.responseJSON&&a.responseJSON.data&&a.responseJSON.data.slug&&b.updates.updateError(a.responseJSON)}b.updates.queueChecker()},b.updates.updateSuccess=function(d){var e;"plugins"===c||"plugins-network"===c?(e=a("#"+d.data.slug).next().find(".update-message"),a("#"+d.data.slug).addClass("updated").removeClass("update"),a("#"+d.data.slug+"-update").addClass("updated").removeClass("update")):"plugin-install"===c&&(e=a(".plugin-card-"+d.data.slug).find(".update-now"),e.addClass("button-disabled")),e.removeClass("updating-message").addClass("updated-message"),e.text(b.updates.l10n.updated),b.updates.decrementCount("plugin")},b.updates.updateError=function(d){var e;"plugins"===c||"plugins-network"===c?e=a("#"+d.data.slug).next().find(".update-message"):"plugin-install"===c&&(e=a(".plugin-card-"+d.data.slug).find(".update-now")),e.removeClass("updating-message"),e.text(b.updates.l10n.updateFailed)},b.updates.installPlugin=function(c){var e=a(".plugin-card-"+c).find(".install-now");if(e.addClass("updating-message"),e.text(b.updates.l10n.installing),b.updates.updateLock)return void b.updates.updateQueue.push({type:"install-plugin",data:{slug:c}});b.updates.updateLock=!0;var f={action:"install-plugin",_ajax_nonce:b.updates.ajaxNonce,slug:c};a.ajax({type:"post",url:d,data:f,complete:b.updates.installRequestComplete})},b.updates.installRequestComplete=function(a){if(b.updates.updateLock=!1,a.responseJSON&&a.responseJSON.success)b.updates.installSuccess(a.responseJSON);else{var c=b.updates.l10n.installFailed;a.responseJSON&&a.responseJSON.data&&a.responseJSON.data.error&&(c+=": "+a.responseJSON.data.error),window.alert(c),a.responseJSON&&a.responseJSON.data&&a.responseJSON.data.slug&&b.updates.installError(a.responseJSON)}b.updates.queueChecker()},b.updates.installSuccess=function(c){var d=a(".plugin-card-"+c.data.slug).find(".install-now");d.removeClass("updating-message").addClass("updated-message button-disabled"),d.text(b.updates.l10n.installed)},b.updates.installError=function(c){var d=a(".plugin-card-"+c.data.slug).find(".install-now");d.removeClass("updating-message"),d.text(b.updates.l10n.installNow)},b.updates.queueChecker=function(){if(!(b.updates.updateLock||b.updates.updateQueue.length<=0)){var a=b.updates.updateQueue.shift();switch(a.type){case"update-plugin":b.updates.updatePlugin(a.data.plugin,a.data.slug);break;case"install-plugin":b.updates.installPlugin(a.data.slug);break;default:window.console.log("Failed to exect queued update job."),window.console.log(a)}}},a(document).ready(function(){a(".plugin-update-tr .update-link").on("click",function(c){c.preventDefault();var d=a(c.target).parents(".plugin-update-tr");b.updates.updatePlugin(d.data("plugin"),d.data("slug"))}),a("#bulk-action-form").on("submit",function(c){var d,e,f;"update-selected"==a("#bulk-action-selector-top").val()&&(c.preventDefault(),a('input[name="checked[]"]:checked').each(function(c,g){d=a(g),e=d.val(),f=d.parents("tr").prop("id"),b.updates.updatePlugin(e,f),d.attr("checked",!1)}))}),a(".plugin-card .update-now").on("click",function(c){c.preventDefault();var d=a(c.target);b.updates.updatePlugin(d.data("plugin"),d.data("slug"))}),a(".plugin-card .install-now").on("click",function(c){c.preventDefault();var d=a(c.target);d.hasClass("button-disabled")||b.updates.installPlugin(d.data("slug"))})}),a(window).on("message",function(c){var d,e=c.originalEvent,f=document.location,g=f.protocol+"//"+f.hostname;e.origin===g&&(d=a.parseJSON(e.data),"undefined"!=typeof d.action&&"decrementUpdateCount"===d.action&&b.updates.decrementCount(d.upgradeType))})}(jQuery,window.wp,window.pagenow,window.ajaxurl); \ No newline at end of file diff --git a/wp-includes/version.php b/wp-includes/version.php index 676bd4dbae..cf7ac53e47 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.2-alpha-31340'; +$wp_version = '4.2-alpha-31341'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.