issue #290 - [seamonkey] blockable items list persists on tab changes

lib/appSupport.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 127 matching lines @@
 /**
  * Maps windows to a list of progress listeners.
  */
 let progressListeners = new WeakMap();
 
 /**
  * Makes sure that a function is called whenever the displayed browser location changes.
  */
 exports.addBrowserLocationListener = function addBrowserLocationListener(/**Window*/ window, /**Function*/ callback, /**Boolean*/ ignoreSameDoc)
 {
-  _addBrowserLocationListener(window, callback, ignoreSameDoc);
-};
-
-function _addBrowserLocationListener(/**Window*/ window, /**Function*/ callback, /**Boolean*/ ignoreSameDoc)
-{
   let browser = (exports.getBrowser ? exports.getBrowser(window) : null);
   if (browser)
   {
     let dummy = function() {};
     let progressListener =
     {
       callback: callback,
       onLocationChange: function(progress, request, uri, flags)
       {
         if (!ignoreSameDoc || !flags || !(flags & Ci.nsIWebProgressListener.LOCATION_CHANGE_SAME_DOCUMENT))
           this.callback();
       },
       onProgressChange: dummy,
       onSecurityChange: dummy,
       onStateChange: dummy,
       onStatusChange: dummy,
       QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener, Ci.nsISupportsWeakReference])
     };
     browser.addProgressListener(progressListener);
 
     if (progressListeners.has(window))
       progressListeners.get(window).push(progressListener);
     else
       progressListeners.set(window, [progressListener]);
   }
-}
+};
 
 /**
  * Removes a location listener registered for a window.
  */
 exports.removeBrowserLocationListener = function removeBrowserLocationListener(/**Window*/ window, /**Function*/ callback)
 {
   if (!progressListeners.has(window))
     return;
 
   let browser = (exports.getBrowser ? exports.getBrowser(window) : null);
@@ skipping 169 matching lines @@
           return null;
         }
       }
       else
       {
         let browser = exports.getBrowser(window);
         return (browser ? browser.currentURI : null);
       }
     };
     
-    exports.addBrowserLocationListener = function addBrowserLocationListener(/**Window*/ window, /**Function*/ callback, /**Boolean*/ ignoreSameDoc)
-    {
-      // for Seamonkey we have to ignore same document flag because of bug #1035171

[Wladimir Palant, 2014/07/08 11:29:02]

Please use a link, otherwise it won't be obvious where to look up this bug
number (our bug database, Mozilla's, Chrome's).

[saroyanm, 2014/07/08 11:58:42]

Done.

-      _addBrowserLocationListener(window, callback, false);
+    // for Seamonkey we have to ignore same document flag because of
+    // bug #1035171 (https://bugzilla.mozilla.org/show_bug.cgi?id=1035171)
+    let origAddBrowserLocationListener = exports.addBrowserLocationListener;
+    exports.addBrowserLocationListener = function sm_addBrowserLocationListener(window, callback, ignoreSameDoc)
+    {
+      origAddBrowserLocationListener(window, callback, false);
     };

[Wladimir Palant, 2014/07/08 11:29:02]

Forcing the ignoreSameDoc parameter to be always false seems to be a sensible
approach. However, I would prefer keeping the entire hack in the SeaMonkey
section then. Something along these lines:

  let origAddBrowserLocationListener = exports.addBrowserLocationListener;
  exports.addBrowserLocationListener = function
sm_addBrowserLocationListener(window, callback, ignoreSameDoc)
  {
    origAddBrowserLocationListener(window, callback, false);
  };

[saroyanm, 2014/07/08 11:58:42]

I like this :)

 
     exports.contentContextMenu = ["contentAreaContextMenu", "mailContext"];
 
     exports.defaultToolbarPosition = {
       parent: ["PersonalToolbar", "msgToolbar"],
       before: ["bookmarks-button", "button-junk"]
     };
 
     exports.statusbarPosition = {
       parent: "status-bar"
@@ skipping 567 matching lines @@
             event.state = {id: require("info").addonID};
             browser._contentWindow.dispatchEvent(event);
           });
         });
       }, true);
     };
 
     break;
   }
 }