From 3d057fef40f0888d769ec6a0df2897370a6cd3f6 Mon Sep 17 00:00:00 2001 From: Aaron Jorbin Date: Mon, 8 Aug 2016 22:48:33 +0000 Subject: [PATCH] Updates: Standardize JS Custom Event Names Custom JS events are triggered on the document in order for plugins to have something to hook into. The standard began in #31819 is dash separated and begins with `wp` to signify the namespace, followed by the subject of our action ( "theme", "plugin", etc.) followed by the action and an optional indicator of status ( "install-success", "deleting" ). This brings some of the theme hooks in line with the standard. As of now, all plugin actions in `src/wp-admin/js/updates.js` have an equal corresponding theme action. Fixes #37598. See #37512, #37216, #31819. Props olarmarius, ocean90. git-svn-id: https://develop.svn.wordpress.org/trunk@38218 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/js/theme.js | 6 +++--- src/wp-admin/js/updates.js | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/wp-admin/js/theme.js b/src/wp-admin/js/theme.js index 50d6593c25..18596e824d 100644 --- a/src/wp-admin/js/theme.js +++ b/src/wp-admin/js/theme.js @@ -597,7 +597,7 @@ themes.view.Theme = wp.Backbone.View.extend({ wp.updates.maybeRequestFilesystemCredentials( event ); - $( document ).on( 'wp-install-theme-success', function( event, response ) { + $( document ).on( 'wp-theme-install-success', function( event, response ) { if ( _this.model.get( 'id' ) === response.slug ) { _this.model.set( { 'installed': true } ); } @@ -799,7 +799,7 @@ themes.view.Details = wp.Backbone.View.extend({ wp.updates.maybeRequestFilesystemCredentials( event ); - $( document ).one( 'wp-delete-theme-success', function( event, response ) { + $( document ).one( 'wp-theme-delete-success', function( event, response ) { _this.$el.find( '.close' ).trigger( 'click' ); $( '[data-slug="' + response.slug + '"' ).css( { backgroundColor:'#faafaa' } ).fadeOut( 350, function() { $( this ).remove(); @@ -972,7 +972,7 @@ themes.view.Preview = themes.view.Details.extend({ wp.updates.maybeRequestFilesystemCredentials( event ); - $( document ).on( 'wp-install-theme-success', function() { + $( document ).on( 'wp-theme-install-success', function() { _this.model.set( { 'installed': true } ); } ); diff --git a/src/wp-admin/js/updates.js b/src/wp-admin/js/updates.js index 5056fa0f92..688ddb1f05 100644 --- a/src/wp-admin/js/updates.js +++ b/src/wp-admin/js/updates.js @@ -1071,7 +1071,7 @@ var $card = $( '.wp-full-overlay-header, [data-slug=' + response.slug + ']' ), $message; - $document.trigger( 'wp-install-theme-success', response ); + $document.trigger( 'wp-theme-install-success', response ); $message = $card.find( '.button-primary' ) .removeClass( 'updating-message' ) @@ -1243,7 +1243,7 @@ wp.a11y.speak( wp.updates.l10n.deleted, 'polite' ); - $document.trigger( 'wp-delete-theme-success', response ); + $document.trigger( 'wp-theme-delete-success', response ); }; /**