Bug 1435105 - Rename 'shippingRequested' class to 'shipping-related' to make the name clearer as well as follow file conventions. r=mattn
authorJared Wein <jwein@mozilla.com>
Thu, 22 Feb 2018 21:39:59 -0800
changeset 405072 7ab2c2f8a7116d9f1d34ef57d4f6c5875f5b51b1
parent 405071 cc27f207449530ba6aa3e20ee10d82499ec2571f
child 405073 7d2ee8a67b714972f5f83e60e5e56b3d424fa597
push id100152
push userjwein@mozilla.com
push dateFri, 23 Feb 2018 19:03:22 +0000
treeherdermozilla-inbound@7ab2c2f8a711 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmattn
bugs1435105
milestone60.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1435105 - Rename 'shippingRequested' class to 'shipping-related' to make the name clearer as well as follow file conventions. r=mattn MozReview-Commit-ID: 6Dgzt69fFFq
toolkit/components/payments/res/containers/payment-dialog.js
toolkit/components/payments/res/paymentRequest.xhtml
--- a/toolkit/components/payments/res/containers/payment-dialog.js
+++ b/toolkit/components/payments/res/containers/payment-dialog.js
@@ -27,17 +27,17 @@ class PaymentDialog extends PaymentState
     this._payButton = contents.querySelector("#pay");
     this._payButton.addEventListener("click", this);
 
     this._viewAllButton = contents.querySelector("#view-all");
     this._viewAllButton.addEventListener("click", this);
 
     this._orderDetailsOverlay = contents.querySelector("#order-details-overlay");
     this._shippingTypeLabel = contents.querySelector("#shipping-type-label");
-    this._shippingRequestedEls = contents.querySelectorAll(".shippingRequested");
+    this._shippingRelatedEls = contents.querySelectorAll(".shipping-related");
     this._errorText = contents.querySelector("#error-text");
 
     this._disabledOverlay = contents.getElementById("disabled-overlay");
 
     this.appendChild(contents);
 
     super.connectedCallback();
   }
@@ -186,17 +186,17 @@ class PaymentDialog extends PaymentState
     let totalItem = paymentDetails.totalItem;
     let totalAmountEl = this.querySelector("#total > currency-amount");
     totalAmountEl.value = totalItem.amount.value;
     totalAmountEl.currency = totalItem.amount.currency;
 
     this._orderDetailsOverlay.hidden = !state.orderDetailsShowing;
     this._errorText.textContent = paymentDetails.error;
     let paymentOptions = request.paymentOptions;
-    for (let element of this._shippingRequestedEls) {
+    for (let element of this._shippingRelatedEls) {
       element.hidden = !paymentOptions.requestShipping;
     }
     let shippingType = paymentOptions.shippingType || "shipping";
     this._shippingTypeLabel.querySelector("label").textContent =
       this._shippingTypeLabel.dataset[shippingType + "AddressLabel"];
 
     this._renderPayButton(state);
 
--- a/toolkit/components/payments/res/paymentRequest.xhtml
+++ b/toolkit/components/payments/res/paymentRequest.xhtml
@@ -62,24 +62,24 @@
       </div>
     </header>
 
     <div id="main-container">
       <section id="payment-summary">
         <h1>&paymentSummaryTitle;</h1>
 
         <section>
-          <div class="shippingRequested"
+          <div class="shipping-related"
                id="shipping-type-label"
                data-shipping-address-label="&shippingAddressLabel;"
                data-delivery-address-label="&deliveryAddressLabel;"
                data-pickup-address-label="&pickupAddressLabel;"><label></label></div>
-          <address-picker class="shippingRequested" selected-state-key="selectedShippingAddress"></address-picker>
-          <div class="shippingRequested"><label>&shippingOptionsLabel;</label></div>
-          <shipping-option-picker class="shippingRequested"></shipping-option-picker>
+          <address-picker class="shipping-related" selected-state-key="selectedShippingAddress"></address-picker>
+          <div class="shipping-related"><label>&shippingOptionsLabel;</label></div>
+          <shipping-option-picker class="shipping-related"></shipping-option-picker>
           <div><label>&paymentMethodsLabel;</label></div>
           <payment-method-picker selected-state-key="selectedPaymentCard"></payment-method-picker>
           <div id="error-text"></div>
         </section>
 
         <footer id="controls-container">
           <button id="cancel">&cancelPaymentButton.label;</button>
           <button id="pay"