Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Issue 5773: Firebug no longer displays 304 Not Modified lines in NET …

…panel
  • Loading branch information...
commit 24fd0aee5cc959c7ce5dda0b2b7e52de8835c79b 1 parent 32dfea3
Jan Odvarko authored August 02, 2012
6  extension/content/firebug/cookies/cookieModule.js
@@ -195,9 +195,6 @@ Firebug.CookieModule = Obj.extend(Firebug.ActivableModule,
195 195
 
196 196
         observerService.addObserver(HttpObserver, "http-on-modify-request", false);
197 197
         observerService.addObserver(HttpObserver, "http-on-examine-response", false);
198  
-        observerService.addObserver(HttpObserver, "http-on-examine-cached-response", false);
199  
-        observerService.addObserver(HttpObserver, "http-on-examine-merged-response", false);
200  
-
201 198
         observerService.addObserver(PermissionObserver, "perm-changed", false);
202 199
         registerCookieObserver(CookieObserver);
203 200
         prefs.addObserver(networkPrefDomain, PrefObserver, false);
@@ -220,9 +217,6 @@ Firebug.CookieModule = Obj.extend(Firebug.ActivableModule,
220 217
 
221 218
         observerService.removeObserver(HttpObserver, "http-on-modify-request");
222 219
         observerService.removeObserver(HttpObserver, "http-on-examine-response");
223  
-        observerService.removeObserver(HttpObserver, "http-on-examine-cached-response");
224  
-        observerService.removeObserver(HttpObserver, "http-on-examine-merged-response");
225  
-
226 220
         observerService.removeObserver(PermissionObserver, "perm-changed");
227 221
         unregisterCookieObserver(CookieObserver);
228 222
         prefs.removeObserver(networkPrefDomain, PrefObserver);
9  extension/content/firebug/cookies/httpObserver.js
@@ -40,14 +40,11 @@ var HttpObserver = Obj.extend(BaseObserver,
40 40
     {
41 41
         try {
42 42
             aSubject = aSubject.QueryInterface(Ci.nsIHttpChannel);
43  
-            if (aTopic == "http-on-modify-request")
  43
+            if (aTopic == "http-on-modify-request") {
44 44
                 this.onModifyRequest(aSubject);
45  
-            else if (aTopic == "http-on-examine-response")
46  
-                this.onExamineResponse(aSubject);
47  
-            else if (aTopic == "http-on-examine-cached-response")
48  
-                this.onExamineResponse(aSubject);
49  
-            else if (aTopic == "http-on-examine-merged-response")
  45
+            } else if (aTopic == "http-on-examine-response") {
50 46
                 this.onExamineResponse(aSubject);
  47
+            }
51 48
         }
52 49
         catch (err)
53 50
         {
2  extension/content/firebug/js/tabCache.js
@@ -202,8 +202,6 @@ Firebug.TabCacheModel = Obj.extend(Firebug.ActivableModule,
202 202
                 this.onExamineResponse(subject, win);
203 203
             else if (topic == "http-on-examine-cached-response")
204 204
                 this.onCachedResponse(subject, win);
205  
-            else if (topic == "http-on-examine-merged-response")
206  
-                this.onCachedResponse(subject, win);
207 205
         }
208 206
         catch (err)
209 207
         {
2  extension/content/firebug/net/netMonitor.js
@@ -399,8 +399,6 @@ var NetHttpObserver =
399 399
                 this.onExamineResponse(subject, win, tabId, context);
400 400
             else if (topic == "http-on-examine-cached-response")
401 401
                 this.onExamineCachedResponse(subject, win, tabId, context);
402  
-            else if (topic == "http-on-examine-merged-response")
403  
-                this.onExamineCachedResponse(subject, win, tabId, context);
404 402
         }
405 403
         catch (err)
406 404
         {
5  extension/content/firebug/net/requestObserver.js
@@ -49,7 +49,6 @@ var HttpRequestObserver =
49 49
             observerService.addObserver(this, "http-on-modify-request", false);
50 50
             observerService.addObserver(this, "http-on-examine-response", false);
51 51
             observerService.addObserver(this, "http-on-examine-cached-response", false);
52  
-            observerService.addObserver(this, "http-on-examine-merged-response", false);
53 52
         }
54 53
 
55 54
         this.observing = true;
@@ -66,7 +65,6 @@ var HttpRequestObserver =
66 65
             observerService.removeObserver(this, "http-on-modify-request");
67 66
             observerService.removeObserver(this, "http-on-examine-response");
68 67
             observerService.removeObserver(this, "http-on-examine-cached-response");
69  
-            observerService.removeObserver(this, "http-on-examine-merged-response");
70 68
         }
71 69
 
72 70
         this.observing = false;
@@ -85,8 +83,7 @@ var HttpRequestObserver =
85 83
             // Notify all registered observers.
86 84
             if (topic == "http-on-modify-request" ||
87 85
                 topic == "http-on-examine-response" ||
88  
-                topic == "http-on-examine-cached-response" ||
89  
-                topic == "http-on-examine-merged-response")
  86
+                topic == "http-on-examine-cached-response")
90 87
             {
91 88
                 this.notifyObservers(subject, topic, data);
92 89
             }
5  extension/content/firebug/net/spy.js
@@ -278,8 +278,7 @@ var SpyHttpObserver =
278 278
         {
279 279
             if (topic != "http-on-modify-request" &&
280 280
                 topic != "http-on-examine-response" &&
281  
-                topic != "http-on-examine-cached-response" &&
282  
-                topic != "http-on-examine-merged-response")
  281
+                topic != "http-on-examine-cached-response")
283 282
             {
284 283
                 if (FBTrace.DBG_ERRORS || FBTrace.DBG_SPY)
285 284
                     FBTrace.sysout("spy.SpyHttpObserver.observe; ERROR Unknown topic: " + topic);
@@ -320,8 +319,6 @@ var SpyHttpObserver =
320 319
                     this.requestStopped(request, xhr, spyContext, requestMethod, requestName);
321 320
                 else if (topic == "http-on-examine-cached-response")
322 321
                     this.requestStopped(request, xhr, spyContext, requestMethod, requestName);
323  
-                else if (topic == "http-on-examine-merged-response")
324  
-                    this.requestStopped(request, xhr, spyContext, requestMethod, requestName);
325 322
 
326 323
                 return;
327 324
             }
5  extension/modules/firebug-http-observer.js
@@ -69,7 +69,6 @@ var httpRequestObserver =
69 69
             observerService.addObserver(this, "http-on-modify-request", false);
70 70
             observerService.addObserver(this, "http-on-examine-response", false);
71 71
             observerService.addObserver(this, "http-on-examine-cached-response", false);
72  
-            observerService.addObserver(this, "http-on-examine-merged-response", false);
73 72
         }
74 73
 
75 74
         this.observing = true;
@@ -86,7 +85,6 @@ var httpRequestObserver =
86 85
             observerService.removeObserver(this, "http-on-modify-request");
87 86
             observerService.removeObserver(this, "http-on-examine-response");
88 87
             observerService.removeObserver(this, "http-on-examine-cached-response");
89  
-            observerService.removeObserver(this, "http-on-examine-merged-response");
90 88
         }
91 89
 
92 90
         this.observing = false;
@@ -113,8 +111,7 @@ var httpRequestObserver =
113 111
             // Notify all registered observers.
114 112
             if (topic == "http-on-modify-request" ||
115 113
                 topic == "http-on-examine-response" ||
116  
-                topic == "http-on-examine-cached-response" ||
117  
-                topic == "http-on-examine-merged-response")
  114
+                topic == "http-on-examine-cached-response")
118 115
             {
119 116
                 this.notifyObservers(subject, topic, data);
120 117
             }

0 notes on commit 24fd0ae

Please sign in to comment.
Something went wrong with that request. Please try again.