[Pkg-mozext-commits] [firebug] 04/07: Issue 5773: Firebug no longer displays 304 Not Modified lines in NET panel
David Prévot
taffit at moszumanska.debian.org
Mon Mar 31 22:46:17 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to tag firebug-1.10.2
in repository firebug.
commit 7d75b94da7750cd3d369c2f9f7542c453a26eff6
Author: Jan Odvarko <odvarko at gmail.com>
Date: Thu Aug 2 19:15:45 2012 +0200
Issue 5773: Firebug no longer displays 304 Not Modified lines in NET panel
---
extension/content/firebug/cookies/cookieModule.js | 6 ------
extension/content/firebug/cookies/httpObserver.js | 9 +++------
extension/content/firebug/js/tabCache.js | 2 --
extension/content/firebug/net/netMonitor.js | 2 --
extension/content/firebug/net/requestObserver.js | 5 +----
extension/content/firebug/net/spy.js | 5 +----
extension/modules/firebug-http-observer.js | 5 +----
7 files changed, 6 insertions(+), 28 deletions(-)
diff --git a/extension/content/firebug/cookies/cookieModule.js b/extension/content/firebug/cookies/cookieModule.js
index 7fd31c6..0015b05 100644
--- a/extension/content/firebug/cookies/cookieModule.js
+++ b/extension/content/firebug/cookies/cookieModule.js
@@ -195,9 +195,6 @@ Firebug.CookieModule = Obj.extend(Firebug.ActivableModule,
observerService.addObserver(HttpObserver, "http-on-modify-request", false);
observerService.addObserver(HttpObserver, "http-on-examine-response", false);
- observerService.addObserver(HttpObserver, "http-on-examine-cached-response", false);
- observerService.addObserver(HttpObserver, "http-on-examine-merged-response", false);
-
observerService.addObserver(PermissionObserver, "perm-changed", false);
registerCookieObserver(CookieObserver);
prefs.addObserver(networkPrefDomain, PrefObserver, false);
@@ -220,9 +217,6 @@ Firebug.CookieModule = Obj.extend(Firebug.ActivableModule,
observerService.removeObserver(HttpObserver, "http-on-modify-request");
observerService.removeObserver(HttpObserver, "http-on-examine-response");
- observerService.removeObserver(HttpObserver, "http-on-examine-cached-response");
- observerService.removeObserver(HttpObserver, "http-on-examine-merged-response");
-
observerService.removeObserver(PermissionObserver, "perm-changed");
unregisterCookieObserver(CookieObserver);
prefs.removeObserver(networkPrefDomain, PrefObserver);
diff --git a/extension/content/firebug/cookies/httpObserver.js b/extension/content/firebug/cookies/httpObserver.js
index a82510f..e1713b1 100644
--- a/extension/content/firebug/cookies/httpObserver.js
+++ b/extension/content/firebug/cookies/httpObserver.js
@@ -40,14 +40,11 @@ var HttpObserver = Obj.extend(BaseObserver,
{
try {
aSubject = aSubject.QueryInterface(Ci.nsIHttpChannel);
- if (aTopic == "http-on-modify-request")
+ if (aTopic == "http-on-modify-request") {
this.onModifyRequest(aSubject);
- else if (aTopic == "http-on-examine-response")
- this.onExamineResponse(aSubject);
- else if (aTopic == "http-on-examine-cached-response")
- this.onExamineResponse(aSubject);
- else if (aTopic == "http-on-examine-merged-response")
+ } else if (aTopic == "http-on-examine-response") {
this.onExamineResponse(aSubject);
+ }
}
catch (err)
{
diff --git a/extension/content/firebug/js/tabCache.js b/extension/content/firebug/js/tabCache.js
index a608f5f..a9ddd37 100644
--- a/extension/content/firebug/js/tabCache.js
+++ b/extension/content/firebug/js/tabCache.js
@@ -202,8 +202,6 @@ Firebug.TabCacheModel = Obj.extend(Firebug.ActivableModule,
this.onExamineResponse(subject, win);
else if (topic == "http-on-examine-cached-response")
this.onCachedResponse(subject, win);
- else if (topic == "http-on-examine-merged-response")
- this.onCachedResponse(subject, win);
}
catch (err)
{
diff --git a/extension/content/firebug/net/netMonitor.js b/extension/content/firebug/net/netMonitor.js
index 7ee1031..b22cb8b 100644
--- a/extension/content/firebug/net/netMonitor.js
+++ b/extension/content/firebug/net/netMonitor.js
@@ -399,8 +399,6 @@ var NetHttpObserver =
this.onExamineResponse(subject, win, tabId, context);
else if (topic == "http-on-examine-cached-response")
this.onExamineCachedResponse(subject, win, tabId, context);
- else if (topic == "http-on-examine-merged-response")
- this.onExamineCachedResponse(subject, win, tabId, context);
}
catch (err)
{
diff --git a/extension/content/firebug/net/requestObserver.js b/extension/content/firebug/net/requestObserver.js
index f6c5c1b..c6d3125 100644
--- a/extension/content/firebug/net/requestObserver.js
+++ b/extension/content/firebug/net/requestObserver.js
@@ -49,7 +49,6 @@ var HttpRequestObserver =
observerService.addObserver(this, "http-on-modify-request", false);
observerService.addObserver(this, "http-on-examine-response", false);
observerService.addObserver(this, "http-on-examine-cached-response", false);
- observerService.addObserver(this, "http-on-examine-merged-response", false);
}
this.observing = true;
@@ -66,7 +65,6 @@ var HttpRequestObserver =
observerService.removeObserver(this, "http-on-modify-request");
observerService.removeObserver(this, "http-on-examine-response");
observerService.removeObserver(this, "http-on-examine-cached-response");
- observerService.removeObserver(this, "http-on-examine-merged-response");
}
this.observing = false;
@@ -85,8 +83,7 @@ var HttpRequestObserver =
// Notify all registered observers.
if (topic == "http-on-modify-request" ||
topic == "http-on-examine-response" ||
- topic == "http-on-examine-cached-response" ||
- topic == "http-on-examine-merged-response")
+ topic == "http-on-examine-cached-response")
{
this.notifyObservers(subject, topic, data);
}
diff --git a/extension/content/firebug/net/spy.js b/extension/content/firebug/net/spy.js
index eb0ac04..b6bc9c8 100644
--- a/extension/content/firebug/net/spy.js
+++ b/extension/content/firebug/net/spy.js
@@ -278,8 +278,7 @@ var SpyHttpObserver =
{
if (topic != "http-on-modify-request" &&
topic != "http-on-examine-response" &&
- topic != "http-on-examine-cached-response" &&
- topic != "http-on-examine-merged-response")
+ topic != "http-on-examine-cached-response")
{
if (FBTrace.DBG_ERRORS || FBTrace.DBG_SPY)
FBTrace.sysout("spy.SpyHttpObserver.observe; ERROR Unknown topic: " + topic);
@@ -320,8 +319,6 @@ var SpyHttpObserver =
this.requestStopped(request, xhr, spyContext, requestMethod, requestName);
else if (topic == "http-on-examine-cached-response")
this.requestStopped(request, xhr, spyContext, requestMethod, requestName);
- else if (topic == "http-on-examine-merged-response")
- this.requestStopped(request, xhr, spyContext, requestMethod, requestName);
return;
}
diff --git a/extension/modules/firebug-http-observer.js b/extension/modules/firebug-http-observer.js
index 8d52f9f..9e7aee6 100644
--- a/extension/modules/firebug-http-observer.js
+++ b/extension/modules/firebug-http-observer.js
@@ -69,7 +69,6 @@ var httpRequestObserver =
observerService.addObserver(this, "http-on-modify-request", false);
observerService.addObserver(this, "http-on-examine-response", false);
observerService.addObserver(this, "http-on-examine-cached-response", false);
- observerService.addObserver(this, "http-on-examine-merged-response", false);
}
this.observing = true;
@@ -86,7 +85,6 @@ var httpRequestObserver =
observerService.removeObserver(this, "http-on-modify-request");
observerService.removeObserver(this, "http-on-examine-response");
observerService.removeObserver(this, "http-on-examine-cached-response");
- observerService.removeObserver(this, "http-on-examine-merged-response");
}
this.observing = false;
@@ -113,8 +111,7 @@ var httpRequestObserver =
// Notify all registered observers.
if (topic == "http-on-modify-request" ||
topic == "http-on-examine-response" ||
- topic == "http-on-examine-cached-response" ||
- topic == "http-on-examine-merged-response")
+ topic == "http-on-examine-cached-response")
{
this.notifyObservers(subject, topic, data);
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/firebug.git
More information about the Pkg-mozext-commits
mailing list