Closed Bug 1195962 Opened 9 years ago Closed 9 years ago

Remove #ifdefs from browser/components/uitour JS files

Categories

(Firefox :: Tours, defect)

defect
Not set
normal

Tracking

()

RESOLVED FIXED
Firefox 43
Tracking Status
firefox43 --- fixed

People

(Reporter: Gijs, Assigned: rhelmer)

References

(Blocks 1 open bug)

Details

Attachments

(1 file)

Hits:

browser/components/uitour/UITour.jsm:#ifdef XP_LINUX
browser/components/uitour/UITour.jsm:#endif
browser/components/uitour/UITour.jsm:#ifdef XP_LINUX
browser/components/uitour/UITour.jsm:#endif
browser/components/uitour/UITour.jsm:#ifdef MOZ_SERVICES_HEALTHREPORT
browser/components/uitour/UITour.jsm:#endif
browser/components/uitour/UITour.jsm:#ifdef MOZ_SERVICES_HEALTHREPORT
browser/components/uitour/UITour.jsm:#endif

All of these are available on AppConstants.jsm
With the fixes in comment 0 applied, it'd also be good to change moz.build for UITour.jsm from EXTRA_PP_JS_MODULES to EXTRA_JS_MODULES - as the need for preprocessing will have been eradicated.
bug 1195962 - replace #ifdef with AppConstants.jsm
Attachment #8651532 - Flags: review?(gijskruitbosch+bugs)
https://reviewboard.mozilla.org/r/16951/#review15041

::: browser/components/uitour/UITour.jsm:2191
(Diff revision 1)
> +function UITourTreatmentMeasurement1() {

UITourTreatmentMeasurement1() was moved to top-level because strict mode doesn't allow nesting functions, unless it's immediately following a top-level function definition - it was top-level before because of the #ifdef but is now inside a regular "if" block.
Comment on attachment 8651532 [details]
MozReview Request: bug 1195962 - replace #ifdef with AppConstants.jsm in UITour.jsm r=Gijs

https://reviewboard.mozilla.org/r/16953/#review15047

Ship It!
Attachment #8651532 - Flags: review?(gijskruitbosch+bugs) → review+
Assignee: nobody → rhelmer
Status: NEW → ASSIGNED
Keywords: checkin-needed
Comment on attachment 8651532 [details]
MozReview Request: bug 1195962 - replace #ifdef with AppConstants.jsm in UITour.jsm r=Gijs

bug 1195962 - replace #ifdef with AppConstants.jsm in UITour.jsm r=Gijs
Attachment #8651532 - Attachment description: MozReview Request: bug 1195962 - replace #ifdef with AppConstants.jsm → MozReview Request: bug 1195962 - replace #ifdef with AppConstants.jsm in UITour.jsm r=Gijs
Attachment #8651532 - Flags: review+ → review?(gijskruitbosch+bugs)
Comment on attachment 8651532 [details]
MozReview Request: bug 1195962 - replace #ifdef with AppConstants.jsm in UITour.jsm r=Gijs

Just changed the commit message to indicate that this is just for UITour.jsm
Attachment #8651532 - Flags: review?(gijskruitbosch+bugs) → review+
https://hg.mozilla.org/mozilla-central/rev/6076aea051ab
Status: ASSIGNED → RESOLVED
Closed: 9 years ago
Resolution: --- → FIXED
Target Milestone: --- → Firefox 43
You need to log in before you can comment on or make changes to this bug.