From d02123188828cbffaabc47486baf768dfbb9d1e3 Mon Sep 17 00:00:00 2001 From: ScottDowne Date: Fri, 12 Oct 2018 19:38:10 +0000 Subject: [PATCH] Fixes bug 1488813 - Migrating Pocket off any bootstrap code r=ursula,k88hudson Differential Revision: https://phabricator.services.mozilla.com/D6849 --HG-- rename : browser/extensions/pocket/content/AboutPocket.jsm => browser/components/pocket/content/AboutPocket.jsm rename : browser/extensions/pocket/content/Pocket.jsm => browser/components/pocket/content/Pocket.jsm rename : browser/extensions/pocket/bootstrap.js => browser/components/pocket/content/SaveToPocket.jsm rename : browser/extensions/pocket/content/main.js => browser/components/pocket/content/main.js rename : browser/extensions/pocket/content/panels/css/normalize.css => browser/components/pocket/content/panels/css/normalize.css rename : browser/extensions/pocket/content/panels/css/saved.css => browser/components/pocket/content/panels/css/saved.css rename : browser/extensions/pocket/content/panels/css/sendtomobile.css => browser/components/pocket/content/panels/css/sendtomobile.css rename : browser/extensions/pocket/content/panels/css/signup.css => browser/components/pocket/content/panels/css/signup.css rename : browser/extensions/pocket/content/panels/fonts/FiraSans-Regular.woff => browser/components/pocket/content/panels/fonts/FiraSans-Regular.woff rename : browser/extensions/pocket/content/panels/img/app_store_dowload_apple.svg => browser/components/pocket/content/panels/img/app_store_dowload_apple.svg rename : browser/extensions/pocket/content/panels/img/pocket-outline.svg => browser/components/pocket/content/panels/img/pocket-outline.svg rename : browser/extensions/pocket/content/panels/img/pocketerror@1x.png => browser/components/pocket/content/panels/img/pocketerror@1x.png rename : browser/extensions/pocket/content/panels/img/pocketerror@2x.png => browser/components/pocket/content/panels/img/pocketerror@2x.png rename : browser/extensions/pocket/content/panels/img/pocketlogo@1x.png => browser/components/pocket/content/panels/img/pocketlogo@1x.png rename : browser/extensions/pocket/content/panels/img/pocketlogo@2x.png => browser/components/pocket/content/panels/img/pocketlogo@2x.png rename : browser/extensions/pocket/content/panels/img/pocketlogosolo@1x.png => browser/components/pocket/content/panels/img/pocketlogosolo@1x.png rename : browser/extensions/pocket/content/panels/img/pocketlogosolo@2x.png => browser/components/pocket/content/panels/img/pocketlogosolo@2x.png rename : browser/extensions/pocket/content/panels/img/pocketsignup_button@1x.png => browser/components/pocket/content/panels/img/pocketsignup_button@1x.png rename : browser/extensions/pocket/content/panels/img/pocketsignup_button@2x.png => browser/components/pocket/content/panels/img/pocketsignup_button@2x.png rename : browser/extensions/pocket/content/panels/img/pocketsignup_devices@1x.png => browser/components/pocket/content/panels/img/pocketsignup_devices@1x.png rename : browser/extensions/pocket/content/panels/img/pocketsignup_devices@2x.png => browser/components/pocket/content/panels/img/pocketsignup_devices@2x.png rename : browser/extensions/pocket/content/panels/img/pocketsignup_hero@1x.png => browser/components/pocket/content/panels/img/pocketsignup_hero@1x.png rename : browser/extensions/pocket/content/panels/img/pocketsignup_hero@2x.png => browser/components/pocket/content/panels/img/pocketsignup_hero@2x.png rename : browser/extensions/pocket/content/panels/img/signup_firefoxlogo@1x.png => browser/components/pocket/content/panels/img/signup_firefoxlogo@1x.png rename : browser/extensions/pocket/content/panels/img/signup_firefoxlogo@2x.png => browser/components/pocket/content/panels/img/signup_firefoxlogo@2x.png rename : browser/extensions/pocket/content/panels/img/signup_help@1x.png => browser/components/pocket/content/panels/img/signup_help@1x.png rename : browser/extensions/pocket/content/panels/img/signup_help@2x.png => browser/components/pocket/content/panels/img/signup_help@2x.png rename : browser/extensions/pocket/content/panels/img/tag_close@1x.png => browser/components/pocket/content/panels/img/tag_close@1x.png rename : browser/extensions/pocket/content/panels/img/tag_close@2x.png => browser/components/pocket/content/panels/img/tag_close@2x.png rename : browser/extensions/pocket/content/panels/img/tag_closeactive@1x.png => browser/components/pocket/content/panels/img/tag_closeactive@1x.png rename : browser/extensions/pocket/content/panels/img/tag_closeactive@2x.png => browser/components/pocket/content/panels/img/tag_closeactive@2x.png rename : browser/extensions/pocket/content/panels/js/messages.js => browser/components/pocket/content/panels/js/messages.js rename : browser/extensions/pocket/content/panels/js/saved.js => browser/components/pocket/content/panels/js/saved.js rename : browser/extensions/pocket/content/panels/js/sendtomobile.js => browser/components/pocket/content/panels/js/sendtomobile.js rename : browser/extensions/pocket/content/panels/js/signup.js => browser/components/pocket/content/panels/js/signup.js rename : browser/extensions/pocket/content/panels/js/tmpl.js => browser/components/pocket/content/panels/js/tmpl.js rename : browser/extensions/pocket/content/panels/js/vendor/handlebars.runtime.js => browser/components/pocket/content/panels/js/vendor/handlebars.runtime.js rename : browser/extensions/pocket/content/panels/js/vendor/jquery-2.1.1.min.js => browser/components/pocket/content/panels/js/vendor/jquery-2.1.1.min.js rename : browser/extensions/pocket/content/panels/js/vendor/jquery.tokeninput.min.js => browser/components/pocket/content/panels/js/vendor/jquery.tokeninput.min.js rename : browser/extensions/pocket/content/panels/license.txt => browser/components/pocket/content/panels/license.txt rename : browser/extensions/pocket/content/panels/saved.html => browser/components/pocket/content/panels/saved.html rename : browser/extensions/pocket/content/panels/signup.html => browser/components/pocket/content/panels/signup.html rename : browser/extensions/pocket/content/panels/tmpl/ho2/ho2_articleinfo.handlebars => browser/components/pocket/content/panels/tmpl/ho2/ho2_articleinfo.handlebars rename : browser/extensions/pocket/content/panels/tmpl/ho2/ho2_download.handlebars => browser/components/pocket/content/panels/tmpl/ho2/ho2_download.handlebars rename : browser/extensions/pocket/content/panels/tmpl/ho2/ho2_download_error.handlebars => browser/components/pocket/content/panels/tmpl/ho2/ho2_download_error.handlebars rename : browser/extensions/pocket/content/panels/tmpl/ho2/ho2_sharebutton_v1.handlebars => browser/components/pocket/content/panels/tmpl/ho2/ho2_sharebutton_v1.handlebars rename : browser/extensions/pocket/content/panels/tmpl/ho2/ho2_sharebutton_v2.handlebars => browser/components/pocket/content/panels/tmpl/ho2/ho2_sharebutton_v2.handlebars rename : browser/extensions/pocket/content/panels/tmpl/ho2/ho2_sharebutton_v3.handlebars => browser/components/pocket/content/panels/tmpl/ho2/ho2_sharebutton_v3.handlebars rename : browser/extensions/pocket/content/panels/tmpl/saved_premiumextras.handlebars => browser/components/pocket/content/panels/tmpl/saved_premiumextras.handlebars rename : browser/extensions/pocket/content/panels/tmpl/saved_premiumshell.handlebars => browser/components/pocket/content/panels/tmpl/saved_premiumshell.handlebars rename : browser/extensions/pocket/content/panels/tmpl/saved_shell.handlebars => browser/components/pocket/content/panels/tmpl/saved_shell.handlebars rename : browser/extensions/pocket/content/panels/tmpl/saved_tmplogin.handlebars => browser/components/pocket/content/panels/tmpl/saved_tmplogin.handlebars rename : browser/extensions/pocket/content/panels/tmpl/signup_shell.handlebars => browser/components/pocket/content/panels/tmpl/signup_shell.handlebars rename : browser/extensions/pocket/content/panels/tmpl/signupstoryboard_shell.handlebars => browser/components/pocket/content/panels/tmpl/signupstoryboard_shell.handlebars rename : browser/extensions/pocket/content/pktApi.jsm => browser/components/pocket/content/pktApi.jsm rename : browser/extensions/pocket/content/pocket-content-process.js => browser/components/pocket/content/pocket-content-process.js rename : browser/extensions/pocket/jar.mn => browser/components/pocket/jar.mn rename : browser/extensions/pocket/locale/ach/pocket.properties => browser/components/pocket/locale/ach/pocket.properties rename : browser/extensions/pocket/locale/ar/pocket.properties => browser/components/pocket/locale/ar/pocket.properties rename : browser/extensions/pocket/locale/ast/pocket.properties => browser/components/pocket/locale/ast/pocket.properties rename : browser/extensions/pocket/locale/az/pocket.properties => browser/components/pocket/locale/az/pocket.properties rename : browser/extensions/pocket/locale/be/pocket.properties => browser/components/pocket/locale/be/pocket.properties rename : browser/extensions/pocket/locale/bg/pocket.properties => browser/components/pocket/locale/bg/pocket.properties rename : browser/extensions/pocket/locale/bn-BD/pocket.properties => browser/components/pocket/locale/bn-BD/pocket.properties rename : browser/extensions/pocket/locale/bn-IN/pocket.properties => browser/components/pocket/locale/bn-IN/pocket.properties rename : browser/extensions/pocket/locale/br/pocket.properties => browser/components/pocket/locale/br/pocket.properties rename : browser/extensions/pocket/locale/bs/pocket.properties => browser/components/pocket/locale/bs/pocket.properties rename : browser/extensions/pocket/locale/ca/pocket.properties => browser/components/pocket/locale/ca/pocket.properties rename : browser/extensions/pocket/locale/cak/pocket.properties => browser/components/pocket/locale/cak/pocket.properties rename : browser/extensions/pocket/locale/cs/pocket.properties => browser/components/pocket/locale/cs/pocket.properties rename : browser/extensions/pocket/locale/cy/pocket.properties => browser/components/pocket/locale/cy/pocket.properties rename : browser/extensions/pocket/locale/da/pocket.properties => browser/components/pocket/locale/da/pocket.properties rename : browser/extensions/pocket/locale/de/pocket.properties => browser/components/pocket/locale/de/pocket.properties rename : browser/extensions/pocket/locale/dsb/pocket.properties => browser/components/pocket/locale/dsb/pocket.properties rename : browser/extensions/pocket/locale/el/pocket.properties => browser/components/pocket/locale/el/pocket.properties rename : browser/extensions/pocket/locale/en-GB/pocket.properties => browser/components/pocket/locale/en-GB/pocket.properties rename : browser/extensions/pocket/locale/en-GB/pocket.properties => browser/components/pocket/locale/en-US/pocket.properties rename : browser/extensions/pocket/locale/eo/pocket.properties => browser/components/pocket/locale/eo/pocket.properties rename : browser/extensions/pocket/locale/es-AR/pocket.properties => browser/components/pocket/locale/es-AR/pocket.properties rename : browser/extensions/pocket/locale/es-CL/pocket.properties => browser/components/pocket/locale/es-CL/pocket.properties rename : browser/extensions/pocket/locale/es-ES/pocket.properties => browser/components/pocket/locale/es-ES/pocket.properties rename : browser/extensions/pocket/locale/es-MX/pocket.properties => browser/components/pocket/locale/es-MX/pocket.properties rename : browser/extensions/pocket/locale/et/pocket.properties => browser/components/pocket/locale/et/pocket.properties rename : browser/extensions/pocket/locale/eu/pocket.properties => browser/components/pocket/locale/eu/pocket.properties rename : browser/extensions/pocket/locale/fa/pocket.properties => browser/components/pocket/locale/fa/pocket.properties rename : browser/extensions/pocket/locale/ff/pocket.properties => browser/components/pocket/locale/ff/pocket.properties rename : browser/extensions/pocket/locale/fi/pocket.properties => browser/components/pocket/locale/fi/pocket.properties rename : browser/extensions/pocket/locale/fr/pocket.properties => browser/components/pocket/locale/fr/pocket.properties rename : browser/extensions/pocket/locale/fy-NL/pocket.properties => browser/components/pocket/locale/fy-NL/pocket.properties rename : browser/extensions/pocket/locale/ga-IE/pocket.properties => browser/components/pocket/locale/ga-IE/pocket.properties rename : browser/extensions/pocket/locale/gd/pocket.properties => browser/components/pocket/locale/gd/pocket.properties rename : browser/extensions/pocket/locale/gl/pocket.properties => browser/components/pocket/locale/gl/pocket.properties rename : browser/extensions/pocket/locale/gu-IN/pocket.properties => browser/components/pocket/locale/gu-IN/pocket.properties rename : browser/extensions/pocket/locale/he/pocket.properties => browser/components/pocket/locale/he/pocket.properties rename : browser/extensions/pocket/locale/hi-IN/pocket.properties => browser/components/pocket/locale/hi-IN/pocket.properties rename : browser/extensions/pocket/locale/hr/pocket.properties => browser/components/pocket/locale/hr/pocket.properties rename : browser/extensions/pocket/locale/hsb/pocket.properties => browser/components/pocket/locale/hsb/pocket.properties rename : browser/extensions/pocket/locale/hu/pocket.properties => browser/components/pocket/locale/hu/pocket.properties rename : browser/extensions/pocket/locale/hy-AM/pocket.properties => browser/components/pocket/locale/hy-AM/pocket.properties rename : browser/extensions/pocket/locale/id/pocket.properties => browser/components/pocket/locale/id/pocket.properties rename : browser/extensions/pocket/locale/is/pocket.properties => browser/components/pocket/locale/is/pocket.properties rename : browser/extensions/pocket/locale/it/pocket.properties => browser/components/pocket/locale/it/pocket.properties rename : browser/extensions/pocket/locale/ja/pocket.properties => browser/components/pocket/locale/ja/pocket.properties rename : browser/extensions/pocket/locale/jar.mn => browser/components/pocket/locale/jar.mn rename : browser/extensions/pocket/locale/ka/pocket.properties => browser/components/pocket/locale/ka/pocket.properties rename : browser/extensions/pocket/locale/kab/pocket.properties => browser/components/pocket/locale/kab/pocket.properties rename : browser/extensions/pocket/locale/kk/pocket.properties => browser/components/pocket/locale/kk/pocket.properties rename : browser/extensions/pocket/locale/km/pocket.properties => browser/components/pocket/locale/km/pocket.properties rename : browser/extensions/pocket/locale/kn/pocket.properties => browser/components/pocket/locale/kn/pocket.properties rename : browser/extensions/pocket/locale/ko/pocket.properties => browser/components/pocket/locale/ko/pocket.properties rename : browser/extensions/pocket/locale/lij/pocket.properties => browser/components/pocket/locale/lij/pocket.properties rename : browser/extensions/pocket/locale/lt/pocket.properties => browser/components/pocket/locale/lt/pocket.properties rename : browser/extensions/pocket/locale/ltg/pocket.properties => browser/components/pocket/locale/ltg/pocket.properties rename : browser/extensions/pocket/locale/lv/pocket.properties => browser/components/pocket/locale/lv/pocket.properties rename : browser/extensions/pocket/locale/mk/pocket.properties => browser/components/pocket/locale/mk/pocket.properties rename : browser/extensions/pocket/locale/ml/pocket.properties => browser/components/pocket/locale/ml/pocket.properties rename : browser/extensions/pocket/locale/moz.build => browser/components/pocket/locale/moz.build rename : browser/extensions/pocket/locale/mr/pocket.properties => browser/components/pocket/locale/mr/pocket.properties rename : browser/extensions/pocket/locale/ms/pocket.properties => browser/components/pocket/locale/ms/pocket.properties rename : browser/extensions/pocket/locale/my/pocket.properties => browser/components/pocket/locale/my/pocket.properties rename : browser/extensions/pocket/locale/nb-NO/pocket.properties => browser/components/pocket/locale/nb-NO/pocket.properties rename : browser/extensions/pocket/locale/ne-NP/pocket.properties => browser/components/pocket/locale/ne-NP/pocket.properties rename : browser/extensions/pocket/locale/nl/pocket.properties => browser/components/pocket/locale/nl/pocket.properties rename : browser/extensions/pocket/locale/nn-NO/pocket.properties => browser/components/pocket/locale/nn-NO/pocket.properties rename : browser/extensions/pocket/locale/oc/pocket.properties => browser/components/pocket/locale/oc/pocket.properties rename : browser/extensions/pocket/locale/or/pocket.properties => browser/components/pocket/locale/or/pocket.properties rename : browser/extensions/pocket/locale/pa-IN/pocket.properties => browser/components/pocket/locale/pa-IN/pocket.properties rename : browser/extensions/pocket/locale/pl/pocket.properties => browser/components/pocket/locale/pl/pocket.properties rename : browser/extensions/pocket/locale/pt-BR/pocket.properties => browser/components/pocket/locale/pt-BR/pocket.properties rename : browser/extensions/pocket/locale/pt-PT/pocket.properties => browser/components/pocket/locale/pt-PT/pocket.properties rename : browser/extensions/pocket/locale/rm/pocket.properties => browser/components/pocket/locale/rm/pocket.properties rename : browser/extensions/pocket/locale/ro/pocket.properties => browser/components/pocket/locale/ro/pocket.properties rename : browser/extensions/pocket/locale/ru/pocket.properties => browser/components/pocket/locale/ru/pocket.properties rename : browser/extensions/pocket/locale/sk/pocket.properties => browser/components/pocket/locale/sk/pocket.properties rename : browser/extensions/pocket/locale/sl/pocket.properties => browser/components/pocket/locale/sl/pocket.properties rename : browser/extensions/pocket/locale/sq/pocket.properties => browser/components/pocket/locale/sq/pocket.properties rename : browser/extensions/pocket/locale/sr/pocket.properties => browser/components/pocket/locale/sr/pocket.properties rename : browser/extensions/pocket/locale/sv-SE/pocket.properties => browser/components/pocket/locale/sv-SE/pocket.properties rename : browser/extensions/pocket/locale/ta/pocket.properties => browser/components/pocket/locale/ta/pocket.properties rename : browser/extensions/pocket/locale/te/pocket.properties => browser/components/pocket/locale/te/pocket.properties rename : browser/extensions/pocket/locale/th/pocket.properties => browser/components/pocket/locale/th/pocket.properties rename : browser/extensions/pocket/locale/tl/pocket.properties => browser/components/pocket/locale/tl/pocket.properties rename : browser/extensions/pocket/locale/tr/pocket.properties => browser/components/pocket/locale/tr/pocket.properties rename : browser/extensions/pocket/locale/uk/pocket.properties => browser/components/pocket/locale/uk/pocket.properties rename : browser/extensions/pocket/locale/ur/pocket.properties => browser/components/pocket/locale/ur/pocket.properties rename : browser/extensions/pocket/locale/vi/pocket.properties => browser/components/pocket/locale/vi/pocket.properties rename : browser/extensions/pocket/locale/zh-CN/pocket.properties => browser/components/pocket/locale/zh-CN/pocket.properties rename : browser/extensions/pocket/locale/zh-TW/pocket.properties => browser/components/pocket/locale/zh-TW/pocket.properties rename : browser/extensions/pocket/moz.build => browser/components/pocket/moz.build rename : browser/extensions/pocket/skin/shared/library-pocket-animation.svg => browser/components/pocket/skin/library-pocket-animation.svg rename : browser/extensions/pocket/skin/shared/pocket-animation.svg => browser/components/pocket/skin/pocket-animation.svg rename : browser/extensions/pocket/skin/shared/pocket-outline.svg => browser/components/pocket/skin/pocket-outline.svg rename : browser/extensions/pocket/skin/shared/pocket.css => browser/components/pocket/skin/pocket.css rename : browser/extensions/pocket/skin/shared/pocket.svg => browser/components/pocket/skin/pocket.svg rename : browser/extensions/pocket/test/.eslintrc.js => browser/components/pocket/test/.eslintrc.js rename : browser/extensions/pocket/test/browser.ini => browser/components/pocket/test/browser.ini rename : browser/extensions/pocket/test/browser_pocket_ui_check.js => browser/components/pocket/test/browser_pocket_ui_check.js rename : browser/extensions/pocket/test/head.js => browser/components/pocket/test/head.js rename : browser/extensions/pocket/test/test.html => browser/components/pocket/test/test.html extra : moz-landing-system : lando --- .eslintignore | 4 +- CLOBBER | 3 +- browser/base/content/browser-places.js | 2 +- browser/components/moz.build | 1 + browser/components/nsBrowserGlue.js | 3 + .../pocket/content/AboutPocket.jsm | 0 .../pocket/content/Pocket.jsm | 0 .../pocket/content/SaveToPocket.jsm} | 75 ++++++++---------- .../pocket/content/main.js | 0 .../pocket/content/panels/css/normalize.css | 0 .../pocket/content/panels/css/saved.css | 0 .../content/panels/css/sendtomobile.css | 0 .../pocket/content/panels/css/signup.css | 0 .../panels/fonts/FiraSans-Regular.woff | Bin .../panels/img/app_store_dowload_apple.svg | 0 .../content/panels/img/pocket-outline.svg | 0 .../content/panels/img/pocketerror@1x.png | Bin .../content/panels/img/pocketerror@2x.png | Bin .../content/panels/img/pocketlogo@1x.png | Bin .../content/panels/img/pocketlogo@2x.png | Bin .../content/panels/img/pocketlogosolo@1x.png | Bin .../content/panels/img/pocketlogosolo@2x.png | Bin .../panels/img/pocketsignup_button@1x.png | Bin .../panels/img/pocketsignup_button@2x.png | Bin .../panels/img/pocketsignup_devices@1x.png | Bin .../panels/img/pocketsignup_devices@2x.png | Bin .../panels/img/pocketsignup_hero@1x.png | Bin .../panels/img/pocketsignup_hero@2x.png | Bin .../panels/img/signup_firefoxlogo@1x.png | Bin .../panels/img/signup_firefoxlogo@2x.png | Bin .../content/panels/img/signup_help@1x.png | Bin .../content/panels/img/signup_help@2x.png | Bin .../content/panels/img/tag_close@1x.png | Bin .../content/panels/img/tag_close@2x.png | Bin .../content/panels/img/tag_closeactive@1x.png | Bin .../content/panels/img/tag_closeactive@2x.png | Bin .../pocket/content/panels/js/messages.js | 0 .../pocket/content/panels/js/saved.js | 0 .../pocket/content/panels/js/sendtomobile.js | 0 .../pocket/content/panels/js/signup.js | 0 .../pocket/content/panels/js/tmpl.js | 0 .../panels/js/vendor/handlebars.runtime.js | 0 .../panels/js/vendor/jquery-2.1.1.min.js | 0 .../panels/js/vendor/jquery.tokeninput.min.js | 0 .../pocket/content/panels/license.txt | 0 .../pocket/content/panels/saved.html | 0 .../pocket/content/panels/signup.html | 0 .../tmpl/ho2/ho2_articleinfo.handlebars | 0 .../panels/tmpl/ho2/ho2_download.handlebars | 0 .../tmpl/ho2/ho2_download_error.handlebars | 0 .../tmpl/ho2/ho2_sharebutton_v1.handlebars | 0 .../tmpl/ho2/ho2_sharebutton_v2.handlebars | 0 .../tmpl/ho2/ho2_sharebutton_v3.handlebars | 0 .../tmpl/saved_premiumextras.handlebars | 0 .../panels/tmpl/saved_premiumshell.handlebars | 0 .../panels/tmpl/saved_shell.handlebars | 0 .../panels/tmpl/saved_tmplogin.handlebars | 0 .../panels/tmpl/signup_shell.handlebars | 0 .../tmpl/signupstoryboard_shell.handlebars | 0 .../pocket/content/pktApi.jsm | 0 .../pocket/content/pocket-content-process.js | 0 .../{extensions => components}/pocket/jar.mn | 10 +-- .../pocket/locale/ach/pocket.properties | 0 .../pocket/locale/ar/pocket.properties | 0 .../pocket/locale/ast/pocket.properties | 0 .../pocket/locale/az/pocket.properties | 0 .../pocket/locale/be/pocket.properties | 0 .../pocket/locale/bg/pocket.properties | 0 .../pocket/locale/bn-BD/pocket.properties | 0 .../pocket/locale/bn-IN/pocket.properties | 0 .../pocket/locale/br/pocket.properties | 0 .../pocket/locale/bs/pocket.properties | 0 .../pocket/locale/ca/pocket.properties | 0 .../pocket/locale/cak/pocket.properties | 0 .../pocket/locale/cs/pocket.properties | 0 .../pocket/locale/cy/pocket.properties | 0 .../pocket/locale/da/pocket.properties | 0 .../pocket/locale/de/pocket.properties | 0 .../pocket/locale/dsb/pocket.properties | 0 .../pocket/locale/el/pocket.properties | 0 .../pocket/locale/en-GB/pocket.properties | 0 .../pocket/locale/en-US/pocket.properties | 0 .../pocket/locale/eo/pocket.properties | 0 .../pocket/locale/es-AR/pocket.properties | 0 .../pocket/locale/es-CL/pocket.properties | 0 .../pocket/locale/es-ES/pocket.properties | 0 .../pocket/locale/es-MX/pocket.properties | 0 .../pocket/locale/et/pocket.properties | 0 .../pocket/locale/eu/pocket.properties | 0 .../pocket/locale/fa/pocket.properties | 0 .../pocket/locale/ff/pocket.properties | 0 .../pocket/locale/fi/pocket.properties | 0 .../pocket/locale/fr/pocket.properties | 0 .../pocket/locale/fy-NL/pocket.properties | 0 .../pocket/locale/ga-IE/pocket.properties | 0 .../pocket/locale/gd/pocket.properties | 0 .../pocket/locale/gl/pocket.properties | 0 .../pocket/locale/gu-IN/pocket.properties | 0 .../pocket/locale/he/pocket.properties | 0 .../pocket/locale/hi-IN/pocket.properties | 0 .../pocket/locale/hr/pocket.properties | 0 .../pocket/locale/hsb/pocket.properties | 0 .../pocket/locale/hu/pocket.properties | 0 .../pocket/locale/hy-AM/pocket.properties | 0 .../pocket/locale/id/pocket.properties | 0 .../pocket/locale/is/pocket.properties | 0 .../pocket/locale/it/pocket.properties | 0 .../pocket/locale/ja/pocket.properties | 0 .../pocket/locale/jar.mn | 2 +- .../pocket/locale/ka/pocket.properties | 0 .../pocket/locale/kab/pocket.properties | 0 .../pocket/locale/kk/pocket.properties | 0 .../pocket/locale/km/pocket.properties | 0 .../pocket/locale/kn/pocket.properties | 0 .../pocket/locale/ko/pocket.properties | 0 .../pocket/locale/lij/pocket.properties | 0 .../pocket/locale/lt/pocket.properties | 0 .../pocket/locale/ltg/pocket.properties | 0 .../pocket/locale/lv/pocket.properties | 0 .../pocket/locale/mk/pocket.properties | 0 .../pocket/locale/ml/pocket.properties | 0 .../pocket/locale/moz.build | 0 .../pocket/locale/mr/pocket.properties | 0 .../pocket/locale/ms/pocket.properties | 0 .../pocket/locale/my/pocket.properties | 0 .../pocket/locale/nb-NO/pocket.properties | 0 .../pocket/locale/ne-NP/pocket.properties | 0 .../pocket/locale/nl/pocket.properties | 0 .../pocket/locale/nn-NO/pocket.properties | 0 .../pocket/locale/oc/pocket.properties | 0 .../pocket/locale/or/pocket.properties | 0 .../pocket/locale/pa-IN/pocket.properties | 0 .../pocket/locale/pl/pocket.properties | 0 .../pocket/locale/pt-BR/pocket.properties | 0 .../pocket/locale/pt-PT/pocket.properties | 0 .../pocket/locale/rm/pocket.properties | 0 .../pocket/locale/ro/pocket.properties | 0 .../pocket/locale/ru/pocket.properties | 0 .../pocket/locale/sk/pocket.properties | 0 .../pocket/locale/sl/pocket.properties | 0 .../pocket/locale/sq/pocket.properties | 0 .../pocket/locale/sr/pocket.properties | 0 .../pocket/locale/sv-SE/pocket.properties | 0 .../pocket/locale/ta/pocket.properties | 0 .../pocket/locale/te/pocket.properties | 0 .../pocket/locale/th/pocket.properties | 0 .../pocket/locale/tl/pocket.properties | 0 .../pocket/locale/tr/pocket.properties | 0 .../pocket/locale/uk/pocket.properties | 0 .../pocket/locale/ur/pocket.properties | 0 .../pocket/locale/vi/pocket.properties | 0 .../pocket/locale/zh-CN/pocket.properties | 0 .../pocket/locale/zh-TW/pocket.properties | 0 .../pocket/moz.build | 11 --- .../pocket/skin}/library-pocket-animation.svg | 0 .../pocket/skin}/pocket-animation.svg | 0 .../pocket/skin}/pocket-outline.svg | 0 .../pocket/skin}/pocket.css | 12 +-- .../pocket/skin}/pocket.svg | 0 .../pocket/test/.eslintrc.js | 0 .../pocket/test/browser.ini | 0 .../pocket/test/browser_pocket_ui_check.js | 2 +- .../pocket/test/head.js | 0 .../pocket/test/test.html | 0 browser/extensions/moz.build | 1 - browser/extensions/pocket/install.rdf.in | 32 -------- browser/locales/Makefile.in | 4 +- ...ochitest-browser-chrome-e10s.runtimes.json | 2 +- .../normandy/content/AboutPages.jsm | 2 +- tools/lint/codespell.yml | 2 +- 170 files changed, 61 insertions(+), 107 deletions(-) rename browser/{extensions => components}/pocket/content/AboutPocket.jsm (100%) rename browser/{extensions => components}/pocket/content/Pocket.jsm (100%) rename browser/{extensions/pocket/bootstrap.js => components/pocket/content/SaveToPocket.jsm} (93%) rename browser/{extensions => components}/pocket/content/main.js (100%) rename browser/{extensions => components}/pocket/content/panels/css/normalize.css (100%) rename browser/{extensions => components}/pocket/content/panels/css/saved.css (100%) rename browser/{extensions => components}/pocket/content/panels/css/sendtomobile.css (100%) rename browser/{extensions => components}/pocket/content/panels/css/signup.css (100%) rename browser/{extensions => components}/pocket/content/panels/fonts/FiraSans-Regular.woff (100%) rename browser/{extensions => components}/pocket/content/panels/img/app_store_dowload_apple.svg (100%) rename browser/{extensions => components}/pocket/content/panels/img/pocket-outline.svg (100%) rename browser/{extensions => components}/pocket/content/panels/img/pocketerror@1x.png (100%) rename browser/{extensions => components}/pocket/content/panels/img/pocketerror@2x.png (100%) rename browser/{extensions => components}/pocket/content/panels/img/pocketlogo@1x.png (100%) rename browser/{extensions => components}/pocket/content/panels/img/pocketlogo@2x.png (100%) rename browser/{extensions => components}/pocket/content/panels/img/pocketlogosolo@1x.png (100%) rename browser/{extensions => components}/pocket/content/panels/img/pocketlogosolo@2x.png (100%) rename browser/{extensions => components}/pocket/content/panels/img/pocketsignup_button@1x.png (100%) rename browser/{extensions => components}/pocket/content/panels/img/pocketsignup_button@2x.png (100%) rename browser/{extensions => components}/pocket/content/panels/img/pocketsignup_devices@1x.png (100%) rename browser/{extensions => components}/pocket/content/panels/img/pocketsignup_devices@2x.png (100%) rename browser/{extensions => components}/pocket/content/panels/img/pocketsignup_hero@1x.png (100%) rename browser/{extensions => components}/pocket/content/panels/img/pocketsignup_hero@2x.png (100%) rename browser/{extensions => components}/pocket/content/panels/img/signup_firefoxlogo@1x.png (100%) rename browser/{extensions => components}/pocket/content/panels/img/signup_firefoxlogo@2x.png (100%) rename browser/{extensions => components}/pocket/content/panels/img/signup_help@1x.png (100%) rename browser/{extensions => components}/pocket/content/panels/img/signup_help@2x.png (100%) rename browser/{extensions => components}/pocket/content/panels/img/tag_close@1x.png (100%) rename browser/{extensions => components}/pocket/content/panels/img/tag_close@2x.png (100%) rename browser/{extensions => components}/pocket/content/panels/img/tag_closeactive@1x.png (100%) rename browser/{extensions => components}/pocket/content/panels/img/tag_closeactive@2x.png (100%) rename browser/{extensions => components}/pocket/content/panels/js/messages.js (100%) rename browser/{extensions => components}/pocket/content/panels/js/saved.js (100%) rename browser/{extensions => components}/pocket/content/panels/js/sendtomobile.js (100%) rename browser/{extensions => components}/pocket/content/panels/js/signup.js (100%) rename browser/{extensions => components}/pocket/content/panels/js/tmpl.js (100%) rename browser/{extensions => components}/pocket/content/panels/js/vendor/handlebars.runtime.js (100%) rename browser/{extensions => components}/pocket/content/panels/js/vendor/jquery-2.1.1.min.js (100%) rename browser/{extensions => components}/pocket/content/panels/js/vendor/jquery.tokeninput.min.js (100%) rename browser/{extensions => components}/pocket/content/panels/license.txt (100%) rename browser/{extensions => components}/pocket/content/panels/saved.html (100%) rename browser/{extensions => components}/pocket/content/panels/signup.html (100%) rename browser/{extensions => components}/pocket/content/panels/tmpl/ho2/ho2_articleinfo.handlebars (100%) rename browser/{extensions => components}/pocket/content/panels/tmpl/ho2/ho2_download.handlebars (100%) rename browser/{extensions => components}/pocket/content/panels/tmpl/ho2/ho2_download_error.handlebars (100%) rename browser/{extensions => components}/pocket/content/panels/tmpl/ho2/ho2_sharebutton_v1.handlebars (100%) rename browser/{extensions => components}/pocket/content/panels/tmpl/ho2/ho2_sharebutton_v2.handlebars (100%) rename browser/{extensions => components}/pocket/content/panels/tmpl/ho2/ho2_sharebutton_v3.handlebars (100%) rename browser/{extensions => components}/pocket/content/panels/tmpl/saved_premiumextras.handlebars (100%) rename browser/{extensions => components}/pocket/content/panels/tmpl/saved_premiumshell.handlebars (100%) rename browser/{extensions => components}/pocket/content/panels/tmpl/saved_shell.handlebars (100%) rename browser/{extensions => components}/pocket/content/panels/tmpl/saved_tmplogin.handlebars (100%) rename browser/{extensions => components}/pocket/content/panels/tmpl/signup_shell.handlebars (100%) rename browser/{extensions => components}/pocket/content/panels/tmpl/signupstoryboard_shell.handlebars (100%) rename browser/{extensions => components}/pocket/content/pktApi.jsm (100%) rename browser/{extensions => components}/pocket/content/pocket-content-process.js (100%) rename browser/{extensions => components}/pocket/jar.mn (50%) rename browser/{extensions => components}/pocket/locale/ach/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/ar/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/ast/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/az/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/be/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/bg/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/bn-BD/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/bn-IN/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/br/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/bs/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/ca/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/cak/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/cs/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/cy/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/da/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/de/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/dsb/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/el/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/en-GB/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/en-US/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/eo/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/es-AR/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/es-CL/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/es-ES/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/es-MX/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/et/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/eu/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/fa/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/ff/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/fi/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/fr/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/fy-NL/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/ga-IE/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/gd/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/gl/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/gu-IN/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/he/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/hi-IN/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/hr/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/hsb/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/hu/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/hy-AM/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/id/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/is/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/it/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/ja/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/jar.mn (98%) rename browser/{extensions => components}/pocket/locale/ka/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/kab/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/kk/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/km/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/kn/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/ko/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/lij/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/lt/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/ltg/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/lv/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/mk/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/ml/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/moz.build (100%) rename browser/{extensions => components}/pocket/locale/mr/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/ms/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/my/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/nb-NO/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/ne-NP/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/nl/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/nn-NO/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/oc/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/or/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/pa-IN/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/pl/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/pt-BR/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/pt-PT/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/rm/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/ro/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/ru/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/sk/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/sl/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/sq/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/sr/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/sv-SE/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/ta/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/te/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/th/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/tl/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/tr/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/uk/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/ur/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/vi/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/zh-CN/pocket.properties (100%) rename browser/{extensions => components}/pocket/locale/zh-TW/pocket.properties (100%) rename browser/{extensions => components}/pocket/moz.build (61%) rename browser/{extensions/pocket/skin/shared => components/pocket/skin}/library-pocket-animation.svg (100%) rename browser/{extensions/pocket/skin/shared => components/pocket/skin}/pocket-animation.svg (100%) rename browser/{extensions/pocket/skin/shared => components/pocket/skin}/pocket-outline.svg (100%) rename browser/{extensions/pocket/skin/shared => components/pocket/skin}/pocket.css (92%) rename browser/{extensions/pocket/skin/shared => components/pocket/skin}/pocket.svg (100%) rename browser/{extensions => components}/pocket/test/.eslintrc.js (100%) rename browser/{extensions => components}/pocket/test/browser.ini (100%) rename browser/{extensions => components}/pocket/test/browser_pocket_ui_check.js (97%) rename browser/{extensions => components}/pocket/test/head.js (100%) rename browser/{extensions => components}/pocket/test/test.html (100%) delete mode 100644 browser/extensions/pocket/install.rdf.in diff --git a/.eslintignore b/.eslintignore index f0f2f8494222..2cf80d3d46f4 100644 --- a/.eslintignore +++ b/.eslintignore @@ -83,8 +83,8 @@ browser/extensions/screenshots/** browser/extensions/pdfjs/content/build** browser/extensions/pdfjs/content/web** # generated or library files in pocket -browser/extensions/pocket/content/panels/js/tmpl.js -browser/extensions/pocket/content/panels/js/vendor/** +browser/components/pocket/content/panels/js/tmpl.js +browser/components/pocket/content/panels/js/vendor/** # Activity Stream has incompatible eslintrc. `npm run lint` from its directory browser/components/newtab/** # The only file in browser/locales/ is pre-processed. diff --git a/CLOBBER b/CLOBBER index 744c82c52452..e68821381940 100644 --- a/CLOBBER +++ b/CLOBBER @@ -22,4 +22,5 @@ # changes to stick? As of bug 928195, this shouldn't be necessary! Please # don't change CLOBBER for WebIDL changes any more. -Bug 1397263 - moving AS to moz.configure will break AS detection +Bug 1488813 - Migrating Pocket off any bootstrap code + diff --git a/browser/base/content/browser-places.js b/browser/base/content/browser-places.js index f0d328fc5fa7..67b897ba720f 100755 --- a/browser/base/content/browser-places.js +++ b/browser/base/content/browser-places.js @@ -20,7 +20,7 @@ var StarUI = { // the popup. _autoCloseTimerEnabled: true, // The autoclose timeout length. 3500ms matches the timeout that Pocket uses - // in browser/extensions/pocket/content/panels/js/saved.js. + // in browser/components/pocket/content/panels/js/saved.js. _autoCloseTimeout: 3500, _removeBookmarksOnPopupHidden: false, diff --git a/browser/components/moz.build b/browser/components/moz.build index a5174cbc2822..ebd51432fb9e 100644 --- a/browser/components/moz.build +++ b/browser/components/moz.build @@ -44,6 +44,7 @@ DIRS += [ 'newtab', 'originattributes', 'places', + 'pocket', 'preferences', 'privatebrowsing', 'resistfingerprinting', diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js index 01d085868d7d..d51e5c30d8f2 100644 --- a/browser/components/nsBrowserGlue.js +++ b/browser/components/nsBrowserGlue.js @@ -424,6 +424,7 @@ XPCOMUtils.defineLazyModuleGetters(this, { RemoteSettings: "resource://services-settings/remote-settings.js", SafeBrowsing: "resource://gre/modules/SafeBrowsing.jsm", Sanitizer: "resource:///modules/Sanitizer.jsm", + SaveToPocket: "chrome://pocket/content/SaveToPocket.jsm", SessionStartup: "resource:///modules/sessionstore/SessionStartup.jsm", SessionStore: "resource:///modules/sessionstore/SessionStore.jsm", ShellService: "resource:///modules/ShellService.jsm", @@ -1066,6 +1067,7 @@ BrowserGlue.prototype = { const appSource = new FileSource("app", locales, "resource://app/localization/{locale}/"); L10nRegistry.registerSource(appSource); + SaveToPocket.init(); Services.obs.notifyObservers(null, "browser-ui-startup-complete"); }, @@ -1422,6 +1424,7 @@ BrowserGlue.prototype = { AboutPrivateBrowsingHandler.uninit(); AutoCompletePopup.uninit(); DateTimePickerParent.uninit(); + SaveToPocket.uninit(); // Browser errors are only collected on Nightly, but telemetry for // them is collected on all channels. diff --git a/browser/extensions/pocket/content/AboutPocket.jsm b/browser/components/pocket/content/AboutPocket.jsm similarity index 100% rename from browser/extensions/pocket/content/AboutPocket.jsm rename to browser/components/pocket/content/AboutPocket.jsm diff --git a/browser/extensions/pocket/content/Pocket.jsm b/browser/components/pocket/content/Pocket.jsm similarity index 100% rename from browser/extensions/pocket/content/Pocket.jsm rename to browser/components/pocket/content/Pocket.jsm diff --git a/browser/extensions/pocket/bootstrap.js b/browser/components/pocket/content/SaveToPocket.jsm similarity index 93% rename from browser/extensions/pocket/bootstrap.js rename to browser/components/pocket/content/SaveToPocket.jsm index 0044564ce9fa..f22e3ca3098d 100644 --- a/browser/extensions/pocket/bootstrap.js +++ b/browser/components/pocket/content/SaveToPocket.jsm @@ -3,13 +3,10 @@ * 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/. */ -/* global ADDON_ENABLE:false, ADDON_DISABLE:false, APP_SHUTDOWN: false */ - -const Cm = Components.manager; +"use strict"; ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); ChromeUtils.import("resource://services-common/utils.js"); -ChromeUtils.import("resource://gre/modules/AppConstants.jsm"); ChromeUtils.defineModuleGetter(this, "AboutPocket", "chrome://pocket/content/AboutPocket.jsm"); ChromeUtils.defineModuleGetter(this, "AddonManagerPrivate", @@ -28,9 +25,11 @@ XPCOMUtils.defineLazyGetter(this, "gPocketBundle", function() { return Services.strings.createBundle("chrome://pocket/locale/pocket.properties"); }); XPCOMUtils.defineLazyGetter(this, "gPocketStyleURI", function() { - return Services.io.newURI("chrome://pocket-shared/skin/pocket.css"); + return Services.io.newURI("chrome://pocket/skin/pocket.css"); }); +var EXPORTED_SYMBOLS = ["SaveToPocket"]; + // Due to bug 1051238 frame scripts are cached forever, so we can't update them // as a restartless add-on. The Math.random() is the work around for this. const PROCESS_SCRIPT = "chrome://pocket/content/pocket-content-process.js?" + Math.random(); @@ -396,7 +395,7 @@ function pktUIGetter(prop, window) { } var PocketOverlay = { - startup(reason) { + startup() { let styleSheetService = Cc["@mozilla.org/content/style-sheet-service;1"] .getService(Ci.nsIStyleSheetService); this._sheetType = styleSheetService.AUTHOR_SHEET; @@ -411,7 +410,7 @@ var PocketOverlay = { this.onWindowOpened(win); } }, - shutdown(reason) { + shutdown() { Services.ppmm.broadcastAsyncMessage("PocketShuttingDown"); Services.obs.removeObserver(this, "browser-delayed-startup-finished"); // Although the ppmm loads the scripts into the chrome process as well, @@ -501,43 +500,37 @@ var PocketOverlay = { function prefObserver(aSubject, aTopic, aData) { let enabled = Services.prefs.getBoolPref("extensions.pocket.enabled"); if (enabled) - PocketOverlay.startup(ADDON_ENABLE); + PocketOverlay.startup(); else - PocketOverlay.shutdown(ADDON_DISABLE); -} - -function startup(data, reason) { - if (AddonManagerPrivate.addonIsActive("isreaditlater@ideashower.com")) - return; - - setDefaultPrefs(); - // migrate enabled pref - if (Services.prefs.prefHasUserValue("browser.pocket.enabled")) { - Services.prefs.setBoolPref("extensions.pocket.enabled", Services.prefs.getBoolPref("browser.pocket.enabled")); - Services.prefs.clearUserPref("browser.pocket.enabled"); - } - // watch pref change and enable/disable if necessary - Services.prefs.addObserver("extensions.pocket.enabled", prefObserver); - if (!Services.prefs.getBoolPref("extensions.pocket.enabled")) - return; - PocketOverlay.startup(reason); -} - -function shutdown(data, reason) { - // For speed sake, we should only do a shutdown if we're being disabled. - // On an app shutdown, just let it fade away... - if (reason != APP_SHUTDOWN) { - Services.prefs.removeObserver("extensions.pocket.enabled", prefObserver); - PocketOverlay.shutdown(reason); - } -} - -function install() { -} - -function uninstall() { + PocketOverlay.shutdown(); } function browserWindows() { return Services.wm.getEnumerator("navigator:browser"); } + +var SaveToPocket = { + init() { + if (AddonManagerPrivate.addonIsActive("isreaditlater@ideashower.com")) + return; + + setDefaultPrefs(); + // migrate enabled pref + if (Services.prefs.prefHasUserValue("browser.pocket.enabled")) { + Services.prefs.setBoolPref("extensions.pocket.enabled", Services.prefs.getBoolPref("browser.pocket.enabled")); + Services.prefs.clearUserPref("browser.pocket.enabled"); + } + // watch pref change and enable/disable if necessary + Services.prefs.addObserver("extensions.pocket.enabled", prefObserver); + if (!Services.prefs.getBoolPref("extensions.pocket.enabled")) + return; + PocketOverlay.startup(); + }, + + uninit() { + // For speed sake, we should only do a shutdown if we're being disabled. + // On an app shutdown, just let it fade away... + Services.prefs.removeObserver("extensions.pocket.enabled", prefObserver); + PocketOverlay.shutdown(); + }, +}; diff --git a/browser/extensions/pocket/content/main.js b/browser/components/pocket/content/main.js similarity index 100% rename from browser/extensions/pocket/content/main.js rename to browser/components/pocket/content/main.js diff --git a/browser/extensions/pocket/content/panels/css/normalize.css b/browser/components/pocket/content/panels/css/normalize.css similarity index 100% rename from browser/extensions/pocket/content/panels/css/normalize.css rename to browser/components/pocket/content/panels/css/normalize.css diff --git a/browser/extensions/pocket/content/panels/css/saved.css b/browser/components/pocket/content/panels/css/saved.css similarity index 100% rename from browser/extensions/pocket/content/panels/css/saved.css rename to browser/components/pocket/content/panels/css/saved.css diff --git a/browser/extensions/pocket/content/panels/css/sendtomobile.css b/browser/components/pocket/content/panels/css/sendtomobile.css similarity index 100% rename from browser/extensions/pocket/content/panels/css/sendtomobile.css rename to browser/components/pocket/content/panels/css/sendtomobile.css diff --git a/browser/extensions/pocket/content/panels/css/signup.css b/browser/components/pocket/content/panels/css/signup.css similarity index 100% rename from browser/extensions/pocket/content/panels/css/signup.css rename to browser/components/pocket/content/panels/css/signup.css diff --git a/browser/extensions/pocket/content/panels/fonts/FiraSans-Regular.woff b/browser/components/pocket/content/panels/fonts/FiraSans-Regular.woff similarity index 100% rename from browser/extensions/pocket/content/panels/fonts/FiraSans-Regular.woff rename to browser/components/pocket/content/panels/fonts/FiraSans-Regular.woff diff --git a/browser/extensions/pocket/content/panels/img/app_store_dowload_apple.svg b/browser/components/pocket/content/panels/img/app_store_dowload_apple.svg similarity index 100% rename from browser/extensions/pocket/content/panels/img/app_store_dowload_apple.svg rename to browser/components/pocket/content/panels/img/app_store_dowload_apple.svg diff --git a/browser/extensions/pocket/content/panels/img/pocket-outline.svg b/browser/components/pocket/content/panels/img/pocket-outline.svg similarity index 100% rename from browser/extensions/pocket/content/panels/img/pocket-outline.svg rename to browser/components/pocket/content/panels/img/pocket-outline.svg diff --git a/browser/extensions/pocket/content/panels/img/pocketerror@1x.png b/browser/components/pocket/content/panels/img/pocketerror@1x.png similarity index 100% rename from browser/extensions/pocket/content/panels/img/pocketerror@1x.png rename to browser/components/pocket/content/panels/img/pocketerror@1x.png diff --git a/browser/extensions/pocket/content/panels/img/pocketerror@2x.png b/browser/components/pocket/content/panels/img/pocketerror@2x.png similarity index 100% rename from browser/extensions/pocket/content/panels/img/pocketerror@2x.png rename to browser/components/pocket/content/panels/img/pocketerror@2x.png diff --git a/browser/extensions/pocket/content/panels/img/pocketlogo@1x.png b/browser/components/pocket/content/panels/img/pocketlogo@1x.png similarity index 100% rename from browser/extensions/pocket/content/panels/img/pocketlogo@1x.png rename to browser/components/pocket/content/panels/img/pocketlogo@1x.png diff --git a/browser/extensions/pocket/content/panels/img/pocketlogo@2x.png b/browser/components/pocket/content/panels/img/pocketlogo@2x.png similarity index 100% rename from browser/extensions/pocket/content/panels/img/pocketlogo@2x.png rename to browser/components/pocket/content/panels/img/pocketlogo@2x.png diff --git a/browser/extensions/pocket/content/panels/img/pocketlogosolo@1x.png b/browser/components/pocket/content/panels/img/pocketlogosolo@1x.png similarity index 100% rename from browser/extensions/pocket/content/panels/img/pocketlogosolo@1x.png rename to browser/components/pocket/content/panels/img/pocketlogosolo@1x.png diff --git a/browser/extensions/pocket/content/panels/img/pocketlogosolo@2x.png b/browser/components/pocket/content/panels/img/pocketlogosolo@2x.png similarity index 100% rename from browser/extensions/pocket/content/panels/img/pocketlogosolo@2x.png rename to browser/components/pocket/content/panels/img/pocketlogosolo@2x.png diff --git a/browser/extensions/pocket/content/panels/img/pocketsignup_button@1x.png b/browser/components/pocket/content/panels/img/pocketsignup_button@1x.png similarity index 100% rename from browser/extensions/pocket/content/panels/img/pocketsignup_button@1x.png rename to browser/components/pocket/content/panels/img/pocketsignup_button@1x.png diff --git a/browser/extensions/pocket/content/panels/img/pocketsignup_button@2x.png b/browser/components/pocket/content/panels/img/pocketsignup_button@2x.png similarity index 100% rename from browser/extensions/pocket/content/panels/img/pocketsignup_button@2x.png rename to browser/components/pocket/content/panels/img/pocketsignup_button@2x.png diff --git a/browser/extensions/pocket/content/panels/img/pocketsignup_devices@1x.png b/browser/components/pocket/content/panels/img/pocketsignup_devices@1x.png similarity index 100% rename from browser/extensions/pocket/content/panels/img/pocketsignup_devices@1x.png rename to browser/components/pocket/content/panels/img/pocketsignup_devices@1x.png diff --git a/browser/extensions/pocket/content/panels/img/pocketsignup_devices@2x.png b/browser/components/pocket/content/panels/img/pocketsignup_devices@2x.png similarity index 100% rename from browser/extensions/pocket/content/panels/img/pocketsignup_devices@2x.png rename to browser/components/pocket/content/panels/img/pocketsignup_devices@2x.png diff --git a/browser/extensions/pocket/content/panels/img/pocketsignup_hero@1x.png b/browser/components/pocket/content/panels/img/pocketsignup_hero@1x.png similarity index 100% rename from browser/extensions/pocket/content/panels/img/pocketsignup_hero@1x.png rename to browser/components/pocket/content/panels/img/pocketsignup_hero@1x.png diff --git a/browser/extensions/pocket/content/panels/img/pocketsignup_hero@2x.png b/browser/components/pocket/content/panels/img/pocketsignup_hero@2x.png similarity index 100% rename from browser/extensions/pocket/content/panels/img/pocketsignup_hero@2x.png rename to browser/components/pocket/content/panels/img/pocketsignup_hero@2x.png diff --git a/browser/extensions/pocket/content/panels/img/signup_firefoxlogo@1x.png b/browser/components/pocket/content/panels/img/signup_firefoxlogo@1x.png similarity index 100% rename from browser/extensions/pocket/content/panels/img/signup_firefoxlogo@1x.png rename to browser/components/pocket/content/panels/img/signup_firefoxlogo@1x.png diff --git a/browser/extensions/pocket/content/panels/img/signup_firefoxlogo@2x.png b/browser/components/pocket/content/panels/img/signup_firefoxlogo@2x.png similarity index 100% rename from browser/extensions/pocket/content/panels/img/signup_firefoxlogo@2x.png rename to browser/components/pocket/content/panels/img/signup_firefoxlogo@2x.png diff --git a/browser/extensions/pocket/content/panels/img/signup_help@1x.png b/browser/components/pocket/content/panels/img/signup_help@1x.png similarity index 100% rename from browser/extensions/pocket/content/panels/img/signup_help@1x.png rename to browser/components/pocket/content/panels/img/signup_help@1x.png diff --git a/browser/extensions/pocket/content/panels/img/signup_help@2x.png b/browser/components/pocket/content/panels/img/signup_help@2x.png similarity index 100% rename from browser/extensions/pocket/content/panels/img/signup_help@2x.png rename to browser/components/pocket/content/panels/img/signup_help@2x.png diff --git a/browser/extensions/pocket/content/panels/img/tag_close@1x.png b/browser/components/pocket/content/panels/img/tag_close@1x.png similarity index 100% rename from browser/extensions/pocket/content/panels/img/tag_close@1x.png rename to browser/components/pocket/content/panels/img/tag_close@1x.png diff --git a/browser/extensions/pocket/content/panels/img/tag_close@2x.png b/browser/components/pocket/content/panels/img/tag_close@2x.png similarity index 100% rename from browser/extensions/pocket/content/panels/img/tag_close@2x.png rename to browser/components/pocket/content/panels/img/tag_close@2x.png diff --git a/browser/extensions/pocket/content/panels/img/tag_closeactive@1x.png b/browser/components/pocket/content/panels/img/tag_closeactive@1x.png similarity index 100% rename from browser/extensions/pocket/content/panels/img/tag_closeactive@1x.png rename to browser/components/pocket/content/panels/img/tag_closeactive@1x.png diff --git a/browser/extensions/pocket/content/panels/img/tag_closeactive@2x.png b/browser/components/pocket/content/panels/img/tag_closeactive@2x.png similarity index 100% rename from browser/extensions/pocket/content/panels/img/tag_closeactive@2x.png rename to browser/components/pocket/content/panels/img/tag_closeactive@2x.png diff --git a/browser/extensions/pocket/content/panels/js/messages.js b/browser/components/pocket/content/panels/js/messages.js similarity index 100% rename from browser/extensions/pocket/content/panels/js/messages.js rename to browser/components/pocket/content/panels/js/messages.js diff --git a/browser/extensions/pocket/content/panels/js/saved.js b/browser/components/pocket/content/panels/js/saved.js similarity index 100% rename from browser/extensions/pocket/content/panels/js/saved.js rename to browser/components/pocket/content/panels/js/saved.js diff --git a/browser/extensions/pocket/content/panels/js/sendtomobile.js b/browser/components/pocket/content/panels/js/sendtomobile.js similarity index 100% rename from browser/extensions/pocket/content/panels/js/sendtomobile.js rename to browser/components/pocket/content/panels/js/sendtomobile.js diff --git a/browser/extensions/pocket/content/panels/js/signup.js b/browser/components/pocket/content/panels/js/signup.js similarity index 100% rename from browser/extensions/pocket/content/panels/js/signup.js rename to browser/components/pocket/content/panels/js/signup.js diff --git a/browser/extensions/pocket/content/panels/js/tmpl.js b/browser/components/pocket/content/panels/js/tmpl.js similarity index 100% rename from browser/extensions/pocket/content/panels/js/tmpl.js rename to browser/components/pocket/content/panels/js/tmpl.js diff --git a/browser/extensions/pocket/content/panels/js/vendor/handlebars.runtime.js b/browser/components/pocket/content/panels/js/vendor/handlebars.runtime.js similarity index 100% rename from browser/extensions/pocket/content/panels/js/vendor/handlebars.runtime.js rename to browser/components/pocket/content/panels/js/vendor/handlebars.runtime.js diff --git a/browser/extensions/pocket/content/panels/js/vendor/jquery-2.1.1.min.js b/browser/components/pocket/content/panels/js/vendor/jquery-2.1.1.min.js similarity index 100% rename from browser/extensions/pocket/content/panels/js/vendor/jquery-2.1.1.min.js rename to browser/components/pocket/content/panels/js/vendor/jquery-2.1.1.min.js diff --git a/browser/extensions/pocket/content/panels/js/vendor/jquery.tokeninput.min.js b/browser/components/pocket/content/panels/js/vendor/jquery.tokeninput.min.js similarity index 100% rename from browser/extensions/pocket/content/panels/js/vendor/jquery.tokeninput.min.js rename to browser/components/pocket/content/panels/js/vendor/jquery.tokeninput.min.js diff --git a/browser/extensions/pocket/content/panels/license.txt b/browser/components/pocket/content/panels/license.txt similarity index 100% rename from browser/extensions/pocket/content/panels/license.txt rename to browser/components/pocket/content/panels/license.txt diff --git a/browser/extensions/pocket/content/panels/saved.html b/browser/components/pocket/content/panels/saved.html similarity index 100% rename from browser/extensions/pocket/content/panels/saved.html rename to browser/components/pocket/content/panels/saved.html diff --git a/browser/extensions/pocket/content/panels/signup.html b/browser/components/pocket/content/panels/signup.html similarity index 100% rename from browser/extensions/pocket/content/panels/signup.html rename to browser/components/pocket/content/panels/signup.html diff --git a/browser/extensions/pocket/content/panels/tmpl/ho2/ho2_articleinfo.handlebars b/browser/components/pocket/content/panels/tmpl/ho2/ho2_articleinfo.handlebars similarity index 100% rename from browser/extensions/pocket/content/panels/tmpl/ho2/ho2_articleinfo.handlebars rename to browser/components/pocket/content/panels/tmpl/ho2/ho2_articleinfo.handlebars diff --git a/browser/extensions/pocket/content/panels/tmpl/ho2/ho2_download.handlebars b/browser/components/pocket/content/panels/tmpl/ho2/ho2_download.handlebars similarity index 100% rename from browser/extensions/pocket/content/panels/tmpl/ho2/ho2_download.handlebars rename to browser/components/pocket/content/panels/tmpl/ho2/ho2_download.handlebars diff --git a/browser/extensions/pocket/content/panels/tmpl/ho2/ho2_download_error.handlebars b/browser/components/pocket/content/panels/tmpl/ho2/ho2_download_error.handlebars similarity index 100% rename from browser/extensions/pocket/content/panels/tmpl/ho2/ho2_download_error.handlebars rename to browser/components/pocket/content/panels/tmpl/ho2/ho2_download_error.handlebars diff --git a/browser/extensions/pocket/content/panels/tmpl/ho2/ho2_sharebutton_v1.handlebars b/browser/components/pocket/content/panels/tmpl/ho2/ho2_sharebutton_v1.handlebars similarity index 100% rename from browser/extensions/pocket/content/panels/tmpl/ho2/ho2_sharebutton_v1.handlebars rename to browser/components/pocket/content/panels/tmpl/ho2/ho2_sharebutton_v1.handlebars diff --git a/browser/extensions/pocket/content/panels/tmpl/ho2/ho2_sharebutton_v2.handlebars b/browser/components/pocket/content/panels/tmpl/ho2/ho2_sharebutton_v2.handlebars similarity index 100% rename from browser/extensions/pocket/content/panels/tmpl/ho2/ho2_sharebutton_v2.handlebars rename to browser/components/pocket/content/panels/tmpl/ho2/ho2_sharebutton_v2.handlebars diff --git a/browser/extensions/pocket/content/panels/tmpl/ho2/ho2_sharebutton_v3.handlebars b/browser/components/pocket/content/panels/tmpl/ho2/ho2_sharebutton_v3.handlebars similarity index 100% rename from browser/extensions/pocket/content/panels/tmpl/ho2/ho2_sharebutton_v3.handlebars rename to browser/components/pocket/content/panels/tmpl/ho2/ho2_sharebutton_v3.handlebars diff --git a/browser/extensions/pocket/content/panels/tmpl/saved_premiumextras.handlebars b/browser/components/pocket/content/panels/tmpl/saved_premiumextras.handlebars similarity index 100% rename from browser/extensions/pocket/content/panels/tmpl/saved_premiumextras.handlebars rename to browser/components/pocket/content/panels/tmpl/saved_premiumextras.handlebars diff --git a/browser/extensions/pocket/content/panels/tmpl/saved_premiumshell.handlebars b/browser/components/pocket/content/panels/tmpl/saved_premiumshell.handlebars similarity index 100% rename from browser/extensions/pocket/content/panels/tmpl/saved_premiumshell.handlebars rename to browser/components/pocket/content/panels/tmpl/saved_premiumshell.handlebars diff --git a/browser/extensions/pocket/content/panels/tmpl/saved_shell.handlebars b/browser/components/pocket/content/panels/tmpl/saved_shell.handlebars similarity index 100% rename from browser/extensions/pocket/content/panels/tmpl/saved_shell.handlebars rename to browser/components/pocket/content/panels/tmpl/saved_shell.handlebars diff --git a/browser/extensions/pocket/content/panels/tmpl/saved_tmplogin.handlebars b/browser/components/pocket/content/panels/tmpl/saved_tmplogin.handlebars similarity index 100% rename from browser/extensions/pocket/content/panels/tmpl/saved_tmplogin.handlebars rename to browser/components/pocket/content/panels/tmpl/saved_tmplogin.handlebars diff --git a/browser/extensions/pocket/content/panels/tmpl/signup_shell.handlebars b/browser/components/pocket/content/panels/tmpl/signup_shell.handlebars similarity index 100% rename from browser/extensions/pocket/content/panels/tmpl/signup_shell.handlebars rename to browser/components/pocket/content/panels/tmpl/signup_shell.handlebars diff --git a/browser/extensions/pocket/content/panels/tmpl/signupstoryboard_shell.handlebars b/browser/components/pocket/content/panels/tmpl/signupstoryboard_shell.handlebars similarity index 100% rename from browser/extensions/pocket/content/panels/tmpl/signupstoryboard_shell.handlebars rename to browser/components/pocket/content/panels/tmpl/signupstoryboard_shell.handlebars diff --git a/browser/extensions/pocket/content/pktApi.jsm b/browser/components/pocket/content/pktApi.jsm similarity index 100% rename from browser/extensions/pocket/content/pktApi.jsm rename to browser/components/pocket/content/pktApi.jsm diff --git a/browser/extensions/pocket/content/pocket-content-process.js b/browser/components/pocket/content/pocket-content-process.js similarity index 100% rename from browser/extensions/pocket/content/pocket-content-process.js rename to browser/components/pocket/content/pocket-content-process.js diff --git a/browser/extensions/pocket/jar.mn b/browser/components/pocket/jar.mn similarity index 50% rename from browser/extensions/pocket/jar.mn rename to browser/components/pocket/jar.mn index 0d94d8931f16..478a084423dd 100644 --- a/browser/extensions/pocket/jar.mn +++ b/browser/components/pocket/jar.mn @@ -2,9 +2,9 @@ # 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/. -[features/firefox@getpocket.com] chrome.jar: -% content pocket %content/ contentaccessible=yes -% skin pocket-shared classic/1.0 %skin/shared/ - content/ (content/*) - skin/shared (skin/shared/*) +browser.jar: +% content pocket %content/pocket/ contentaccessible=yes +% skin pocket classic/1.0 %skin/classic/browser/pocket/ + content/pocket/ (content/*) + skin/classic/browser/pocket/ (skin/*) diff --git a/browser/extensions/pocket/locale/ach/pocket.properties b/browser/components/pocket/locale/ach/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/ach/pocket.properties rename to browser/components/pocket/locale/ach/pocket.properties diff --git a/browser/extensions/pocket/locale/ar/pocket.properties b/browser/components/pocket/locale/ar/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/ar/pocket.properties rename to browser/components/pocket/locale/ar/pocket.properties diff --git a/browser/extensions/pocket/locale/ast/pocket.properties b/browser/components/pocket/locale/ast/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/ast/pocket.properties rename to browser/components/pocket/locale/ast/pocket.properties diff --git a/browser/extensions/pocket/locale/az/pocket.properties b/browser/components/pocket/locale/az/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/az/pocket.properties rename to browser/components/pocket/locale/az/pocket.properties diff --git a/browser/extensions/pocket/locale/be/pocket.properties b/browser/components/pocket/locale/be/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/be/pocket.properties rename to browser/components/pocket/locale/be/pocket.properties diff --git a/browser/extensions/pocket/locale/bg/pocket.properties b/browser/components/pocket/locale/bg/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/bg/pocket.properties rename to browser/components/pocket/locale/bg/pocket.properties diff --git a/browser/extensions/pocket/locale/bn-BD/pocket.properties b/browser/components/pocket/locale/bn-BD/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/bn-BD/pocket.properties rename to browser/components/pocket/locale/bn-BD/pocket.properties diff --git a/browser/extensions/pocket/locale/bn-IN/pocket.properties b/browser/components/pocket/locale/bn-IN/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/bn-IN/pocket.properties rename to browser/components/pocket/locale/bn-IN/pocket.properties diff --git a/browser/extensions/pocket/locale/br/pocket.properties b/browser/components/pocket/locale/br/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/br/pocket.properties rename to browser/components/pocket/locale/br/pocket.properties diff --git a/browser/extensions/pocket/locale/bs/pocket.properties b/browser/components/pocket/locale/bs/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/bs/pocket.properties rename to browser/components/pocket/locale/bs/pocket.properties diff --git a/browser/extensions/pocket/locale/ca/pocket.properties b/browser/components/pocket/locale/ca/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/ca/pocket.properties rename to browser/components/pocket/locale/ca/pocket.properties diff --git a/browser/extensions/pocket/locale/cak/pocket.properties b/browser/components/pocket/locale/cak/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/cak/pocket.properties rename to browser/components/pocket/locale/cak/pocket.properties diff --git a/browser/extensions/pocket/locale/cs/pocket.properties b/browser/components/pocket/locale/cs/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/cs/pocket.properties rename to browser/components/pocket/locale/cs/pocket.properties diff --git a/browser/extensions/pocket/locale/cy/pocket.properties b/browser/components/pocket/locale/cy/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/cy/pocket.properties rename to browser/components/pocket/locale/cy/pocket.properties diff --git a/browser/extensions/pocket/locale/da/pocket.properties b/browser/components/pocket/locale/da/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/da/pocket.properties rename to browser/components/pocket/locale/da/pocket.properties diff --git a/browser/extensions/pocket/locale/de/pocket.properties b/browser/components/pocket/locale/de/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/de/pocket.properties rename to browser/components/pocket/locale/de/pocket.properties diff --git a/browser/extensions/pocket/locale/dsb/pocket.properties b/browser/components/pocket/locale/dsb/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/dsb/pocket.properties rename to browser/components/pocket/locale/dsb/pocket.properties diff --git a/browser/extensions/pocket/locale/el/pocket.properties b/browser/components/pocket/locale/el/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/el/pocket.properties rename to browser/components/pocket/locale/el/pocket.properties diff --git a/browser/extensions/pocket/locale/en-GB/pocket.properties b/browser/components/pocket/locale/en-GB/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/en-GB/pocket.properties rename to browser/components/pocket/locale/en-GB/pocket.properties diff --git a/browser/extensions/pocket/locale/en-US/pocket.properties b/browser/components/pocket/locale/en-US/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/en-US/pocket.properties rename to browser/components/pocket/locale/en-US/pocket.properties diff --git a/browser/extensions/pocket/locale/eo/pocket.properties b/browser/components/pocket/locale/eo/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/eo/pocket.properties rename to browser/components/pocket/locale/eo/pocket.properties diff --git a/browser/extensions/pocket/locale/es-AR/pocket.properties b/browser/components/pocket/locale/es-AR/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/es-AR/pocket.properties rename to browser/components/pocket/locale/es-AR/pocket.properties diff --git a/browser/extensions/pocket/locale/es-CL/pocket.properties b/browser/components/pocket/locale/es-CL/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/es-CL/pocket.properties rename to browser/components/pocket/locale/es-CL/pocket.properties diff --git a/browser/extensions/pocket/locale/es-ES/pocket.properties b/browser/components/pocket/locale/es-ES/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/es-ES/pocket.properties rename to browser/components/pocket/locale/es-ES/pocket.properties diff --git a/browser/extensions/pocket/locale/es-MX/pocket.properties b/browser/components/pocket/locale/es-MX/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/es-MX/pocket.properties rename to browser/components/pocket/locale/es-MX/pocket.properties diff --git a/browser/extensions/pocket/locale/et/pocket.properties b/browser/components/pocket/locale/et/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/et/pocket.properties rename to browser/components/pocket/locale/et/pocket.properties diff --git a/browser/extensions/pocket/locale/eu/pocket.properties b/browser/components/pocket/locale/eu/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/eu/pocket.properties rename to browser/components/pocket/locale/eu/pocket.properties diff --git a/browser/extensions/pocket/locale/fa/pocket.properties b/browser/components/pocket/locale/fa/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/fa/pocket.properties rename to browser/components/pocket/locale/fa/pocket.properties diff --git a/browser/extensions/pocket/locale/ff/pocket.properties b/browser/components/pocket/locale/ff/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/ff/pocket.properties rename to browser/components/pocket/locale/ff/pocket.properties diff --git a/browser/extensions/pocket/locale/fi/pocket.properties b/browser/components/pocket/locale/fi/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/fi/pocket.properties rename to browser/components/pocket/locale/fi/pocket.properties diff --git a/browser/extensions/pocket/locale/fr/pocket.properties b/browser/components/pocket/locale/fr/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/fr/pocket.properties rename to browser/components/pocket/locale/fr/pocket.properties diff --git a/browser/extensions/pocket/locale/fy-NL/pocket.properties b/browser/components/pocket/locale/fy-NL/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/fy-NL/pocket.properties rename to browser/components/pocket/locale/fy-NL/pocket.properties diff --git a/browser/extensions/pocket/locale/ga-IE/pocket.properties b/browser/components/pocket/locale/ga-IE/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/ga-IE/pocket.properties rename to browser/components/pocket/locale/ga-IE/pocket.properties diff --git a/browser/extensions/pocket/locale/gd/pocket.properties b/browser/components/pocket/locale/gd/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/gd/pocket.properties rename to browser/components/pocket/locale/gd/pocket.properties diff --git a/browser/extensions/pocket/locale/gl/pocket.properties b/browser/components/pocket/locale/gl/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/gl/pocket.properties rename to browser/components/pocket/locale/gl/pocket.properties diff --git a/browser/extensions/pocket/locale/gu-IN/pocket.properties b/browser/components/pocket/locale/gu-IN/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/gu-IN/pocket.properties rename to browser/components/pocket/locale/gu-IN/pocket.properties diff --git a/browser/extensions/pocket/locale/he/pocket.properties b/browser/components/pocket/locale/he/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/he/pocket.properties rename to browser/components/pocket/locale/he/pocket.properties diff --git a/browser/extensions/pocket/locale/hi-IN/pocket.properties b/browser/components/pocket/locale/hi-IN/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/hi-IN/pocket.properties rename to browser/components/pocket/locale/hi-IN/pocket.properties diff --git a/browser/extensions/pocket/locale/hr/pocket.properties b/browser/components/pocket/locale/hr/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/hr/pocket.properties rename to browser/components/pocket/locale/hr/pocket.properties diff --git a/browser/extensions/pocket/locale/hsb/pocket.properties b/browser/components/pocket/locale/hsb/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/hsb/pocket.properties rename to browser/components/pocket/locale/hsb/pocket.properties diff --git a/browser/extensions/pocket/locale/hu/pocket.properties b/browser/components/pocket/locale/hu/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/hu/pocket.properties rename to browser/components/pocket/locale/hu/pocket.properties diff --git a/browser/extensions/pocket/locale/hy-AM/pocket.properties b/browser/components/pocket/locale/hy-AM/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/hy-AM/pocket.properties rename to browser/components/pocket/locale/hy-AM/pocket.properties diff --git a/browser/extensions/pocket/locale/id/pocket.properties b/browser/components/pocket/locale/id/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/id/pocket.properties rename to browser/components/pocket/locale/id/pocket.properties diff --git a/browser/extensions/pocket/locale/is/pocket.properties b/browser/components/pocket/locale/is/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/is/pocket.properties rename to browser/components/pocket/locale/is/pocket.properties diff --git a/browser/extensions/pocket/locale/it/pocket.properties b/browser/components/pocket/locale/it/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/it/pocket.properties rename to browser/components/pocket/locale/it/pocket.properties diff --git a/browser/extensions/pocket/locale/ja/pocket.properties b/browser/components/pocket/locale/ja/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/ja/pocket.properties rename to browser/components/pocket/locale/ja/pocket.properties diff --git a/browser/extensions/pocket/locale/jar.mn b/browser/components/pocket/locale/jar.mn similarity index 98% rename from browser/extensions/pocket/locale/jar.mn rename to browser/components/pocket/locale/jar.mn index 2bfb89fc5db5..455507f77888 100644 --- a/browser/extensions/pocket/locale/jar.mn +++ b/browser/components/pocket/locale/jar.mn @@ -28,7 +28,7 @@ #define zh_CN zh-CN #define zh_TW zh-TW -[features/firefox@getpocket.com] @AB_CD@.jar: +@AB_CD@.jar: % locale pocket @AB_CD@ %locale/@AB_CD@/ # For locales we support, include the file from the locale's directory in the # source tree. diff --git a/browser/extensions/pocket/locale/ka/pocket.properties b/browser/components/pocket/locale/ka/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/ka/pocket.properties rename to browser/components/pocket/locale/ka/pocket.properties diff --git a/browser/extensions/pocket/locale/kab/pocket.properties b/browser/components/pocket/locale/kab/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/kab/pocket.properties rename to browser/components/pocket/locale/kab/pocket.properties diff --git a/browser/extensions/pocket/locale/kk/pocket.properties b/browser/components/pocket/locale/kk/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/kk/pocket.properties rename to browser/components/pocket/locale/kk/pocket.properties diff --git a/browser/extensions/pocket/locale/km/pocket.properties b/browser/components/pocket/locale/km/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/km/pocket.properties rename to browser/components/pocket/locale/km/pocket.properties diff --git a/browser/extensions/pocket/locale/kn/pocket.properties b/browser/components/pocket/locale/kn/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/kn/pocket.properties rename to browser/components/pocket/locale/kn/pocket.properties diff --git a/browser/extensions/pocket/locale/ko/pocket.properties b/browser/components/pocket/locale/ko/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/ko/pocket.properties rename to browser/components/pocket/locale/ko/pocket.properties diff --git a/browser/extensions/pocket/locale/lij/pocket.properties b/browser/components/pocket/locale/lij/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/lij/pocket.properties rename to browser/components/pocket/locale/lij/pocket.properties diff --git a/browser/extensions/pocket/locale/lt/pocket.properties b/browser/components/pocket/locale/lt/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/lt/pocket.properties rename to browser/components/pocket/locale/lt/pocket.properties diff --git a/browser/extensions/pocket/locale/ltg/pocket.properties b/browser/components/pocket/locale/ltg/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/ltg/pocket.properties rename to browser/components/pocket/locale/ltg/pocket.properties diff --git a/browser/extensions/pocket/locale/lv/pocket.properties b/browser/components/pocket/locale/lv/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/lv/pocket.properties rename to browser/components/pocket/locale/lv/pocket.properties diff --git a/browser/extensions/pocket/locale/mk/pocket.properties b/browser/components/pocket/locale/mk/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/mk/pocket.properties rename to browser/components/pocket/locale/mk/pocket.properties diff --git a/browser/extensions/pocket/locale/ml/pocket.properties b/browser/components/pocket/locale/ml/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/ml/pocket.properties rename to browser/components/pocket/locale/ml/pocket.properties diff --git a/browser/extensions/pocket/locale/moz.build b/browser/components/pocket/locale/moz.build similarity index 100% rename from browser/extensions/pocket/locale/moz.build rename to browser/components/pocket/locale/moz.build diff --git a/browser/extensions/pocket/locale/mr/pocket.properties b/browser/components/pocket/locale/mr/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/mr/pocket.properties rename to browser/components/pocket/locale/mr/pocket.properties diff --git a/browser/extensions/pocket/locale/ms/pocket.properties b/browser/components/pocket/locale/ms/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/ms/pocket.properties rename to browser/components/pocket/locale/ms/pocket.properties diff --git a/browser/extensions/pocket/locale/my/pocket.properties b/browser/components/pocket/locale/my/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/my/pocket.properties rename to browser/components/pocket/locale/my/pocket.properties diff --git a/browser/extensions/pocket/locale/nb-NO/pocket.properties b/browser/components/pocket/locale/nb-NO/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/nb-NO/pocket.properties rename to browser/components/pocket/locale/nb-NO/pocket.properties diff --git a/browser/extensions/pocket/locale/ne-NP/pocket.properties b/browser/components/pocket/locale/ne-NP/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/ne-NP/pocket.properties rename to browser/components/pocket/locale/ne-NP/pocket.properties diff --git a/browser/extensions/pocket/locale/nl/pocket.properties b/browser/components/pocket/locale/nl/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/nl/pocket.properties rename to browser/components/pocket/locale/nl/pocket.properties diff --git a/browser/extensions/pocket/locale/nn-NO/pocket.properties b/browser/components/pocket/locale/nn-NO/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/nn-NO/pocket.properties rename to browser/components/pocket/locale/nn-NO/pocket.properties diff --git a/browser/extensions/pocket/locale/oc/pocket.properties b/browser/components/pocket/locale/oc/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/oc/pocket.properties rename to browser/components/pocket/locale/oc/pocket.properties diff --git a/browser/extensions/pocket/locale/or/pocket.properties b/browser/components/pocket/locale/or/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/or/pocket.properties rename to browser/components/pocket/locale/or/pocket.properties diff --git a/browser/extensions/pocket/locale/pa-IN/pocket.properties b/browser/components/pocket/locale/pa-IN/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/pa-IN/pocket.properties rename to browser/components/pocket/locale/pa-IN/pocket.properties diff --git a/browser/extensions/pocket/locale/pl/pocket.properties b/browser/components/pocket/locale/pl/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/pl/pocket.properties rename to browser/components/pocket/locale/pl/pocket.properties diff --git a/browser/extensions/pocket/locale/pt-BR/pocket.properties b/browser/components/pocket/locale/pt-BR/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/pt-BR/pocket.properties rename to browser/components/pocket/locale/pt-BR/pocket.properties diff --git a/browser/extensions/pocket/locale/pt-PT/pocket.properties b/browser/components/pocket/locale/pt-PT/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/pt-PT/pocket.properties rename to browser/components/pocket/locale/pt-PT/pocket.properties diff --git a/browser/extensions/pocket/locale/rm/pocket.properties b/browser/components/pocket/locale/rm/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/rm/pocket.properties rename to browser/components/pocket/locale/rm/pocket.properties diff --git a/browser/extensions/pocket/locale/ro/pocket.properties b/browser/components/pocket/locale/ro/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/ro/pocket.properties rename to browser/components/pocket/locale/ro/pocket.properties diff --git a/browser/extensions/pocket/locale/ru/pocket.properties b/browser/components/pocket/locale/ru/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/ru/pocket.properties rename to browser/components/pocket/locale/ru/pocket.properties diff --git a/browser/extensions/pocket/locale/sk/pocket.properties b/browser/components/pocket/locale/sk/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/sk/pocket.properties rename to browser/components/pocket/locale/sk/pocket.properties diff --git a/browser/extensions/pocket/locale/sl/pocket.properties b/browser/components/pocket/locale/sl/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/sl/pocket.properties rename to browser/components/pocket/locale/sl/pocket.properties diff --git a/browser/extensions/pocket/locale/sq/pocket.properties b/browser/components/pocket/locale/sq/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/sq/pocket.properties rename to browser/components/pocket/locale/sq/pocket.properties diff --git a/browser/extensions/pocket/locale/sr/pocket.properties b/browser/components/pocket/locale/sr/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/sr/pocket.properties rename to browser/components/pocket/locale/sr/pocket.properties diff --git a/browser/extensions/pocket/locale/sv-SE/pocket.properties b/browser/components/pocket/locale/sv-SE/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/sv-SE/pocket.properties rename to browser/components/pocket/locale/sv-SE/pocket.properties diff --git a/browser/extensions/pocket/locale/ta/pocket.properties b/browser/components/pocket/locale/ta/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/ta/pocket.properties rename to browser/components/pocket/locale/ta/pocket.properties diff --git a/browser/extensions/pocket/locale/te/pocket.properties b/browser/components/pocket/locale/te/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/te/pocket.properties rename to browser/components/pocket/locale/te/pocket.properties diff --git a/browser/extensions/pocket/locale/th/pocket.properties b/browser/components/pocket/locale/th/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/th/pocket.properties rename to browser/components/pocket/locale/th/pocket.properties diff --git a/browser/extensions/pocket/locale/tl/pocket.properties b/browser/components/pocket/locale/tl/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/tl/pocket.properties rename to browser/components/pocket/locale/tl/pocket.properties diff --git a/browser/extensions/pocket/locale/tr/pocket.properties b/browser/components/pocket/locale/tr/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/tr/pocket.properties rename to browser/components/pocket/locale/tr/pocket.properties diff --git a/browser/extensions/pocket/locale/uk/pocket.properties b/browser/components/pocket/locale/uk/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/uk/pocket.properties rename to browser/components/pocket/locale/uk/pocket.properties diff --git a/browser/extensions/pocket/locale/ur/pocket.properties b/browser/components/pocket/locale/ur/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/ur/pocket.properties rename to browser/components/pocket/locale/ur/pocket.properties diff --git a/browser/extensions/pocket/locale/vi/pocket.properties b/browser/components/pocket/locale/vi/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/vi/pocket.properties rename to browser/components/pocket/locale/vi/pocket.properties diff --git a/browser/extensions/pocket/locale/zh-CN/pocket.properties b/browser/components/pocket/locale/zh-CN/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/zh-CN/pocket.properties rename to browser/components/pocket/locale/zh-CN/pocket.properties diff --git a/browser/extensions/pocket/locale/zh-TW/pocket.properties b/browser/components/pocket/locale/zh-TW/pocket.properties similarity index 100% rename from browser/extensions/pocket/locale/zh-TW/pocket.properties rename to browser/components/pocket/locale/zh-TW/pocket.properties diff --git a/browser/extensions/pocket/moz.build b/browser/components/pocket/moz.build similarity index 61% rename from browser/extensions/pocket/moz.build rename to browser/components/pocket/moz.build index d924dd7de736..76ac2b3049c1 100644 --- a/browser/extensions/pocket/moz.build +++ b/browser/components/pocket/moz.build @@ -7,19 +7,8 @@ with Files("**"): BUG_COMPONENT = ("Firefox", "Pocket") -DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION'] -DEFINES['MOZ_APP_MAXVERSION'] = CONFIG['MOZ_APP_MAXVERSION'] - DIRS += ['locale'] -FINAL_TARGET_FILES.features['firefox@getpocket.com'] += [ - 'bootstrap.js' -] - -FINAL_TARGET_PP_FILES.features['firefox@getpocket.com'] += [ - 'install.rdf.in' -] - BROWSER_CHROME_MANIFESTS += ['test/browser.ini'] JAR_MANIFESTS += ['jar.mn'] diff --git a/browser/extensions/pocket/skin/shared/library-pocket-animation.svg b/browser/components/pocket/skin/library-pocket-animation.svg similarity index 100% rename from browser/extensions/pocket/skin/shared/library-pocket-animation.svg rename to browser/components/pocket/skin/library-pocket-animation.svg diff --git a/browser/extensions/pocket/skin/shared/pocket-animation.svg b/browser/components/pocket/skin/pocket-animation.svg similarity index 100% rename from browser/extensions/pocket/skin/shared/pocket-animation.svg rename to browser/components/pocket/skin/pocket-animation.svg diff --git a/browser/extensions/pocket/skin/shared/pocket-outline.svg b/browser/components/pocket/skin/pocket-outline.svg similarity index 100% rename from browser/extensions/pocket/skin/shared/pocket-outline.svg rename to browser/components/pocket/skin/pocket-outline.svg diff --git a/browser/extensions/pocket/skin/shared/pocket.css b/browser/components/pocket/skin/pocket.css similarity index 92% rename from browser/extensions/pocket/skin/shared/pocket.css rename to browser/components/pocket/skin/pocket.css index 7786af0ab6b1..6f81ce07098d 100644 --- a/browser/extensions/pocket/skin/shared/pocket.css +++ b/browser/components/pocket/skin/pocket.css @@ -9,13 +9,13 @@ #pocket-button, #pageAction-panel-pocket { - list-style-image: url("chrome://pocket-shared/skin/pocket-outline.svg"); + list-style-image: url("chrome://pocket/skin/pocket-outline.svg"); } #appMenu-library-pocket-button, #pocket-button-box[open="true"] > #pocket-button, #pocket-button-box[pocketed="true"] > #pocket-button { - list-style-image: url("chrome://pocket-shared/skin/pocket.svg"); + list-style-image: url("chrome://pocket/skin/pocket.svg"); } #pocket-button-box[animate="true"] > #pocket-button, @@ -95,8 +95,8 @@ button always animates before the library button. */ #pocket-button-box:not([animate="true"]):hover > #pocket-animatable-box > #pocket-animatable-image, #pocket-button[animationsenabled][cui-areatype="toolbar"]:not([overflowedItem="true"]):not([open="true"]):hover > .toolbarbutton-animatable-box > .toolbarbutton-animatable-image { - background-image: url("chrome://pocket-shared/skin/pocket-animation.svg"), - url("chrome://pocket-shared/skin/library-pocket-animation.svg"); + background-image: url("chrome://pocket/skin/pocket-animation.svg"), + url("chrome://pocket/skin/library-pocket-animation.svg"); background-size: 0, 0; } @@ -105,7 +105,7 @@ animation-name: pocket-animation; animation-timing-function: steps(12); animation-duration: 200ms; - background-image: url("chrome://pocket-shared/skin/pocket-animation.svg"); + background-image: url("chrome://pocket/skin/pocket-animation.svg"); fill: #ef4056; -moz-context-properties: fill; width: 260px; @@ -164,7 +164,7 @@ } .toolbarbutton-animatable-box[animate="pocket"] > .toolbarbutton-animatable-image { - background-image: url("chrome://pocket-shared/skin/library-pocket-animation.svg"); + background-image: url("chrome://pocket/skin/library-pocket-animation.svg"); width: 1078px; animation-name: library-pocket-animation; animation-duration: 800ms; diff --git a/browser/extensions/pocket/skin/shared/pocket.svg b/browser/components/pocket/skin/pocket.svg similarity index 100% rename from browser/extensions/pocket/skin/shared/pocket.svg rename to browser/components/pocket/skin/pocket.svg diff --git a/browser/extensions/pocket/test/.eslintrc.js b/browser/components/pocket/test/.eslintrc.js similarity index 100% rename from browser/extensions/pocket/test/.eslintrc.js rename to browser/components/pocket/test/.eslintrc.js diff --git a/browser/extensions/pocket/test/browser.ini b/browser/components/pocket/test/browser.ini similarity index 100% rename from browser/extensions/pocket/test/browser.ini rename to browser/components/pocket/test/browser.ini diff --git a/browser/extensions/pocket/test/browser_pocket_ui_check.js b/browser/components/pocket/test/browser_pocket_ui_check.js similarity index 97% rename from browser/extensions/pocket/test/browser_pocket_ui_check.js rename to browser/components/pocket/test/browser_pocket_ui_check.js index d41003b5a23b..b29738df3e18 100644 --- a/browser/extensions/pocket/test/browser_pocket_ui_check.js +++ b/browser/components/pocket/test/browser_pocket_ui_check.js @@ -32,7 +32,7 @@ add_task(async function() { // check context menu exists info("checking content context menu"); - let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "https://example.com/browser/browser/extensions/pocket/test/test.html"); + let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "https://example.com/browser/browser/components/pocket/test/test.html"); let contextMenu = document.getElementById("contentAreaContextMenu"); let popupShown = BrowserTestUtils.waitForEvent(contextMenu, "popupshown"); diff --git a/browser/extensions/pocket/test/head.js b/browser/components/pocket/test/head.js similarity index 100% rename from browser/extensions/pocket/test/head.js rename to browser/components/pocket/test/head.js diff --git a/browser/extensions/pocket/test/test.html b/browser/components/pocket/test/test.html similarity index 100% rename from browser/extensions/pocket/test/test.html rename to browser/components/pocket/test/test.html diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build index 8a532b95912f..d32317d25d55 100644 --- a/browser/extensions/moz.build +++ b/browser/extensions/moz.build @@ -7,7 +7,6 @@ DIRS += [ 'formautofill', 'pdfjs', - 'pocket', 'screenshots', 'webcompat', 'webcompat-reporter' diff --git a/browser/extensions/pocket/install.rdf.in b/browser/extensions/pocket/install.rdf.in deleted file mode 100644 index babccfa5a886..000000000000 --- a/browser/extensions/pocket/install.rdf.in +++ /dev/null @@ -1,32 +0,0 @@ - - - -#filter substitution - - - - - firefox@getpocket.com - 1.0.5 - 2 - true - true - - - - - {ec8030f7-c20a-464f-9b0e-13a3a9e97384} - @MOZ_APP_VERSION@ - @MOZ_APP_MAXVERSION@ - - - - - Pocket - When you find something you want to view later, put it in Pocket. - - diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in index 355669183a8d..d2fc2c7300c1 100644 --- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in @@ -57,7 +57,7 @@ libs-%: ifneq (,$(wildcard ../extensions/formautofill/locales)) @$(MAKE) -C ../extensions/formautofill/locales AB_CD=$* XPI_NAME=locale-$* endif - @$(MAKE) -C ../extensions/pocket/locale AB_CD=$* XPI_NAME=locale-$* + @$(MAKE) -C ../components/pocket/locale AB_CD=$* XPI_NAME=locale-$* @$(MAKE) -C ../extensions/webcompat-reporter/locales AB_CD=$* XPI_NAME=locale-$* @$(MAKE) -C ../../devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)' @$(MAKE) -C ../../devtools/startup/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)' @@ -75,7 +75,7 @@ chrome-%: ifneq (,$(wildcard ../extensions/formautofill/locales)) @$(MAKE) -C ../extensions/formautofill/locales chrome AB_CD=$* endif - @$(MAKE) -C ../extensions/pocket/locale chrome AB_CD=$* + @$(MAKE) -C ../components/pocket/locale chrome AB_CD=$* @$(MAKE) -C ../../devtools/client/locales chrome AB_CD=$* @$(MAKE) -C ../../devtools/startup/locales chrome AB_CD=$* @$(MAKE) chrome AB_CD=$* diff --git a/testing/runtimes/mochitest-browser-chrome-e10s.runtimes.json b/testing/runtimes/mochitest-browser-chrome-e10s.runtimes.json index 405197bb53fa..a0e3ddb5a577 100644 --- a/testing/runtimes/mochitest-browser-chrome-e10s.runtimes.json +++ b/testing/runtimes/mochitest-browser-chrome-e10s.runtimes.json @@ -780,7 +780,7 @@ "browser/extensions/pdfjs/test/browser_pdfjs_navigation.js": 6302, "browser/extensions/pdfjs/test/browser_pdfjs_views.js": 4247, "browser/extensions/pdfjs/test/browser_pdfjs_zoom.js": 6099, - "browser/extensions/pocket/test/browser_pocket_ui_check.js": 3070, + "browser/components/pocket/test/browser_pocket_ui_check.js": 3070, "browser/extensions/shield-recipe-client/test/browser/browser_AddonStudies.js": 5032, "browser/extensions/shield-recipe-client/test/browser/browser_Heartbeat.js": 4712, "browser/extensions/shield-recipe-client/test/browser/browser_about_studies.js": 7504, diff --git a/toolkit/components/normandy/content/AboutPages.jsm b/toolkit/components/normandy/content/AboutPages.jsm index 76f6fde0fd3d..ac9236181e64 100644 --- a/toolkit/components/normandy/content/AboutPages.jsm +++ b/toolkit/components/normandy/content/AboutPages.jsm @@ -19,7 +19,7 @@ const SHIELD_LEARN_MORE_URL_PREF = "app.normandy.shieldLearnMoreUrl"; /** * Class for managing an about: page that Normandy provides. Adapted from - * browser/extensions/pocket/content/AboutPocket.jsm. + * browser/components/pocket/content/AboutPocket.jsm. * * @implements nsIFactory * @implements nsIAboutModule diff --git a/tools/lint/codespell.yml b/tools/lint/codespell.yml index e4b64cf8c36c..27257c252811 100644 --- a/tools/lint/codespell.yml +++ b/tools/lint/codespell.yml @@ -6,7 +6,7 @@ codespell: - browser/branding/ - browser/components/newtab/prerendered/locales/en-US/ - browser/extensions/formautofill/locales/en-US/ - - browser/extensions/pocket/locale/en-US/ + - browser/components/pocket/locale/en-US/ - browser/extensions/webcompat-reporter/locales/en-US/ - browser/locales/en-US/ - build/docs/