Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Firefox] Stop importing default_preferences.js as a module and include it instead #4518

Merged
merged 1 commit into from
Mar 26, 2014
Merged

[Firefox] Stop importing default_preferences.js as a module and include it instead #4518

merged 1 commit into from
Mar 26, 2014

Conversation

Snuffleupagus
Copy link
Collaborator

Inspired by this thread, started by @nnethercote on dev.platform: https://groups.google.com/forum/#!topic/mozilla.dev.platform/sAuhWQOAWic.

This PR makes use of the preprocessor to include the file default_preferences.js, instead of loading it as a module in the MOZCENTRAL/FIREFOX builds.

The only way to test this is unfortunately to apply the patch, run node make {mozcentral, firefox}, and then check that DEFAULT_PREFERENCES is included properly in initializeDefaultPreferences (i.e. lines https://github.com/mozilla/pdf.js/blob/master/web/default_preferences.js#L23-L27 should appear) in the following files:

  • MOZCENTRAL - build/mozcentral/browser/extensions/pdfjs/content/PdfJs.jsm.
  • FIREFOX - build/firefox/bootstrap.js.

Note that the file default_preferences.js should not be present in the build directories, since it's no longer necessary.

yurydelendik added a commit that referenced this pull request Mar 26, 2014
…references

[Firefox] Stop importing default_preferences.js as a module and include it instead
@yurydelendik yurydelendik merged commit 483fc9f into mozilla:master Mar 26, 2014
@yurydelendik
Copy link
Contributor

Looks good

@Snuffleupagus Snuffleupagus deleted the firefox-include-default-preferences branch March 26, 2014 15:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants