Permalink
Browse files

Initial integration changes

  • Loading branch information...
1 parent eae2759 commit 0174b8d91d5127cfd58c83ce62a2d5049b06b084 @janodvarko janodvarko committed May 9, 2012
View
@@ -0,0 +1,3 @@
+[submodule "extension/httpmonitor"]
+ path = extension/httpmonitor
+ url = git@github.com:firebug/httpmonitor.git
@@ -1,5 +1,6 @@
content firebug content/firebug/
content firebug content/firebug/ contentaccessible=yes
+content firebug-httpmonitor httpmonitor/content/httpmonitor/
# Maps resource://firebug/* to files in modules/*
# resource firebug modules/
@@ -27,17 +27,20 @@ Obj.bindFixed = function() // fn, thisObject, args => thisObject.fn(args);
Obj.extend = function(l, r)
{
- if (!l || !r)
+ var newOb = {};
+ for (var i=0; i<arguments.length; i++)
{
- FBTrace.sysout("object.extend; ERROR", [l, r]);
- throw new Error("Obj.extend on undefined object");
- }
+ var arg = arguments[i];
- var newOb = {};
- for (var n in l)
- newOb[n] = l[n];
- for (var n in r)
- newOb[n] = r[n];
+ if (!arg)
+ {
+ FBTrace.sysout("object.extend; ERROR", arguments);
+ throw new Error("Obj.extend on undefined object");
+ }
+
+ for (var n in arg)
+ newOb[n] = arg[n];
+ }
return newOb;
};
@@ -54,6 +54,10 @@ paths["firebug/firefox/window"] = "firebug/chrome/window";
paths["firebug/firefox/firefox"] = "firebug/chrome/firefox";
paths["firebug/net/httpLib"] = "firebug/lib/http";
+// HTTP Monitor
+paths["httpmonitor/lib/trace"] = "firebug/lib/trace";
+paths["httpmonitor/lib/locale"] = "firebug/lib/locale";
+
var originalLoad = require.load;
require.load = function(context, fullName, url)
{
@@ -23,7 +23,8 @@ Firebug.getModuleLoaderConfig = function(baseConfig)
baseConfig.paths = baseConfig.paths || {
"arch": baseConfig.arch,
- "firebug": "chrome://firebug/content"
+ "firebug": "chrome://firebug/content",
+ "httpmonitor": "chrome://firebug-httpmonitor/content"
};
var config = {};
Oops, something went wrong.

0 comments on commit 0174b8d

Please sign in to comment.