' );
+ ui.item
+ .find( '.check-column input' )
+ .hide()
+ .after( '' );
// Go do the sorting stuff via ajax
- $.post( ajaxurl, { action: 'woocommerce_product_ordering', id: postid, previd: prevpostid, nextid: nextpostid }, function( response ) {
- $.each( response, function( key, value ) {
- $( '#inline_' + key + ' .menu_order' ).html( value );
- });
- ui.item.find( '.check-column input' ).show().siblings( 'img' ).remove();
- $( 'table.widefat tbody th, table.widefat tbody td' ).css( 'cursor', 'move' );
- $( 'table.widefat tbody' ).sortable( 'enable' );
- });
+ $.post(
+ ajaxurl,
+ { action: 'woocommerce_product_ordering', id: postid, previd: prevpostid, nextid: nextpostid },
+ function( response ) {
+ $.each( response, function( key, value ) {
+ $( '#inline_' + key + ' .menu_order' ).html( value );
+ });
+ ui.item.find( '.check-column input' ).show().siblings( 'img' ).remove();
+ $( 'table.widefat tbody th, table.widefat tbody td' ).css( 'cursor', 'move' );
+ $( 'table.widefat tbody' ).sortable( 'enable' );
+ }
+ );
// fix cell colors
$( 'table.widefat tbody tr' ).each( function() {
diff --git a/assets/js/admin/quick-edit.js b/assets/js/admin/quick-edit.js
index 74f2f94c866..56bd651779d 100644
--- a/assets/js/admin/quick-edit.js
+++ b/assets/js/admin/quick-edit.js
@@ -45,6 +45,7 @@ jQuery(function( $ ) {
$( 'input[name="_stock"]', '.inline-edit-row' ).val( stock );
$( 'input[name="menu_order"]', '.inline-edit-row' ).val( menu_order );
+ // eslint-disable-next-line max-len
$( 'select[name="_tax_status"] option, select[name="_tax_class"] option, select[name="_visibility"] option, select[name="_stock_status"] option, select[name="_backorders"] option' ).removeAttr( 'selected' );
$( 'select[name="_tax_status"] option[value="' + tax_status + '"]', '.inline-edit-row' ).attr( 'selected', 'selected' );
diff --git a/assets/js/admin/reports.js b/assets/js/admin/reports.js
index 3173462e470..f419f16fc03 100644
--- a/assets/js/admin/reports.js
+++ b/assets/js/admin/reports.js
@@ -222,7 +222,13 @@ jQuery(function( $ ) {
csv_data += '"' + index + '",';
} else {
if ( groupby === 'day' ) {
- csv_data += '"' + date.getUTCFullYear() + '-' + parseInt( date.getUTCMonth() + 1, 10 ) + '-' + date.getUTCDate() + '",';
+ csv_data += '"' +
+ date.getUTCFullYear() +
+ '-' +
+ parseInt( date.getUTCMonth() + 1, 10 ) +
+ '-' +
+ date.getUTCDate() +
+ '",';
} else {
csv_data += '"' + date.getUTCFullYear() + '-' + parseInt( date.getUTCMonth() + 1, 10 ) + '",';
}
diff --git a/assets/js/admin/settings-views-html-settings-tax.js b/assets/js/admin/settings-views-html-settings-tax.js
index 9d6793aa173..061c2bd1af7 100644
--- a/assets/js/admin/settings-views-html-settings-tax.js
+++ b/assets/js/admin/settings-views-html-settings-tax.js
@@ -165,7 +165,8 @@
minLength: 3
});
- // Postcode and city don't have `name` values by default. They're only created if the contents changes, to save on database queries (I think)
+ // Postcode and city don't have `name` values by default.
+ // They're only created if the contents changes, to save on database queries (I think)
this.$el.find( 'td.postcode input, td.city input' ).change( function() {
$( this ).attr( 'name', $( this ).data( 'name' ) );
});
@@ -232,7 +233,9 @@
reordered_rates = _.map( rates_to_reorder, function( rate ) {
rate.tax_rate_order++;
- changes[ rate.tax_rate_id ] = _.extend( changes[ rate.tax_rate_id ] || {}, { tax_rate_order : rate.tax_rate_order } );
+ changes[ rate.tax_rate_id ] = _.extend(
+ changes[ rate.tax_rate_id ] || {}, { tax_rate_order : rate.tax_rate_order }
+ );
return rate;
} );
} else {
diff --git a/assets/js/admin/term-ordering.js b/assets/js/admin/term-ordering.js
index 302f6854d6e..1a1a99d8d97 100644
--- a/assets/js/admin/term-ordering.js
+++ b/assets/js/admin/term-ordering.js
@@ -30,7 +30,13 @@ jQuery( function( $ ) {
};
$( document ).ajaxComplete( function( event, request, options ) {
- if ( request && 4 === request.readyState && 200 === request.status && options.data && ( 0 <= options.data.indexOf( '_inline_edit' ) || 0 <= options.data.indexOf( 'add-tag' ) ) ) {
+ if (
+ request &&
+ 4 === request.readyState &&
+ 200 === request.status &&
+ options.data &&
+ ( 0 <= options.data.indexOf( '_inline_edit' ) || 0 <= options.data.indexOf( 'add-tag' ) )
+ ) {
$.wc_add_missing_sort_handles();
$( document.body ).trigger( 'init_tooltips' );
}
@@ -80,25 +86,41 @@ jQuery( function( $ ) {
}
}
- // If previous and next not at same tree level, or next not at same tree level and the previous is the parent of the next, or just moved item beneath its own children
- if ( ( prevtermid === undefined && nexttermid === undefined ) || ( nexttermid === undefined && nexttermparent === prevtermid ) || ( nexttermid !== undefined && prevtermparent === termid ) ) {
+ // If previous and next not at same tree level, or next not at same tree level and
+ // the previous is the parent of the next, or just moved item beneath its own children.
+ if (
+ ( prevtermid === undefined && nexttermid === undefined ) ||
+ ( nexttermid === undefined && nexttermparent === prevtermid ) ||
+ ( nexttermid !== undefined && prevtermparent === termid )
+ ) {
$( table_selector ).sortable( 'cancel' );
return;
}
// Show Spinner
ui.item.find( '.check-column input' ).hide();
- ui.item.find( '.check-column' ).append( '' );
+ ui.item
+ .find( '.check-column' )
+ .append( '' );
- // Go do the sorting stuff via ajax
- $.post( ajaxurl, { action: 'woocommerce_term_ordering', id: termid, nextid: nexttermid, thetaxonomy: woocommerce_term_ordering_params.taxonomy }, function(response){
- if ( response === 'children' ) {
- window.location.reload();
- } else {
- ui.item.find( '.check-column input' ).show();
- ui.item.find( '.check-column' ).find( 'img' ).remove();
+ // Go do the sorting stuff via ajax.
+ $.post(
+ ajaxurl,
+ {
+ action: 'woocommerce_term_ordering',
+ id: termid,
+ nextid: nexttermid,
+ thetaxonomy: woocommerce_term_ordering_params.taxonomy
+ },
+ function(response) {
+ if ( response === 'children' ) {
+ window.location.reload();
+ } else {
+ ui.item.find( '.check-column input' ).show();
+ ui.item.find( '.check-column' ).find( 'img' ).remove();
+ }
}
- });
+ );
// Fix cell colors
$( 'table.widefat tbody tr' ).each( function() {
diff --git a/assets/js/admin/wc-product-import.js b/assets/js/admin/wc-product-import.js
index 0af872bcd8a..7ba790ed5e6 100644
--- a/assets/js/admin/wc-product-import.js
+++ b/assets/js/admin/wc-product-import.js
@@ -58,7 +58,15 @@
$this.$form.find('.woocommerce-importer-progress').val( response.data.percentage );
if ( 'done' === response.data.position ) {
- window.location = response.data.url + '&products-imported=' + parseInt( $this.imported, 10 ) + '&products-failed=' + parseInt( $this.failed, 10 ) + '&products-updated=' + parseInt( $this.updated, 10 ) + '&products-skipped=' + parseInt( $this.skipped, 10 );
+ window.location = response.data.url +
+ '&products-imported=' +
+ parseInt( $this.imported, 10 ) +
+ '&products-failed=' +
+ parseInt( $this.failed, 10 ) +
+ '&products-updated=' +
+ parseInt( $this.updated, 10 ) +
+ '&products-skipped=' +
+ parseInt( $this.skipped, 10 );
} else {
$this.run_import();
}
diff --git a/assets/js/admin/wc-shipping-zone-methods.js b/assets/js/admin/wc-shipping-zone-methods.js
index 813b7ebda9a..17289866132 100644
--- a/assets/js/admin/wc-shipping-zone-methods.js
+++ b/assets/js/admin/wc-shipping-zone-methods.js
@@ -34,11 +34,16 @@
this.trigger( 'change:methods' );
},
save: function() {
- $.post( ajaxurl + ( ajaxurl.indexOf( '?' ) > 0 ? '&' : '?' ) + 'action=woocommerce_shipping_zone_methods_save_changes', {
- wc_shipping_zones_nonce : data.wc_shipping_zones_nonce,
- changes : this.changes,
- zone_id : data.zone_id
- }, this.onSaveResponse, 'json' );
+ $.post(
+ ajaxurl + ( ajaxurl.indexOf( '?' ) > 0 ? '&' : '?' ) + 'action=woocommerce_shipping_zone_methods_save_changes',
+ {
+ wc_shipping_zones_nonce : data.wc_shipping_zones_nonce,
+ changes : this.changes,
+ zone_id : data.zone_id
+ },
+ this.onSaveResponse,
+ 'json'
+ );
},
onSaveResponse: function( response, textStatus ) {
if ( 'success' === textStatus ) {
@@ -46,7 +51,11 @@
if ( response.data.zone_id !== data.zone_id ) {
data.zone_id = response.data.zone_id;
if ( window.history.pushState ) {
- window.history.pushState({}, '', 'admin.php?page=wc-settings&tab=shipping&zone_id=' + response.data.zone_id );
+ window.history.pushState(
+ {},
+ '',
+ 'admin.php?page=wc-settings&tab=shipping&zone_id=' + response.data.zone_id
+ );
}
}
shippingMethod.set( 'methods', response.data.methods );
@@ -72,7 +81,12 @@
$( window ).on( 'beforeunload', { view: this }, this.unloadConfirmation );
$save_button.on( 'click', { view: this }, this.onSubmit );
- $( document.body ).on( 'input change', '#zone_name, #zone_locations, #zone_postcodes', { view: this }, this.onUpdateZone );
+ $( document.body ).on(
+ 'input change',
+ '#zone_name, #zone_locations, #zone_postcodes',
+ { view: this },
+ this.onUpdateZone
+ );
$( document.body ).on( 'click', '.wc-shipping-zone-method-settings', { view: this }, this.onConfigureShippingMethod );
$( document.body ).on( 'click', '.wc-shipping-zone-add-method', { view: this }, this.onAddShippingMethod );
$( document.body ).on( 'wc_backbone_modal_response', this.onConfigureShippingMethodSubmitted );
@@ -128,9 +142,13 @@
// Populate $tbody with the current methods
$.each( methods, function( id, rowData ) {
if ( 'yes' === rowData.enabled ) {
- rowData.enabled_icon = '' + data.strings.yes + '';
+ rowData.enabled_icon = '' +
+ data.strings.yes +
+ '';
} else {
- rowData.enabled_icon = '' + data.strings.no + '';
+ rowData.enabled_icon = '' +
+ data.strings.no +
+ '';
}
view.$el.append( view.rowTemplate( rowData ) );
@@ -138,7 +156,9 @@
var $tr = view.$el.find( 'tr[data-id="' + rowData.instance_id + '"]');
if ( ! rowData.has_settings ) {
- $tr.find( '.wc-shipping-zone-method-title > a' ).replaceWith('' + $tr.find( '.wc-shipping-zone-method-title > a' ).text() + '' );
+ $tr
+ .find( '.wc-shipping-zone-method-title > a' )
+ .replaceWith('' + $tr.find( '.wc-shipping-zone-method-title > a' ).text() + '' );
var $del = $tr.find( '.wc-shipping-zone-method-delete' );
$tr.find( '.wc-shipping-zone-method-title .row-actions' ).empty().html($del);
}
@@ -241,7 +261,9 @@
if ( old_position !== new_position ) {
methods[ method.instance_id ].method_order = new_position;
changes.methods = changes.methods || { methods : {} };
- changes.methods[ method.instance_id ] = _.extend( changes.methods[ method.instance_id ] || {}, { method_order : new_position } );
+ changes.methods[ method.instance_id ] = _.extend(
+ changes.methods[ method.instance_id ] || {}, { method_order : new_position }
+ );
}
} );
@@ -281,30 +303,35 @@
shippingMethodView.block();
// Save method settings via ajax call
- $.post( ajaxurl + ( ajaxurl.indexOf( '?' ) > 0 ? '&' : '?' ) + 'action=woocommerce_shipping_zone_methods_save_settings', {
- wc_shipping_zones_nonce : data.wc_shipping_zones_nonce,
- instance_id : posted_data.instance_id,
- data : posted_data
- }, function( response, textStatus ) {
- if ( 'success' === textStatus && response.success ) {
- $( 'table.wc-shipping-zone-methods' ).parent().find( '#woocommerce_errors' ).remove();
+ $.post(
+ ajaxurl + ( ajaxurl.indexOf( '?' ) > 0 ? '&' : '?' ) + 'action=woocommerce_shipping_zone_methods_save_settings',
+ {
+ wc_shipping_zones_nonce : data.wc_shipping_zones_nonce,
+ instance_id : posted_data.instance_id,
+ data : posted_data
+ },
+ function( response, textStatus ) {
+ if ( 'success' === textStatus && response.success ) {
+ $( 'table.wc-shipping-zone-methods' ).parent().find( '#woocommerce_errors' ).remove();
- // If there were errors, prepend the form.
- if ( response.data.errors.length > 0 ) {
- shippingMethodView.showErrors( response.data.errors );
- }
+ // If there were errors, prepend the form.
+ if ( response.data.errors.length > 0 ) {
+ shippingMethodView.showErrors( response.data.errors );
+ }
- // Method was saved. Re-render.
- if ( _.size( shippingMethodView.model.changes ) ) {
- shippingMethodView.model.save();
+ // Method was saved. Re-render.
+ if ( _.size( shippingMethodView.model.changes ) ) {
+ shippingMethodView.model.save();
+ } else {
+ shippingMethodView.model.onSaveResponse( response, textStatus );
+ }
} else {
- shippingMethodView.model.onSaveResponse( response, textStatus );
+ window.alert( data.strings.save_failed );
+ shippingMethodView.unblock();
}
- } else {
- window.alert( data.strings.save_failed );
- shippingMethodView.unblock();
- }
- }, 'json' );
+ },
+ 'json'
+ );
}
},
showErrors: function( errors ) {
@@ -343,7 +370,11 @@
if ( response.data.zone_id !== data.zone_id ) {
data.zone_id = response.data.zone_id;
if ( window.history.pushState ) {
- window.history.pushState({}, '', 'admin.php?page=wc-settings&tab=shipping&zone_id=' + response.data.zone_id );
+ window.history.pushState(
+ {},
+ '',
+ 'admin.php?page=wc-settings&tab=shipping&zone_id=' + response.data.zone_id
+ );
}
}
// Trigger save if there are changes, or just re-render
diff --git a/assets/js/admin/wc-shipping-zones.js b/assets/js/admin/wc-shipping-zones.js
index 79026f2d964..093170a1ca9 100644
--- a/assets/js/admin/wc-shipping-zones.js
+++ b/assets/js/admin/wc-shipping-zones.js
@@ -161,7 +161,9 @@
class_name = 'method_enabled';
}
- $method_list.append( '' + wc_add_to_cart_variation_params.i18n_no_matching_variations_text + '
' ); + form.$form + .find( '.single_variation' ) + .after( + '' + + wc_add_to_cart_variation_params.i18n_no_matching_variations_text + + '
' + ); form.$form.find( '.wc-no-matching-variations' ).slideDown( 200 ); } } @@ -186,7 +213,13 @@ attributes.chosenCount = 0; if ( ! form.loading ) { - form.$form.find( '.single_variation' ).after( '' + wc_add_to_cart_variation_params.i18n_no_matching_variations_text + '
' ); + form.$form + .find( '.single_variation' ) + .after( + '' + + wc_add_to_cart_variation_params.i18n_no_matching_variations_text + + '
' + ); form.$form.find( '.wc-no-matching-variations' ).slideDown( 200 ); } } @@ -206,8 +239,12 @@ VariationForm.prototype.onFoundVariation = function( event, variation ) { var form = event.data.variationForm, $sku = form.$product.find( '.product_meta' ).find( '.sku' ), - $weight = form.$product.find( '.product_weight, .woocommerce-product-attributes-item--weight .woocommerce-product-attributes-item__value' ), - $dimensions = form.$product.find( '.product_dimensions, .woocommerce-product-attributes-item--dimensions .woocommerce-product-attributes-item__value' ), + $weight = form.$product.find( + '.product_weight, .woocommerce-product-attributes-item--weight .woocommerce-product-attributes-item__value' + ), + $dimensions = form.$product.find( + '.product_dimensions, .woocommerce-product-attributes-item--dimensions .woocommerce-product-attributes-item__value' + ), $qty = form.$singleVariationWrap.find( '.quantity' ), purchasable = true, variation_id = '', @@ -333,7 +370,11 @@ refSelect.find( 'option' ).removeAttr( 'disabled attached' ).removeAttr( 'selected' ); - current_attr_select.data( 'attribute_options', refSelect.find( 'option' + option_gt_filter ).get() ); // Legacy data attribute. + // Legacy data attribute. + current_attr_select.data( + 'attribute_options', + refSelect.find( 'option' + option_gt_filter ).get() + ); current_attr_select.data( 'attribute_html', refSelect.html() ); } @@ -597,7 +638,9 @@ $product_gallery = $product.find( '.images' ), $gallery_nav = $product.find( '.flex-control-nav' ), $gallery_img = $gallery_nav.find( 'li:eq(0) img' ), - $product_img_wrap = $product_gallery.find( '.woocommerce-product-gallery__image, .woocommerce-product-gallery__image--placeholder' ).eq( 0 ), + $product_img_wrap = $product_gallery + .find( '.woocommerce-product-gallery__image, .woocommerce-product-gallery__image--placeholder' ) + .eq( 0 ), $product_img = $product_img_wrap.find( '.wp-post-image' ), $product_link = $product_img_wrap.find( 'a' ).eq( 0 ); @@ -658,7 +701,9 @@ $product_gallery = $product.find( '.images' ), $gallery_nav = $product.find( '.flex-control-nav' ), $gallery_img = $gallery_nav.find( 'li:eq(0) img' ), - $product_img_wrap = $product_gallery.find( '.woocommerce-product-gallery__image, .woocommerce-product-gallery__image--placeholder' ).eq( 0 ), + $product_img_wrap = $product_gallery + .find( '.woocommerce-product-gallery__image, .woocommerce-product-gallery__image--placeholder' ) + .eq( 0 ), $product_img = $product_img_wrap.find( '.wp-post-image' ), $product_link = $product_img_wrap.find( 'a' ).eq( 0 ); diff --git a/assets/js/frontend/add-to-cart.js b/assets/js/frontend/add-to-cart.js index 8d6666c96de..6fcee7b5a74 100644 --- a/assets/js/frontend/add-to-cart.js +++ b/assets/js/frontend/add-to-cart.js @@ -17,6 +17,7 @@ jQuery( function( $ ) { .on( 'click', '.add_to_cart_button', { addToCartHandler: this }, this.onAddToCart ) .on( 'click', '.remove_from_cart_button', { addToCartHandler: this }, this.onRemoveFromCart ) .on( 'added_to_cart', this.updateButton ) + .on( 'ajax_request_not_sent.adding_to_cart', this.updateButton ) .on( 'added_to_cart removed_from_cart', { addToCartHandler: this }, this.updateFragments ); }; @@ -69,6 +70,12 @@ jQuery( function( $ ) { $thisbutton.removeClass( 'added' ); $thisbutton.addClass( 'loading' ); + // Allow 3rd parties to validate and quit early. + if ( false === $( document.body ).triggerHandler( 'should_send_ajax_request.adding_to_cart', [ $thisbutton ] ) ) { + $( document.body ).trigger( 'ajax_request_not_sent.adding_to_cart', [ false, false, $thisbutton ] ); + return true; + } + var data = {}; // Fetch changes that are directly added by calling $thisbutton.data( key, value ) @@ -159,10 +166,13 @@ jQuery( function( $ ) { if ( $button ) { $button.removeClass( 'loading' ); - $button.addClass( 'added' ); + + if ( fragments ) { + $button.addClass( 'added' ); + } // View cart text. - if ( ! wc_add_to_cart_params.is_cart && $button.parent().find( '.added_to_cart' ).length === 0 ) { + if ( fragments && ! wc_add_to_cart_params.is_cart && $button.parent().find( '.added_to_cart' ).length === 0 ) { $button.after( ' ' + wc_add_to_cart_params.i18n_view_cart + '' ); } diff --git a/assets/js/frontend/cart.js b/assets/js/frontend/cart.js index 816863ed454..622c8eb1437 100644 --- a/assets/js/frontend/cart.js +++ b/assets/js/frontend/cart.js @@ -105,7 +105,7 @@ jQuery( function( $ ) { } $( '.woocommerce-cart-form' ).replaceWith( $new_form ); - $( '.woocommerce-cart-form' ).find( ':input[name="update_cart"]' ).prop( 'disabled', true ); + $( '.woocommerce-cart-form' ).find( ':input[name="update_cart"]' ).prop( 'disabled', true ).attr( 'aria-disabled', true ); if ( $notices.length > 0 ) { show_notice( $notices ); @@ -134,7 +134,9 @@ jQuery( function( $ ) { */ var show_notice = function( html_element, $target ) { if ( ! $target ) { - $target = $( '.woocommerce-notices-wrapper:first' ) || $( '.cart-empty' ).closest( '.woocommerce' ) || $( '.woocommerce-cart-form' ); + $target = $( '.woocommerce-notices-wrapper:first' ) || + $( '.cart-empty' ).closest( '.woocommerce' ) || + $( '.woocommerce-cart-form' ); } $target.prepend( html_element ); }; @@ -188,6 +190,7 @@ jQuery( function( $ ) { shipping_method_selected: function() { var shipping_methods = {}; + // eslint-disable-next-line max-len $( 'select.shipping_method, :input[name^=shipping_method][type=radio]:checked, :input[name^=shipping_method][type=hidden]' ).each( function() { shipping_methods[ $( this ).data( 'index' ) ] = $( this ).val(); } ); @@ -301,14 +304,14 @@ jQuery( function( $ ) { '.woocommerce-cart-form .cart_item :input', this.input_changed ); - $( '.woocommerce-cart-form :input[name="update_cart"]' ).prop( 'disabled', true ); + $( '.woocommerce-cart-form :input[name="update_cart"]' ).prop( 'disabled', true ).attr( 'aria-disabled', true ); }, /** * After an input is changed, enable the update cart button. */ input_changed: function() { - $( '.woocommerce-cart-form :input[name="update_cart"]' ).prop( 'disabled', false ); + $( '.woocommerce-cart-form :input[name="update_cart"]' ).prop( 'disabled', false ).attr( 'aria-disabled', false ); }, /** diff --git a/assets/js/frontend/country-select.js b/assets/js/frontend/country-select.js index d0cbe57ba92..77b9655d214 100644 --- a/assets/js/frontend/country-select.js +++ b/assets/js/frontend/country-select.js @@ -93,7 +93,7 @@ jQuery( function( $ ) { var country = $( this ).val(), $statebox = $wrapper.find( '#billing_state, #shipping_state, #calc_shipping_state' ), - $parent = $statebox.closest( 'p.form-row' ), + $parent = $statebox.closest( '.form-row' ), input_name = $statebox.attr( 'name' ), input_id = $statebox.attr('id'), input_classes = $statebox.attr('data-input-classes'), diff --git a/assets/js/frontend/single-product.js b/assets/js/frontend/single-product.js index 30b3d6fd991..618791c6a47 100644 --- a/assets/js/frontend/single-product.js +++ b/assets/js/frontend/single-product.js @@ -9,7 +9,7 @@ jQuery( function( $ ) { $( 'body' ) // Tabs .on( 'init', '.wc-tabs-wrapper, .woocommerce-tabs', function() { - $( '.wc-tab, .woocommerce-tabs .panel:not(.panel .panel)' ).hide(); + $( this ).find( '.wc-tab, .woocommerce-tabs .panel:not(.panel .panel)' ).hide(); var hash = window.location.hash; var url = window.location.href; diff --git a/assets/js/frontend/tokenization-form.js b/assets/js/frontend/tokenization-form.js index 15e9054b7c4..3a5a8bffbad 100644 --- a/assets/js/frontend/tokenization-form.js +++ b/assets/js/frontend/tokenization-form.js @@ -22,7 +22,12 @@ jQuery( function( $ ) { this.hideSaveNewCheckbox = this.hideSaveNewCheckbox.bind( this ); // When a radio button is changed, make sure to show/hide our new CC info area. - this.$target.on( 'click change', ':input.woocommerce-SavedPaymentMethods-tokenInput', { tokenizationForm: this }, this.onTokenChange ); + this.$target.on( + 'click change', + ':input.woocommerce-SavedPaymentMethods-tokenInput', + { tokenizationForm: this }, + this.onTokenChange + ); // OR if create account is checked. $( 'input#createaccount' ).change( { tokenizationForm: this }, this.onCreateAccountChange ); diff --git a/assets/js/frontend/woocommerce.js b/assets/js/frontend/woocommerce.js index 6c6047558cd..8c0414fff1b 100644 --- a/assets/js/frontend/woocommerce.js +++ b/assets/js/frontend/woocommerce.js @@ -81,15 +81,17 @@ jQuery( function( $ ) { // Show password visiblity hover icon on woocommerce forms $( '.woocommerce form .woocommerce-Input[type="password"]' ).wrap( '' ); + // Add 'password-input' class to the password wrapper in checkout page. + $( '.woocommerce form input' ).filter(':password').parent('span').addClass('password-input'); $( '.password-input' ).append( '' ); $( '.show-password-input' ).click( function() { $( this ).toggleClass( 'display-password' ); if ( $( this ).hasClass( 'display-password' ) ) { - $( this ).siblings( ['input[name^="password"]', 'input[type="password"]'] ).prop( 'type', 'text' ); + $( this ).siblings( ['input[type="password"]'] ).prop( 'type', 'text' ); } else { - $( this ).siblings( 'input[name^="password"]' ).prop( 'type', 'password' ); + $( this ).siblings( 'input[type="text"]' ).prop( 'type', 'password' ); } } ); diff --git a/assets/js/selectWoo/selectWoo.full.js b/assets/js/selectWoo/selectWoo.full.js index 613204ba441..23548fce727 100644 --- a/assets/js/selectWoo/selectWoo.full.js +++ b/assets/js/selectWoo/selectWoo.full.js @@ -755,6 +755,12 @@ S2.define('select2/utils',[ }); }; + Utils.entityDecode = function(html) { + var txt = document.createElement("textarea"); + txt.innerHTML = html; + return txt.value; + } + // Append an array of jQuery nodes to a given element. Utils.appendMany = function ($element, $nodes) { // jQuery 1.7.x does not support $.fn.append() with an array @@ -1611,9 +1617,9 @@ S2.define('select2/selection/single',[ var selection = data[0]; var $rendered = this.$selection.find('.select2-selection__rendered'); - var formatted = this.display(selection, $rendered); + var formatted = Utils.entityDecode(this.display(selection, $rendered)); - $rendered.empty().append(formatted); + $rendered.empty().text(formatted); $rendered.prop('title', selection.title || selection.text); }; @@ -1742,12 +1748,14 @@ S2.define('select2/selection/multiple',[ var selection = data[d]; var $selection = this.selectionContainer(); + var removeItemTag = $selection.html(); var formatted = this.display(selection, $selection); if ('string' === typeof formatted) { - formatted = formatted.trim(); + formatted = Utils.entityDecode(formatted.trim()); } - $selection.append(formatted); + $selection.text(formatted); + $selection.prepend(removeItemTag); $selection.prop('title', selection.title || selection.text); $selection.data('data', selection); @@ -1786,7 +1794,7 @@ S2.define('select2/selection/placeholder',[ Placeholder.prototype.createPlaceholder = function (decorated, placeholder) { var $placeholder = this.selectionContainer(); - $placeholder.html(this.display(placeholder)); + $placeholder.text(Utils.entityDecode(this.display(placeholder))); $placeholder.addClass('select2-selection__placeholder') .removeClass('select2-selection__choice'); diff --git a/assets/js/selectWoo/selectWoo.full.min.js b/assets/js/selectWoo/selectWoo.full.min.js index 4654399e175..11e22517352 100644 --- a/assets/js/selectWoo/selectWoo.full.min.js +++ b/assets/js/selectWoo/selectWoo.full.min.js @@ -5,7 +5,7 @@ * Released under the MIT license * https://github.com/woocommerce/selectWoo/blob/master/LICENSE.md */ -!function(n){"function"==typeof define&&define.amd?define(["jquery"],n):"object"==typeof module&&module.exports?module.exports=function(e,t){return t===undefined&&(t="undefined"!=typeof window?require("jquery"):require("jquery")(e)),n(t),t}:n(jQuery)}(function(i){var e=function(){if(i&&i.fn&&i.fn.select2&&i.fn.select2.amd)var e=i.fn.select2.amd;var t,o,c,n;return e&&e.requirejs||(e?o=e:e={},function(h){var s,r,f,g,m={},v={},y={},w={},n=Object.prototype.hasOwnProperty,i=[].slice,_=/\.js$/;function $(e,t){return n.call(e,t)}function a(e,t){var n,i,o,s,r,a,l,c,u,d,p,h=t&&t.split("/"),f=y.map,g=f&&f["*"]||{};if(e){for(r=(e=e.split("/")).length-1,y.nodeIdCompat&&_.test(e[r])&&(e[r]=e[r].replace(_,"")),"."===e[0].charAt(0)&&h&&(e=h.slice(0,h.length-1).concat(e)),u=0;u