commit c79bb726065ce296d567a6c9ac58b37b7d750318 Author: Georg Koppen gk@torproject.org Date: Sat Sep 1 20:29:42 2018 +0000

Revert "fixup! Bug 26961: New user onboarding."

This reverts commit 8b50d3f2f1bb5ce04ebf3a91ff701059fedb2da2. --- browser/extensions/onboarding/content/onboarding.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/browser/extensions/onboarding/content/onboarding.js b/browser/extensions/onboarding/content/onboarding.js index 4212e305a505..1f46abdb722d 100644 --- a/browser/extensions/onboarding/content/onboarding.js +++ b/browser/extensions/onboarding/content/onboarding.js @@ -23,8 +23,8 @@ const BRAND_SHORT_NAME = Services.strings const PROMPT_COUNT_PREF = "browser.onboarding.notification.prompt-count"; const NOTIFICATION_FINISHED_PREF = "browser.onboarding.notification.finished"; const ONBOARDING_DIALOG_ID = "onboarding-overlay-dialog"; -const ONBOARDING_MIN_WIDTH_PX = 200; -const SPEECH_BUBBLE_MIN_WIDTH_PX = 200; +const ONBOARDING_MIN_WIDTH_PX = 960; +const SPEECH_BUBBLE_MIN_WIDTH_PX = 960; const SPEECH_BUBBLE_NEWTOUR_STRING_ID = "onboarding.overlay-icon-tooltip2"; const SPEECH_BUBBLE_UPDATETOUR_STRING_ID = "onboarding.overlay-icon-tooltip-updated2"; const ICON_STATE_WATERMARK = "watermark"; @@ -629,7 +629,6 @@ class Onboarding { tour_type: this._tourType, });

- this._resizeUI(); this._window.addEventListener("beforeunload", this); this._window.addEventListener("unload", this); this._window.addEventListener("resize", this); @@ -643,7 +642,7 @@ class Onboarding { }

_resizeUI() { - this._windowWidth = this._window.innerWidth; + this._windowWidth = this._window.document.body.getBoundingClientRect().width; if (this._windowWidth < ONBOARDING_MIN_WIDTH_PX) { // Don't show the overlay UI before we get to a better, responsive design. this.destroy();