Skip to content

Commit

Permalink
Remove Firebug keyword so, it's easier to keep Firebug API out of HTTPM
Browse files Browse the repository at this point in the history
  • Loading branch information
janodvarko committed May 24, 2012
1 parent d282746 commit ab8d539
Show file tree
Hide file tree
Showing 11 changed files with 10 additions and 21 deletions.
4 changes: 0 additions & 4 deletions content/httpmonitor/base/module.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
/* See license.txt for terms of usage */

/**
* Firebug module can depend only on modules that don't use the 'Firebug' namespace.
* So, be careful before you create a new dependency.
*/
define([
"httpmonitor/lib/trace",
"httpmonitor/lib/css",
Expand Down
4 changes: 2 additions & 2 deletions content/httpmonitor/base/panel.js
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ var Panel = Obj.extend(new Listener(),
},

/**
* Firebug wants to show an object to the user and this panel has the best supportsObject()
* The framework wants to show an object to the user and this panel has the best supportsObject()
* result for the object. If the panel displays a container for objects of this type,
* it should set this.selectedObject = object
*/
Expand Down Expand Up @@ -354,7 +354,7 @@ var Panel = Obj.extend(new Listener(),

/**
* Called by chrome.onContextMenu to build the context menu when this panel has focus.
* See also FirebugRep for a similar function also called by onContextMenu
* See also rep.js for a similar function also called by onContextMenu
* Extensions may monkey patch and chain off this call
* @param object: the 'realObject', a model value, eg a DOM property
* @param target: the HTML element clicked on.
Expand Down
4 changes: 0 additions & 4 deletions content/httpmonitor/base/rep.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
/* See license.txt for terms of usage */

/**
* Firebug module can depend only on modules that don't use the 'Firebug' namespace.
* So, be careful before you create a new dependency.
*/
define([
"httpmonitor/lib/trace",
"httpmonitor/lib/css",
Expand Down
2 changes: 1 addition & 1 deletion content/httpmonitor/cache/tabCache.js
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ TabCache.prototype = Obj.extend(SourceCache.prototype,
// This new implementation (TabCache) uses nsITraceableChannel so, all responses
// should be already cached.

// xxxHonza: TODO entire implementation of this method should be removed in Firebug 1.5
// xxxHonza: TODO entire implementation of this method should be removed
// xxxHonza: let's try to get the response from the cache till #449198 is fixed.
var stream;
var responseText;
Expand Down
2 changes: 1 addition & 1 deletion content/httpmonitor/lib/dragdrop.js
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ var DragDrop = {};
DragDrop.Tracker = Tracker;

// ********************************************************************************************* //
// Registration in Firebug namespace
// Registration

return DragDrop;

Expand Down
2 changes: 1 addition & 1 deletion content/httpmonitor/lib/http.js
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ Http.getResource = function(aURL)
* headers using {@link Http.removeHeadersFromPostText}
*
* @param {Object} request The request object
* @param {Object} context Current Firebug context (to get charset of the current document)
* @param {Object} context Current context (to get charset of the current document)
*/
Http.readPostTextFromRequest = function(request, context)
{
Expand Down
2 changes: 1 addition & 1 deletion content/httpmonitor/lib/locale.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Cu.import("resource://gre/modules/PluralForm.jsm");
Cu.import("resource://gre/modules/Services.jsm");

// ********************************************************************************************* //
// Firebug UI Localization
// Localization

var stringBundleService = Services.strings;
var categoryManager = Cc["@mozilla.org/categorymanager;1"].getService(Ci.nsICategoryManager);
Expand Down
2 changes: 1 addition & 1 deletion content/httpmonitor/lib/string.js
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ Str.convertToUnicode = function(text, charset)
}

// the exception is worthless, make up a new one
throw new Error("Firebug failed to convert to unicode using charset: "+conv.charset+
throw new Error("Failed to convert to unicode using charset: "+conv.charset+
" in @mozilla.org/intl/scriptableunicodeconverter");
}
};
Expand Down
2 changes: 1 addition & 1 deletion content/httpmonitor/lib/url.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ Url.splitDataURL = function(url)
props[nv[0]] = nv[1];
}

// Additional Firebug-specific properties
// Additional properties
if (props.hasOwnProperty("fileName"))
{
var caller_URL = decodeURIComponent(props["fileName"]);
Expand Down
5 changes: 1 addition & 4 deletions content/httpmonitor/net/requestObserver.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ var categoryManager = Cc["@mozilla.org/categorymanager;1"].getService(Ci.nsICate

/**
* @service This service is intended as the only HTTP observer registered.
* All FB extensions and Firebug itself should register a listener within this
* All FB observers (can come from extensions) should register a listener within this
* service in order to listen for http-on-modify-request, http-on-examine-response and
* http-on-examine-cached-response events.
*
Expand Down Expand Up @@ -196,9 +196,6 @@ function getObserverList()
// ********************************************************************************************* //
// Registration

// Compatibility with Firebug 1.7 extensions: deprecated, obsolete
//FBL.httpObserver = HttpRequestObserver;

// xxxHonza: Do we need to remove the listener?
//TraceModule.addListener(new TraceListener("httpObserver.", "DBG_HTTPOBSERVER", true));

Expand Down
2 changes: 1 addition & 1 deletion modules/fbtrace.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
var EXPORTED_SYMBOLS = [];

// ********************************************************************************************* //
// Firebug Trace - FBTrace
// FBTrace

var Cu = Components.utils;
var scope = {};
Expand Down

0 comments on commit ab8d539

Please sign in to comment.