From 44b3e1bc350ceb1560176ee5b4ae97d9671a04db Mon Sep 17 00:00:00 2001 From: Simon Lydell Date: Sat, 19 Mar 2016 10:39:34 +0100 Subject: [PATCH] Drop support for Firefox < 45 --- documentation/api.md | 2 -- extension/bootstrap.coffee | 6 +----- extension/lib/commands.coffee | 2 -- extension/lib/hints.coffee | 6 +----- extension/lib/utils.coffee | 3 --- package.json | 2 +- 6 files changed, 3 insertions(+), 18 deletions(-) diff --git a/documentation/api.md b/documentation/api.md index 0cba13b..c6c9d36 100644 --- a/documentation/api.md +++ b/documentation/api.md @@ -638,8 +638,6 @@ A `vim` object has the following properties: - `'adjustable'`: An “adjustable” element (form control or video player). (See also the [`adjustable_element_keys`] option.) - `'findbar'`: The findbar text input is focused. - - `'other'`: Some other kind of element that can receive keystrokes. - (Deprecated.) - `'none'`: The currently focused element does not appear to respond to keystrokes in any special way. diff --git a/extension/bootstrap.coffee b/extension/bootstrap.coffee index 2623b5b..b19a6b7 100644 --- a/extension/bootstrap.coffee +++ b/extension/bootstrap.coffee @@ -40,11 +40,7 @@ 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') - 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') + Cu.import('resource://gre/modules/Console.jsm') shutdownHandlers = [] diff --git a/extension/lib/commands.coffee b/extension/lib/commands.coffee index 0cb239f..455171e 100644 --- a/extension/lib/commands.coffee +++ b/extension/lib/commands.coffee @@ -643,8 +643,6 @@ commands.esc = ({vim}) -> utils.blurActiveBrowserElement(vim) vim.window.DeveloperToolbar.hide() vim.window.gBrowser.getFindBar().close() - # TODO: Remove when Tab Groups have been removed. - vim.window.TabView?.hide() hints.removeHints(vim.window) # Better safe than sorry. unless help.getSearchInput(vim.window)?.getAttribute('focused') diff --git a/extension/lib/hints.coffee b/extension/lib/hints.coffee index c2d66bd..60b040f 100644 --- a/extension/lib/hints.coffee +++ b/extension/lib/hints.coffee @@ -25,11 +25,7 @@ huffman = require('n-ary-huffman') {Marker} = require('./marker') utils = require('./utils') -try - # TODO: Only use this path when Firefox 44 is released. - {devtools} = Cu.import('resource://devtools/shared/Loader.jsm', {}) -catch - {devtools} = Cu.import('resource://gre/modules/devtools/Loader.jsm', {}) +{devtools} = Cu.import('resource://devtools/shared/Loader.jsm', {}) CONTAINER_ID = 'VimFxMarkersContainer' diff --git a/extension/lib/utils.coffee b/extension/lib/utils.coffee index 55f6f6b..22ef536 100644 --- a/extension/lib/utils.coffee +++ b/extension/lib/utils.coffee @@ -216,9 +216,6 @@ getFocusType = (element) -> switch 'activatable' when isAdjustable(element) 'adjustable' - # TODO: Remove when Tab Groups have been removed. - when element.ownerGlobal?.TabView?.isVisible?() - 'other' else 'none' diff --git a/package.json b/package.json index a56c986..cc0f92d 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "VimFx", "version": "0.12.0", "firefoxVersions": { - "min": "43.0", + "min": "45.0", "max": "46.*" }, "license": "GPL-3.0+", -- 2.39.3