Commit 384f989f authored by Cosmin Sabou's avatar Cosmin Sabou
Browse files

Backed out changeset a8fef6308479 (bug 1457287) for conflicts during backout. CLOSED TREE

--HG--
rename : browser/components/payments/.eslintrc.js => toolkit/components/payments/.eslintrc.js
rename : browser/components/payments/content/paymentDialogFrameScript.js => toolkit/components/payments/content/paymentDialogFrameScript.js
rename : browser/components/payments/content/paymentDialogWrapper.css => toolkit/components/payments/content/paymentDialogWrapper.css
rename : browser/components/payments/content/paymentDialogWrapper.js => toolkit/components/payments/content/paymentDialogWrapper.js
rename : browser/components/payments/content/paymentDialogWrapper.xhtml => toolkit/components/payments/content/paymentDialogWrapper.xhtml
rename : browser/components/payments/docs/index.rst => toolkit/components/payments/docs/index.rst
rename : browser/components/payments/jar.mn => toolkit/components/payments/jar.mn
rename : browser/components/payments/moz.build => toolkit/components/payments/moz.build
rename : browser/components/payments/paymentUIService.js => toolkit/components/payments/paymentUIService.js
rename : browser/components/payments/payments.manifest => toolkit/components/payments/payments.manifest
rename : browser/components/payments/res/PaymentsStore.js => toolkit/components/payments/res/PaymentsStore.js
rename : browser/components/payments/res/components/address-option.css => toolkit/components/payments/res/components/address-option.css
rename : browser/components/payments/res/components/address-option.js => toolkit/components/payments/res/components/address-option.js
rename : browser/components/payments/res/components/basic-card-option.css => toolkit/components/payments/res/components/basic-card-option.css
rename : browser/components/payments/res/components/basic-card-option.js => toolkit/components/payments/res/components/basic-card-option.js
rename : browser/components/payments/res/components/currency-amount.js => toolkit/components/payments/res/components/currency-amount.js
rename : browser/components/payments/res/components/labelled-checkbox.js => toolkit/components/payments/res/components/labelled-checkbox.js
rename : browser/components/payments/res/components/payment-details-item.css => toolkit/components/payments/res/components/payment-details-item.css
rename : browser/components/payments/res/components/payment-details-item.js => toolkit/components/payments/res/components/payment-details-item.js
rename : browser/components/payments/res/components/rich-option.js => toolkit/components/payments/res/components/rich-option.js
rename : browser/components/payments/res/components/rich-select.css => toolkit/components/payments/res/components/rich-select.css
rename : browser/components/payments/res/components/rich-select.js => toolkit/components/payments/res/components/rich-select.js
rename : browser/components/payments/res/components/shipping-option.css => toolkit/components/payments/res/components/shipping-option.css
rename : browser/components/payments/res/components/shipping-option.js => toolkit/components/payments/res/components/shipping-option.js
rename : browser/components/payments/res/containers/address-form.js => toolkit/components/payments/res/containers/address-form.js
rename : browser/components/payments/res/containers/address-picker.js => toolkit/components/payments/res/containers/address-picker.js
rename : browser/components/payments/res/containers/basic-card-form.js => toolkit/components/payments/res/containers/basic-card-form.js
rename : browser/components/payments/res/containers/order-details.css => toolkit/components/payments/res/containers/order-details.css
rename : browser/components/payments/res/containers/order-details.js => toolkit/components/payments/res/containers/order-details.js
rename : browser/components/payments/res/containers/payment-dialog.js => toolkit/components/payments/res/containers/payment-dialog.js
rename : browser/components/payments/res/containers/payment-method-picker.js => toolkit/components/payments/res/containers/payment-method-picker.js
rename : browser/components/payments/res/containers/shipping-option-picker.js => toolkit/components/payments/res/containers/shipping-option-picker.js
rename : browser/components/payments/res/debugging.css => toolkit/components/payments/res/debugging.css
rename : browser/components/payments/res/debugging.html => toolkit/components/payments/res/debugging.html
rename : browser/components/payments/res/debugging.js => toolkit/components/payments/res/debugging.js
rename : browser/components/payments/res/mixins/ObservedPropertiesMixin.js => toolkit/components/payments/res/mixins/ObservedPropertiesMixin.js
rename : browser/components/payments/res/mixins/PaymentStateSubscriberMixin.js => toolkit/components/payments/res/mixins/PaymentStateSubscriberMixin.js
rename : browser/components/payments/res/paymentRequest.css => toolkit/components/payments/res/paymentRequest.css
rename : browser/components/payments/res/paymentRequest.js => toolkit/components/payments/res/paymentRequest.js
rename : browser/components/payments/res/paymentRequest.xhtml => toolkit/components/payments/res/paymentRequest.xhtml
rename : browser/components/payments/res/unprivileged-fallbacks.js => toolkit/components/payments/res/unprivileged-fallbacks.js
rename : browser/components/payments/res/vendor/custom-elements.min.js => toolkit/components/payments/res/vendor/custom-elements.min.js
rename : browser/components/payments/res/vendor/custom-elements.min.js.map => toolkit/components/payments/res/vendor/custom-elements.min.js.map
rename : browser/components/payments/server.py => toolkit/components/payments/server.py
rename : browser/components/payments/test/PaymentTestUtils.jsm => toolkit/components/payments/test/PaymentTestUtils.jsm
rename : browser/components/payments/test/browser/.eslintrc.js => toolkit/components/payments/test/browser/.eslintrc.js
rename : browser/components/payments/test/browser/blank_page.html => toolkit/components/payments/test/browser/blank_page.html
rename : browser/components/payments/test/browser/browser.ini => toolkit/components/payments/test/browser/browser.ini
rename : browser/components/payments/test/browser/browser_address_edit.js => toolkit/components/payments/test/browser/browser_address_edit.js
rename : browser/components/payments/test/browser/browser_card_edit.js => toolkit/components/payments/test/browser/browser_card_edit.js
rename : browser/components/payments/test/browser/browser_change_shipping.js => toolkit/components/payments/test/browser/browser_change_shipping.js
rename : browser/components/payments/test/browser/browser_host_name.js => toolkit/components/payments/test/browser/browser_host_name.js
rename : browser/components/payments/test/browser/browser_profile_storage.js => toolkit/components/payments/test/browser/browser_profile_storage.js
rename : browser/components/payments/test/browser/browser_request_serialization.js => toolkit/components/payments/test/browser/browser_request_serialization.js
rename : browser/components/payments/test/browser/browser_request_shipping.js => toolkit/components/payments/test/browser/browser_request_shipping.js
rename : browser/components/payments/test/browser/browser_request_summary.js => toolkit/components/payments/test/browser/browser_request_summary.js
rename : browser/components/payments/test/browser/browser_shippingaddresschange_error.js => toolkit/components/payments/test/browser/browser_shippingaddresschange_error.js
rename : browser/components/payments/test/browser/browser_show_dialog.js => toolkit/components/payments/test/browser/browser_show_dialog.js
rename : browser/components/payments/test/browser/browser_total.js => toolkit/components/payments/test/browser/browser_total.js
rename : browser/components/payments/test/browser/head.js => toolkit/components/payments/test/browser/head.js
rename : browser/components/payments/test/mochitest/.eslintrc.js => toolkit/components/payments/test/mochitest/.eslintrc.js
rename : browser/components/payments/test/mochitest/formautofill/mochitest.ini => toolkit/components/payments/test/mochitest/formautofill/mochitest.ini
rename : browser/components/payments/test/mochitest/formautofill/test_editCreditCard.html => toolkit/components/payments/test/mochitest/formautofill/test_editCreditCard.html
rename : browser/components/payments/test/mochitest/mochitest.ini => toolkit/components/payments/test/mochitest/mochitest.ini
rename : browser/components/payments/test/mochitest/payments_common.js => toolkit/components/payments/test/mochitest/payments_common.js
rename : browser/components/payments/test/mochitest/test_ObservedPropertiesMixin.html => toolkit/components/payments/test/mochitest/test_ObservedPropertiesMixin.html
rename : browser/components/payments/test/mochitest/test_PaymentStateSubscriberMixin.html => toolkit/components/payments/test/mochitest/test_PaymentStateSubscriberMixin.html
rename : browser/components/payments/test/mochitest/test_PaymentsStore.html => toolkit/components/payments/test/mochitest/test_PaymentsStore.html
rename : browser/components/payments/test/mochitest/test_address_form.html => toolkit/components/payments/test/mochitest/test_address_form.html
rename : browser/components/payments/test/mochitest/test_address_picker.html => toolkit/components/payments/test/mochitest/test_address_picker.html
rename : browser/components/payments/test/mochitest/test_basic_card_form.html => toolkit/components/payments/test/mochitest/test_basic_card_form.html
rename : browser/components/payments/test/mochitest/test_currency_amount.html => toolkit/components/payments/test/mochitest/test_currency_amount.html
rename : browser/components/payments/test/mochitest/test_labelled_checkbox.html => toolkit/components/payments/test/mochitest/test_labelled_checkbox.html
rename : browser/components/payments/test/mochitest/test_order_details.html => toolkit/components/payments/test/mochitest/test_order_details.html
rename : browser/components/payments/test/mochitest/test_payer_address_picker.html => toolkit/components/payments/test/mochitest/test_payer_address_picker.html
rename : browser/components/payments/test/mochitest/test_payment_details_item.html => toolkit/components/payments/test/mochitest/test_payment_details_item.html
rename : browser/components/payments/test/mochitest/test_payment_dialog.html => toolkit/components/payments/test/mochitest/test_payment_dialog.html
rename : browser/components/payments/test/mochitest/test_payment_method_picker.html => toolkit/components/payments/test/mochitest/test_payment_method_picker.html
rename : browser/components/payments/test/mochitest/test_rich_select.html => toolkit/components/payments/test/mochitest/test_rich_select.html
rename : browser/components/payments/test/mochitest/test_shipping_option_picker.html => toolkit/components/payments/test/mochitest/test_shipping_option_picker.html
rename : browser/components/payments/test/unit/.eslintrc.js => toolkit/components/payments/test/unit/.eslintrc.js
rename : browser/components/payments/test/unit/head.js => toolkit/components/payments/test/unit/head.js
rename : browser/components/payments/test/unit/test_response_creation.js => toolkit/components/payments/test/unit/test_response_creation.js
rename : browser/components/payments/test/unit/xpcshell.ini => toolkit/components/payments/test/unit/xpcshell.ini
parent 067b54b5
......@@ -387,11 +387,11 @@ toolkit/components/workerloader/tests/moduleF-syntax-error.js
toolkit/modules/tests/xpcshell/test_task.js
# External code:
browser/components/payments/res/vendor/*
toolkit/components/microformats/test/**
toolkit/components/microformats/microformat-shiv.js
toolkit/components/reader/Readability.js
toolkit/components/reader/JSDOMParser.js
toolkit/components/payments/res/vendor/*
# Uses preprocessing
toolkit/content/widgets/wizard.xml
......
......@@ -10,9 +10,9 @@ const kWhitelist = new Set([
]);
const kESModuleList = new Set([
/browser\/res\/payments\/(components|containers|mixins)\/.*\.js$/,
/browser\/res\/payments\/paymentRequest\.js$/,
/browser\/res\/payments\/PaymentsStore\.js$/,
/toolkit\/res\/payments\/(components|containers|mixins)\/.*\.js$/,
/toolkit\/res\/payments\/paymentRequest\.js$/,
/toolkit\/res\/payments\/PaymentsStore\.js$/,
]);
// Normally we would use reflect.jsm to get Reflect.parse. However, if
......
......@@ -59,9 +59,6 @@ DIRS += [
DIRS += ['build']
if CONFIG['NIGHTLY_BUILD']:
DIRS += ['payments']
XPIDL_SOURCES += [
'nsIBrowserHandler.idl',
]
......
......@@ -145,8 +145,8 @@ browser/chrome/browser/content/branding/icon128.png
browser/chrome/devtools/content/framework/dev-edition-promo/dev-edition-logo.png
# Bug 1451016 - Nightly-only PaymentRequest & Form Autofill code sharing.
browser/features/formautofill@mozilla.org/chrome/content/editAddress.xhtml
browser/chrome/browser/res/payments/formautofill/editAddress.xhtml
chrome/toolkit/res/payments/formautofill/editAddress.xhtml
browser/features/formautofill@mozilla.org/chrome/content/editCreditCard.xhtml
browser/chrome/browser/res/payments/formautofill/editCreditCard.xhtml
chrome/toolkit/res/payments/formautofill/editCreditCard.xhtml
browser/features/formautofill@mozilla.org/chrome/content/autofillEditForms.js
browser/chrome/browser/res/payments/formautofill/autofillEditForms.js
chrome/toolkit/res/payments/formautofill/autofillEditForms.js
......@@ -206,8 +206,8 @@
@RESPATH@/components/nsSearchSuggestions.js
@RESPATH@/components/nsSidebar.js
#ifdef NIGHTLY_BUILD
@RESPATH@/browser/components/payments.manifest
@RESPATH@/browser/components/paymentUIService.js
@RESPATH@/components/payments.manifest
@RESPATH@/components/paymentUIService.js
#endif
@RESPATH@/components/passwordmgr.manifest
@RESPATH@/components/nsLoginInfo.js
......
......@@ -109,5 +109,8 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
'nsDefaultCLH.manifest',
]
if CONFIG['NIGHTLY_BUILD'] and CONFIG['MOZ_BUILD_APP'] == 'browser':
DIRS += ['payments']
if CONFIG['MOZ_BUILD_APP'] == 'browser':
DIRS += ['normandy']
......@@ -21,17 +21,17 @@ ChromeUtils.defineModuleGetter(this, "PrivateBrowsingUtils",
"resource://gre/modules/PrivateBrowsingUtils.jsm");
XPCOMUtils.defineLazyGetter(this, "formAutofillStorage", () => {
let storage;
let formAutofillStorage;
try {
storage = ChromeUtils.import("resource://formautofill/FormAutofillStorage.jsm", {})
.storage;
storage.initialize();
formAutofillStorage = ChromeUtils.import("resource://formautofill/FormAutofillStorage.jsm", {})
.formAutofillStorage;
formAutofillStorage.initialize();
} catch (ex) {
storage = null;
formAutofillStorage = null;
Cu.reportError(ex);
}
return storage;
return formAutofillStorage;
});
var paymentDialogWrapper = {
......
......@@ -26,7 +26,7 @@ Set the pref ``dom.payments.loglevel`` to "Debug" to increase the verbosity of c
Unprivileged UI Development
---------------------------
During development of the unprivileged custom elements, you can load the dialog from a
local server without even requiring a build. Simply run `./mach python browser/components/payments/server.py`
local server without even requiring a build. Simply run `./mach python toolkit/components/payments/server.py`
then load `http://localhost:8000/paymentRequest.xhtml?debug=1` in the browser.
Use the debugging console to load sample data.
......
......@@ -2,7 +2,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
browser.jar:
toolkit.jar:
% content payments %content/payments/
content/payments/paymentDialogFrameScript.js (content/paymentDialogFrameScript.js)
content/payments/paymentDialogWrapper.css (content/paymentDialogWrapper.css)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment