diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2020-02-06 09:43:27 -0500 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 12:39:08 +0200 |
| commit | ffe75592e3d23cefa4e4cbff3605836122002659 (patch) | |
| tree | 03f1e3f9a6cb6add3349e1d30a9664ed0df1cca6 /toolkit | |
| parent | 0084e719539d1ca985a9de7388a43501e728d4ef (diff) | |
| download | UXP-ffe75592e3d23cefa4e4cbff3605836122002659.tar UXP-ffe75592e3d23cefa4e4cbff3605836122002659.tar.gz UXP-ffe75592e3d23cefa4e4cbff3605836122002659.tar.lz UXP-ffe75592e3d23cefa4e4cbff3605836122002659.tar.xz UXP-ffe75592e3d23cefa4e4cbff3605836122002659.zip | |
Issue #65 - Remove AppConstants from toolkit/components/places
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/components/places/PlacesUtils.jsm | 7 | ||||
| -rw-r--r-- | toolkit/components/places/moz.build | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/toolkit/components/places/PlacesUtils.jsm b/toolkit/components/places/PlacesUtils.jsm index 5f6e81f18..259fb7aa7 100644 --- a/toolkit/components/places/PlacesUtils.jsm +++ b/toolkit/components/places/PlacesUtils.jsm @@ -30,7 +30,6 @@ const { classes: Cc, interfaces: Ci, results: Cr, utils: Cu } = Components; Cu.importGlobalProperties(["URL"]); Cu.import("resource://gre/modules/XPCOMUtils.jsm"); -Cu.import("resource://gre/modules/AppConstants.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "Services", "resource://gre/modules/Services.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "NetUtil", @@ -64,7 +63,11 @@ const MIN_TRANSACTIONS_FOR_BATCH = 5; // On Mac OSX, the transferable system converts "\r\n" to "\n\n", where // we really just want "\n". On other platforms, the transferable system // converts "\r\n" to "\n". -const NEWLINE = AppConstants.platform == "macosx" ? "\n" : "\r\n"; +#ifdef XP_MACOSX +const NEWLINE = "\n"; +#else +const NEWLINE = "\r\n"; +#endif function QI_node(aNode, aIID) { var result = null; diff --git a/toolkit/components/places/moz.build b/toolkit/components/places/moz.build index 85e1e93e1..478b18e02 100644 --- a/toolkit/components/places/moz.build +++ b/toolkit/components/places/moz.build @@ -72,9 +72,10 @@ if CONFIG['MOZ_PLACES']: 'PlacesSearchAutocompleteProvider.jsm', 'PlacesSyncUtils.jsm', 'PlacesTransactions.jsm', - 'PlacesUtils.jsm', ] + EXTRA_PP_JS_MODULES += ['PlacesUtils.jsm'] + EXTRA_COMPONENTS += [ 'ColorAnalyzer.js', 'nsLivemarkService.js', |