author | Justin Dolske <dolske@mozilla.com> |
Thu, 18 Jun 2015 16:52:26 -0700 | |
changeset 249652 | 39cd581fcc1468cf108a0e65c6a3e286505bf72e |
parent 249651 | 60db000f3acb5cde64810d3198aee20c89dc1f7c |
child 249653 | 134465d1ec047c131261d2f176ad8935f42f3bb4 |
push id | 28935 |
push user | ryanvm@gmail.com |
push date | Fri, 19 Jun 2015 20:33:03 +0000 |
treeherder | mozilla-central@b6fe3099f8f6 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | jaws |
bugs | 1172226 |
milestone | 41.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
|
--- a/browser/components/about/AboutRedirector.cpp +++ b/browser/components/about/AboutRedirector.cpp @@ -118,16 +118,28 @@ static RedirEntry kRedirMap[] = { // Shares an IndexedDB origin with about:loopconversation. "loopconversation" }, { "reader", "chrome://global/content/reader/aboutReader.html", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::URI_MUST_LOAD_IN_CHILD | nsIAboutModule::MAKE_UNLINKABLE | nsIAboutModule::HIDE_FROM_ABOUTABOUT }, + { + "pocket-saved", "chrome://browser/content/pocket/panels/saved.html", + nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | + nsIAboutModule::ALLOW_SCRIPT | + nsIAboutModule::HIDE_FROM_ABOUTABOUT | + nsIAboutModule::MAKE_UNLINKABLE }, + { + "pocket-signup", "chrome://browser/content/pocket/panels/signup.html", + nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | + nsIAboutModule::ALLOW_SCRIPT | + nsIAboutModule::HIDE_FROM_ABOUTABOUT | + nsIAboutModule::MAKE_UNLINKABLE }, }; static const int kRedirTotal = ArrayLength(kRedirMap); static nsAutoCString GetAboutModuleName(nsIURI *aURI) { nsAutoCString path; aURI->GetPath(path);
--- a/browser/components/build/nsModule.cpp +++ b/browser/components/build/nsModule.cpp @@ -110,16 +110,18 @@ static const mozilla::Module::ContractID #ifdef MOZ_SERVICES_HEALTHREPORT { NS_ABOUT_MODULE_CONTRACTID_PREFIX "healthreport", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, #endif { NS_ABOUT_MODULE_CONTRACTID_PREFIX "app-manager", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, { NS_ABOUT_MODULE_CONTRACTID_PREFIX "customizing", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, { NS_ABOUT_MODULE_CONTRACTID_PREFIX "looppanel", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, { NS_ABOUT_MODULE_CONTRACTID_PREFIX "loopconversation", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, { NS_ABOUT_MODULE_CONTRACTID_PREFIX "reader", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, + { NS_ABOUT_MODULE_CONTRACTID_PREFIX "pocket-saved", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, + { NS_ABOUT_MODULE_CONTRACTID_PREFIX "pocket-signup", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, #if defined(XP_WIN) { NS_IEHISTORYENUMERATOR_CONTRACTID, &kNS_WINIEHISTORYENUMERATOR_CID }, #elif defined(XP_MACOSX) { NS_SHELLSERVICE_CONTRACTID, &kNS_SHELLSERVICE_CID }, #endif { nullptr } };
--- a/browser/components/pocket/main.js +++ b/browser/components/pocket/main.js @@ -316,17 +316,17 @@ var pktUI = (function() { if (inOverflowMenu) { variant = 'overflow'; } else { variant = pktApi.getSignupAB(); } - var panelId = showPanel("chrome://browser/content/pocket/panels/signup.html?pockethost=" + Services.prefs.getCharPref("browser.pocket.site") + "&fxasignedin=" + fxasignedin + "&variant=" + variant + '&inoverflowmenu=' + inOverflowMenu + "&locale=" + getUILocale(), { + var panelId = showPanel("about:pocket-signup?pockethost=" + Services.prefs.getCharPref("browser.pocket.site") + "&fxasignedin=" + fxasignedin + "&variant=" + variant + '&inoverflowmenu=' + inOverflowMenu + "&locale=" + getUILocale(), { onShow: function() { }, onHide: panelDidHide, width: inOverflowMenu ? overflowMenuWidth : 300, height: startheight }); }); } @@ -344,17 +344,17 @@ var pktUI = (function() { var isValidURL = (typeof url !== 'undefined' && (url.startsWith("http") || url.startsWith('https'))); var inOverflowMenu = isInOverflowMenu(); var startheight = pktApi.isPremiumUser() && isValidURL ? savePanelHeights.expanded : savePanelHeights.collapsed; if (inOverflowMenu) { startheight = overflowMenuHeight; } - var panelId = showPanel("chrome://browser/content/pocket/panels/saved.html?pockethost=" + Services.prefs.getCharPref("browser.pocket.site") + "&premiumStatus=" + (pktApi.isPremiumUser() ? '1' : '0') + '&inoverflowmenu='+inOverflowMenu + "&locale=" + getUILocale(), { + var panelId = showPanel("about:pocket-saved?pockethost=" + Services.prefs.getCharPref("browser.pocket.site") + "&premiumStatus=" + (pktApi.isPremiumUser() ? '1' : '0') + '&inoverflowmenu='+inOverflowMenu + "&locale=" + getUILocale(), { onShow: function() { var saveLinkMessageId = 'saveLink'; // Send error message for invalid url if (!isValidURL) { // TODO: Pass key for localized error in error object var error = { message: 'Only links can be saved',
--- a/browser/components/pocket/panels/saved.html +++ b/browser/components/pocket/panels/saved.html @@ -1,11 +1,13 @@ <!DOCTYPE html> <html> <head> + <meta charset="utf-8"> + <base href="chrome://browser/content/pocket/panels/"> <title>Pocket: Page Saved</title> <link rel="stylesheet" href="css/normalize.css"> <link rel="stylesheet" href="css/firasans.css"> <link rel="stylesheet" href="css/saved.css"> </head> <body class="pkt_ext_containersaved" aria-live="polite"> <script type="text/javascript" src="js/vendor/jquery-2.1.1.min.js"></script> <script type="text/javascript" src="js/vendor/handlebars.runtime.js"></script>
--- a/browser/components/pocket/panels/signup.html +++ b/browser/components/pocket/panels/signup.html @@ -1,11 +1,13 @@ <!DOCTYPE html> <html> <head> + <meta charset="utf-8"> + <base href="chrome://browser/content/pocket/panels/"> <title>Pocket: Sign Up</title> <link rel="stylesheet" href="css/normalize.css"> <link rel="stylesheet" href="css/firasans.css"> <link rel="stylesheet" href="css/signup.css"> </head> <body class="pkt_ext_containersignup" aria-live="polite"> <script type="text/javascript" src="js/vendor/jquery-2.1.1.min.js"></script> <script type="text/javascript" src="js/vendor/handlebars.runtime.js"></script>