nsiPromptService

content/ErrorReport.ts

@@ -1,5 +1,7 @@
 Components.utils.import('resource://gre/modules/Services.jsm')
 
+import { PromptService } from './prompt'
+
 import { Preference } from './prefs'
 import { defaults } from '../gen/preferences/meta'
 import { byId } from '../gen/translators'
@@ -100,11 +102,10 @@ export class ErrorReport {
   }
 
   public restartWithDebugEnabled(): void {
-    const ps = Components.classes['@mozilla.org/embedcomp/prompt-service;1'].getService(Components.interfaces.nsIPromptService)
-    const buttonFlags = ps.BUTTON_POS_0 * ps.BUTTON_TITLE_IS_STRING
-        + ps.BUTTON_POS_1 * ps.BUTTON_TITLE_CANCEL
-        + ps.BUTTON_POS_2 * ps.BUTTON_TITLE_IS_STRING
-    const index = ps.confirmEx(
+    const buttonFlags = PromptService.BUTTON_POS_0 * PromptService.BUTTON_TITLE_IS_STRING
+        + PromptService.BUTTON_POS_1 * PromptService.BUTTON_TITLE_CANCEL
+        + PromptService.BUTTON_POS_2 * PromptService.BUTTON_TITLE_IS_STRING
+    const index = PromptService.confirmEx(
       null,
       Zotero.getString('zotero.debugOutputLogging'),
       Zotero.getString('zotero.debugOutputLogging.enabledAfterRestart', [Zotero.clientName]),

content/key-manager.ts

@@ -4,7 +4,7 @@ import { orchestrator } from './orchestrator'
 
 import ETA from 'node-eta'
 
-import { alert, prompt } from './prompt'
+import { alert, prompt, PromptService } from './prompt'
 
 import { kuroshiro } from './key-manager/japanese'
 import { chinese } from './key-manager/chinese'
@@ -173,12 +173,11 @@ export const KeyManager = new class _KeyManager {
       },
     }).length
     if (warnAt > 0 && affected > warnAt) {
-      const ps = Components.classes['@mozilla.org/embedcomp/prompt-service;1'].getService(Components.interfaces.nsIPromptService)
-      const index = ps.confirmEx(
+      const index = PromptService.confirmEx(
         null, // no parent
         'Better BibTeX for Zotero', // dialog title
         l10n.localize('better-bibtex_bulk-keys-confirm_warning', { treshold: warnAt }),
-        ps.STD_OK_CANCEL_BUTTONS + ps.BUTTON_POS_2 * ps.BUTTON_TITLE_IS_STRING, // buttons
+        PromptService.STD_OK_CANCEL_BUTTONS + PromptService.BUTTON_POS_2 * PromptService.BUTTON_TITLE_IS_STRING, // buttons
         null, null, l10n.localize('better-bibtex_bulk-keys-confirm_stop_asking'), // button labels
         null, {} // no checkbox
       )

content/path-search.ts

@@ -1,5 +1,4 @@
 import { log } from './logger'
-// import { OS } from '../typings/xpcom'
 
 // https://searchfox.org/mozilla-central/source/toolkit/modules/subprocess/subprocess_win.jsm#135 doesn't seem to work on Windows.
 export async function findBinary(bin: string, installationDirectory: { mac?: string[], win?: string[] } = {}): Promise<string> {

content/prompt.ts

@@ -1,12 +1,15 @@
-const ps = Components.classes['@mozilla.org/embedcomp/prompt-service;1'].getService(Components.interfaces.nsIPromptService)
+import { is7 } from './client'
+export const PromptService = is7
+  ? Services.prompt
+  : Components.classes['@mozilla.org/embedcomp/prompt-service;1'].getService(Components.interfaces.nsIPromptService)
 
 export function alert({ title, text }: { title?: string, text: string }): void {
-  ps.alert(null, title || 'Alert', text)
+  PromptService.alert(null, title || 'Alert', text)
 }
 
 export function prompt({ title, text, value }: { title?: string, text: string, value?: string }): string {
   const wrap = { value: value || '' }
-  if (ps.prompt(null, title || 'Enter text', text, wrap, null, {})) {
+  if (PromptService.prompt(null, title || 'Enter text', text, wrap, null, {})) {
     return wrap.value
   }
   else {

translators/lib/translator.ts

@@ -200,7 +200,7 @@ class Override {
   }
 
   public override(preference: string, extension: string): boolean {
-    const override = this.orig[`${preference}Override`]
+    const override: string = this.orig[`${preference}Override`]
     if (!this.exportPath || !override) {
       return false
     }