Skip to content

Commit

Permalink
revert some unnecessary changes
Browse files Browse the repository at this point in the history
  • Loading branch information
riedel committed Jul 7, 2020
1 parent dfa6e5a commit bc0de4f
Show file tree
Hide file tree
Showing 5 changed files with 199 additions and 204 deletions.
8 changes: 3 additions & 5 deletions bootstrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,12 @@ function loadIntoWindow(window) {
if ( !window ) return; // windows is the global host context
let document = window.document; // XULDocument
let type = document.documentElement.getAttribute('windowtype'); // documentElement maybe 'messengerWindow' / 'addressbookWindow'

if ( targetWindows.indexOf(type) < 0 ) return;

Services.console.logStringMessage("Expression Search: loading ExpressionSearchChrome");
ExpressionSearchChrome.init(); // will and add my filter, and TB want the domID exists when filter registered, so only called when have window ready
ExpressionSearchChrome.Load(window);
}

var windowListener = {
onOpenWindow: function(aWindow) {
let onLoadWindow = function() {
Expand Down Expand Up @@ -56,15 +54,15 @@ function startup(aData, aReason) {
// validator warnings on the below line, ignore it
if ( !sss.sheetRegistered(userCSS, sss.USER_SHEET) ) sss.loadAndRegisterSheet(userCSS, sss.USER_SHEET); // will be unregister when shutdown
}

function shutdown(aData, aReason) {
// When the application is shutting down we normally don't have to clean up any UI changes made
//** if (aReason == APP_SHUTDOWN) return;

try {
if ( sss.sheetRegistered(userCSS, sss.USER_SHEET) ) sss.unregisterSheet(userCSS, sss.USER_SHEET);
} catch (err) {Cu.reportError(err);}

try {
Services.obs.removeObserver(windowListener, observeEvent);
// Unload from any existing windows
Expand Down
Loading

0 comments on commit bc0de4f

Please sign in to comment.