From 32852cd2a1e3e9fd67de8cf3188ed1987f73eb3c Mon Sep 17 00:00:00 2001 From: Joscha Legewie Date: Sun, 20 Oct 2019 18:56:01 -0400 Subject: [PATCH] Avoid Cc/Ci boilerplate --- chrome/content/zotfile/options.js | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/chrome/content/zotfile/options.js b/chrome/content/zotfile/options.js index bb1bc1a5..758bc850 100644 --- a/chrome/content/zotfile/options.js +++ b/chrome/content/zotfile/options.js @@ -7,7 +7,8 @@ var Zotero = Components.classes["@zotero.org/Zotero;1"] .getService(Components.interfaces.nsISupports) .wrappedJSObject; -Components.utils.import("resource://gre/modules/osfile.jsm") +Components.utils.import("resource://gre/modules/osfile.jsm"); +Components.utils.import("resource://gre/modules/Services.jsm"); // function to disable prefernce in pref window // 'pref' can be passed as string or array @@ -115,9 +116,7 @@ var updatePreferenceWindow = function (which) { var checkRenameFormat = function(which) { try { // get current item - var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"] - .getService(Components.interfaces.nsIWindowMediator); - var win = wm.getMostRecentWindow("navigator:browser"); + var win = Services.wm.getMostRecentWindow("navigator:browser"); var items = win.ZoteroPane.getSelectedItems(); var item = items.length > 0 ? items[0] : Zotero.Items.get(1); // get renaming rules @@ -242,9 +241,7 @@ var checkFolderLocation = Zotero.Promise.coroutine(function* (folder) { var previewFilename = function() { try { // get current item - var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"] - .getService(Components.interfaces.nsIWindowMediator); - var win = wm.getMostRecentWindow("navigator:browser"); + var win = Services.wm.getMostRecentWindow("navigator:browser"); var items = win.ZoteroPane.getSelectedItems(); var item = items[0]; // get renaming rules