Skip to content

Fix a conflict #252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 2, 2020
Merged

Fix a conflict #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
959a6cd
Rename Cloudinary constant
Nov 2, 2020
afa9d51
Update compiled asset
Nov 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion js/deactivate.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions js/src/deactivate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* global window wp cloudinaryApi */
/* global window wp CLD_Deactivate */

const Deactivate = {
// The link that triggers the ThickBox
Expand Down Expand Up @@ -58,13 +58,13 @@ const Deactivate = {
// Add event listener to submit the feedback.
context.submitButton.addEventListener( 'click', function() {
wp.ajax.send( {
url: cloudinaryApi.endpoint,
url: CLD_Deactivate.endpoint,
data: {
reason: context.reason,
more: context.more?.value,
},
beforeSend: function( request ) {
request.setRequestHeader( 'X-WP-Nonce', cloudinaryApi.nonce );
request.setRequestHeader( 'X-WP-Nonce', CLD_Deactivate.nonce );
},
} ).always( function() {
window.location.href = context.deactivationUrl;
Expand Down
2 changes: 1 addition & 1 deletion php/class-deactivation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ public function enqueue_scripts() {
wp_enqueue_script( 'cloudinary-deactivation', $this->plugin->dir_url . 'js/deactivate.js', array(), $this->plugin->version, true );
wp_localize_script(
'cloudinary-deactivation',
'cloudinaryApi',
'CLD_Deactivate',
array(
'endpoint' => rest_url( REST_API::BASE . '/' . self::$internal_endpoint ),
'nonce' => wp_create_nonce( 'wp_rest' ),
Expand Down