Changeset 1069

Timestamp:

2008-09-08 09:19:36 (2 months ago)

Author:

MaierMan

Message:

Relocate makeObserver

Files:

• trunk/chrome/content/common/internalFunctions.js (modified) (1 diff)
• trunk/chrome/content/common/overlayFunctions.js (modified) (1 diff)
• trunk/chrome/content/dta/manager.js (modified) (1 diff)
• trunk/chrome/content/dta/manager/alertservice.js (modified) (1 diff)
• trunk/chrome/content/dta/manager/prefs.js (modified) (1 diff)
• trunk/chrome/content/dta/select.js (modified) (1 diff)
• trunk/chrome/content/integration/toolbarButtons.js (modified) (1 diff)
• trunk/chrome/content/preferences/prefs.js (modified) (1 diff)
• trunk/modules/preferences.jsm (modified) (3 diffs)

trunk/chrome/content/common/internalFunctions.js

@@ -400 +400 @@
-}
-
-var makeObserver = DTA_makeObserver;
-
-/**
- * Encapulates all stringbundles of the current document and provides unified

trunk/chrome/content/common/overlayFunctions.js

@@ -607 +607 @@
-        return null;
-}
-
-/**
- * Tiny helper to "convert" given object into a weak observer. Object must still
- * implement .observe()
- * 
- * @author Nils
- * @param obj
- *          Object to convert
- */
-function DTA_makeObserver(obj) {
-        // nsiSupports
-        let __QueryInterface = obj.QueryInterface;
-        obj.QueryInterface = function(iid) {
-                try {
-                        if (
-                                iid.equals(Components.interfaces.nsISupports)
-                                || iid.equals(Components.interfaces.nsISupportsWeakReference)
-                                || iid.equals(Components.interfaces.nsIWeakReference)
-                                || iid.equals(Components.interfaces.nsIObserver)
-                        ) {
-                                return obj;
-                        }
-                        if (__QueryInterface) {
-                                debug("calling original: " + iid);
-                                return __QueryInterface.call(this, iid);
-                        }
-                        throw Components.results.NS_ERROR_NO_INTERFACE;
-                }
-                catch (ex) {
-                        debug("requested interface not available: " + iid);
-                        throw ex;
-                }
-        };
-        // nsiWeakReference
-        obj.QueryReferent = function(iid) {
-                return obj.QueryInterface(iid);
-        };
-        // nsiSupportsWeakReference
-        obj.GetWeakReference = function() {
-                return obj;
-        };      
-}

trunk/chrome/content/dta/manager.js

@@ -139 +139 @@
-                }
-                
-
+Preferences.
-                this._observes.forEach(
-                        function(topic) {

trunk/chrome/content/dta/manager/alertservice.js

@@ -43 +43 @@
-                        try {
-                                this._service = Serv('@mozilla.org/alerts-service;1', 'nsIAlertsService');
-
+Preferences.
-                                this._available = true;
-                        }

trunk/chrome/content/dta/manager/prefs.js

@@ -71 +71 @@
-
-        init: function() {
-                makeObserver(this);
-
-                try {
-                        this._resetConnPrefs();

trunk/chrome/content/dta/select.js

@@ -801 +801 @@
-        // * filterManager
-        registerObserver: function() {
-
+Preferences.
-                try {
-                        var os = Cc["@mozilla.org/observer-service;1"]

trunk/chrome/content/integration/toolbarButtons.js

@@ -43 +43 @@
-                        }
-                );
-                DTA_makeObserver(this);
-                DTA_preferences.addObserver("extensions.dta.sm.", this);
-                this._refresh();

trunk/chrome/content/preferences/prefs.js

@@ -202 +202 @@
-                registerObserver: function() {
-                        try {
-
+Preferences.
-                                var os = Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService);
-                                os.addObserver(this, 'DTA:filterschanged', true);

trunk/modules/preferences.jsm

@@ -50 +50 @@
-        'resetAllExt',
-        'addObserver',
-
+
+
-];
-
@@ -189 +190 @@
-
-function addObserver(branch, obj) {
+        makeObserver(obj);
-        prefs.QueryInterface(nsIPrefBranch2).addObserver(branch, obj, true);
-}
@@ -195 +197 @@
-        prefs.QueryInterface(nsIPrefBranch2).removeObserver(branch, obj);
-}
+
+function makeObserver(obj) {
+        try {
+                if (
+                        obj.QueryInterface(Ci.nsISupportsWeakReference)
+                        && obj.QueryInterface(Ci.nsIObserver)
+                ) {
+                        return;
+                }
+        }
+        catch (ex) {
+                // fall-through
+        }
+        let __QueryInterface = obj.QueryInterface;
+        obj.QueryInterface = function(iid) {
+                try {
+                        if (
+                                iid.equals(Components.interfaces.nsISupports)
+                                || iid.equals(Components.interfaces.nsISupportsWeakReference)
+                                || iid.equals(Components.interfaces.nsIWeakReference)
+                                || iid.equals(Components.interfaces.nsIObserver)
+                        ) {
+                                return obj;
+                        }
+                        if (__QueryInterface) {
+                                debug("calling original: " + iid);
+                                return __QueryInterface.call(this, iid);
+                        }
+                        throw Components.results.NS_ERROR_NO_INTERFACE;
+                }
+                catch (ex) {
+                        debug("requested interface not available: " + iid);
+                        throw ex;
+                }
+        };
+        // nsiWeakReference
+        obj.QueryReferent = function(iid) {
+                return obj.QueryInterface(iid);
+        };
+        // nsiSupportsWeakReference
+        obj.GetWeakReference = function() {
+                return obj;
+        };      
+}