From fe79b1517c6cbc05b19b07bf3bc06c1d816572c1 Mon Sep 17 00:00:00 2001 From: Simon Lydell Date: Fri, 15 Jan 2016 19:40:07 +0100 Subject: [PATCH] Future-proof the `Cu.import` for `console` --- extension/bootstrap.coffee | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/extension/bootstrap.coffee b/extension/bootstrap.coffee index d6bfff7..52b0cad 100644 --- a/extension/bootstrap.coffee +++ b/extension/bootstrap.coffee @@ -50,7 +50,12 @@ do (global = this) -> # Make `Services` and `console` available globally, just like they are in # frame scripts by default. Cu.import('resource://gre/modules/Services.jsm') - Cu.import('resource://gre/modules/devtools/Console.jsm') + try + # TODO: Only use this path when Firefox 44 is released. + Cu.import('resource://gre/modules/Console.jsm') + catch + Cu.import('resource://gre/modules/devtools/Console.jsm') + FRAME_SCRIPT_ENVIRONMENT = null -- 2.39.3