Permalink
Browse files

Merge remote-tracking branch 'upstream/master' into issue_5535

  • Loading branch information...
2 parents d7341ae + c45a984 commit 29aafda0b297d7cecb1288871bd222848ea9756c @fflorent committed Jul 9, 2012
Showing with 6,310 additions and 3,176 deletions.
  1. +1 −1 extension/content/firebug/branch.properties
  2. +7 −4 extension/content/firebug/chrome/chrome.js
  3. +10 −1 extension/content/firebug/chrome/firefox.js
  4. +51 −3 extension/content/firebug/chrome/reps.js
  5. +9 −9 extension/content/firebug/chrome/shortcuts.js
  6. +17 −2 extension/content/firebug/console/commandLine.js
  7. +48 −27 extension/content/firebug/console/commandLineExposed.js
  8. +162 −0 extension/content/firebug/console/commandLineHelp.js
  9. +2 −2 extension/content/firebug/console/commandLinePopup.js
  10. +2 −2 extension/content/firebug/console/console.js
  11. +1 −1 extension/content/firebug/console/consolePanel.js
  12. +2 −2 extension/content/firebug/console/memoryProfiler.js
  13. +5 −5 extension/content/firebug/console/profiler.js
  14. +2 −2 extension/content/firebug/cookies/cookiePanel.js
  15. +20 −20 extension/content/firebug/cookies/cookiePanel.xul
  16. +20 −6 extension/content/firebug/css/cssPanel.js
  17. +1 −1 extension/content/firebug/dom/domPanel.js
  18. +16 −3 extension/content/firebug/editor/editor.js
  19. +3 −4 extension/content/firebug/editor/editorSelector.js
  20. +1 −0 extension/content/firebug/firebug.js
  21. +31 −26 extension/content/firebug/firebugOverlay.xul
  22. +3 −3 extension/content/firebug/firefox/browserOverlay.css
  23. +159 −126 extension/content/firebug/firefox/browserOverlay.js
  24. +0 −20 extension/content/firebug/firefox/external-editors/editorsOverlay.xul
  25. +1 −1 extension/content/firebug/firefox/external-editors/externalEditors.js
  26. +4 −4 extension/content/firebug/firefox/firebugFrame.xul
  27. +0 −61 extension/content/firebug/firefox/firebugMenu.js
  28. +88 −90 extension/content/firebug/firefox/firebugMenuOverlay.xul
  29. +2 −2 extension/content/firebug/html/htmlPanel.js
  30. +4 −4 extension/content/firebug/html/inspector.js
  31. +8 −8 extension/content/firebug/js/breakpoint.js
  32. +10 −2 extension/content/firebug/js/debugger.js
  33. +12 −12 extension/content/firebug/js/scriptPanel.js
  34. +2 −2 extension/content/firebug/js/sourceFile.js
  35. +9 −3 extension/content/firebug/js/watchPanel.js
  36. +1 −1 extension/content/firebug/lib/options.js
  37. +80 −89 extension/content/firebug/lib/string.js
  38. +0 −1 extension/content/firebug/moduleConfig.js
  39. +1 −1 extension/content/firebug/net/netMonitor.js
  40. +32 −1 extension/content/firebug/net/netPanel.js
  41. +6 −1 extension/content/firebug/net/netReps.js
  42. +1 −1 extension/defaults/preferences/firebug.js
  43. +1 −1 extension/install.rdf
  44. +267 −0 extension/locale/el/cookies.properties
  45. +6 −6 extension/locale/el/firebug-amo.properties
  46. +3 −3 extension/locale/el/firebug-tracing.properties
  47. +735 −346 extension/locale/el/firebug.properties
  48. +41 −9 extension/locale/en-US/firebug.properties
  49. +65 −198 extension/locale/nl/cookies.properties
  50. +4 −4 extension/locale/nl/firebug-amo.properties
  51. +1 −1 extension/locale/nl/firebug-tracing.properties
  52. +533 −144 extension/locale/nl/firebug.properties
  53. BIN extension/skin/classic/bfcache-bk.png
  54. +57 −6 extension/skin/classic/console.css
  55. +3 −3 extension/skin/classic/firebug.css
  56. +4 −2 extension/skin/classic/net.css
  57. +2 −2 tests/FBTest/content/FBTestFirebug.js
  58. +1 −1 tests/FBTest/content/fbtest.properties
  59. +42 −43 tests/FBTest/content/overlayFirebug.js
  60. +0 −16 tests/FBTest/content/overlayFirebug.xul
  61. +23 −0 tests/content/commandLine/help.html
  62. +18 −0 tests/content/commandLine/help.js
  63. +41 −0 tests/content/console/3663/issue3663.html
  64. +21 −0 tests/content/console/3663/issue3663.js
  65. +5 −5 tests/content/console/3980/issue3980.js
  66. +1 −1 tests/content/console/api/profile.html
  67. +1 −1 tests/content/console/api/profile.js
  68. +2 −0 tests/content/firebug.html
  69. +1 −2 tests/content/firebug/5349/issue5349.js
  70. +16 −5 tests/content/firebug/changeUILocation.js
  71. +5 −5 tests/content/firebug/options/textSize.js
  72. +1 −1 tests/content/net/4689/issue4689.js
  73. +74 −0 tests/content/net/5592/issue5592.html
  74. +7 −0 tests/content/net/5592/issue5592.php
  75. +1 −1 trace/FBTrace/ant.properties
  76. +36 −37 trace/FBTrace/chrome/content/traceFirebugOverlay.js
  77. +0 −17 trace/FBTrace/chrome/content/traceFirebugOverlay.xul
  78. +1 −1 trace/FBTrace/chrome/firebug/content/branch.properties
  79. +10 −2 trace/FBTrace/chrome/firebug/content/chrome/activation.js
  80. +27 −5 trace/FBTrace/chrome/firebug/content/chrome/chrome.js
  81. +10 −1 trace/FBTrace/chrome/firebug/content/chrome/firefox.js
  82. +3 −2 trace/FBTrace/chrome/firebug/content/chrome/knownIssues.js
  83. +1 −1 trace/FBTrace/chrome/firebug/content/chrome/menu.js
  84. +1 −0 trace/FBTrace/chrome/firebug/content/chrome/panelActivation.js
  85. +111 −54 trace/FBTrace/chrome/firebug/content/chrome/reps.js
  86. +9 −9 trace/FBTrace/chrome/firebug/content/chrome/shortcuts.js
  87. +37 −9 trace/FBTrace/chrome/firebug/content/chrome/tabWatcher.js
  88. +73 −24 trace/FBTrace/chrome/firebug/content/console/autoCompleter.js
  89. +23 −6 trace/FBTrace/chrome/firebug/content/console/commandLine.js
  90. +48 −27 trace/FBTrace/chrome/firebug/content/console/commandLineExposed.js
  91. +162 −0 trace/FBTrace/chrome/firebug/content/console/commandLineHelp.js
  92. +2 −2 trace/FBTrace/chrome/firebug/content/console/commandLinePopup.js
  93. +3 −3 trace/FBTrace/chrome/firebug/content/console/console.js
  94. +5 −4 trace/FBTrace/chrome/firebug/content/console/consoleExposed.js
  95. +21 −8 trace/FBTrace/chrome/firebug/content/console/consolePanel.js
  96. +16 −37 trace/FBTrace/chrome/firebug/content/console/errors.js
  97. +2 −2 trace/FBTrace/chrome/firebug/content/console/memoryProfiler.js
  98. +5 −5 trace/FBTrace/chrome/firebug/content/console/profiler.js
  99. +35 −54 trace/FBTrace/chrome/firebug/content/cookies/breakpoints.js
  100. +1 −2 trace/FBTrace/chrome/firebug/content/cookies/cookie.js
  101. +82 −84 trace/FBTrace/chrome/firebug/content/cookies/cookieModule.js
  102. +44 −12 trace/FBTrace/chrome/firebug/content/cookies/cookieObserver.js
  103. +42 −36 trace/FBTrace/chrome/firebug/content/cookies/cookiePanel.js
  104. +59 −57 trace/FBTrace/chrome/firebug/content/cookies/cookiePanel.xul
  105. +11 −11 trace/FBTrace/chrome/firebug/content/cookies/cookiePermissions.js
  106. +93 −128 trace/FBTrace/chrome/firebug/content/cookies/cookieReps.js
  107. +5 −4 trace/FBTrace/chrome/firebug/content/cookies/cookieUtils.js
  108. +16 −6 trace/FBTrace/chrome/firebug/content/cookies/editCookie.js
  109. +13 −10 trace/FBTrace/chrome/firebug/content/cookies/editCookie.xul
  110. +4 −1 trace/FBTrace/chrome/firebug/content/cookies/headerResizer.js
  111. +2 −1 trace/FBTrace/chrome/firebug/content/cookies/httpObserver.js
  112. +85 −0 trace/FBTrace/chrome/firebug/content/cookies/legacy.js
  113. +23 −15 trace/FBTrace/chrome/firebug/content/cookies/menuUtils.js
  114. +18 −11 trace/FBTrace/chrome/firebug/content/css/computedPanel.js
  115. +30 −16 trace/FBTrace/chrome/firebug/content/css/cssModule.js
  116. +244 −68 trace/FBTrace/chrome/firebug/content/css/cssPanel.js
  117. +2 −1 trace/FBTrace/chrome/firebug/content/css/cssReps.js
  118. +36 −30 trace/FBTrace/chrome/firebug/content/css/stylePanel.js
  119. +23 −12 trace/FBTrace/chrome/firebug/content/dom/domBreakpointGroup.js
  120. +25 −14 trace/FBTrace/chrome/firebug/content/dom/domPanel.js
  121. +49 −5 trace/FBTrace/chrome/firebug/content/editor/editor.js
  122. +3 −4 trace/FBTrace/chrome/firebug/content/editor/editorSelector.js
  123. +13 −1 trace/FBTrace/chrome/firebug/content/firebug.css
  124. +137 −49 trace/FBTrace/chrome/firebug/content/firebug.js
  125. +32 −27 trace/FBTrace/chrome/firebug/content/firebugOverlay.xul
  126. +4 −1 trace/FBTrace/chrome/firebug/content/firefox/bindings.xml
  127. +3 −3 trace/FBTrace/chrome/firebug/content/firefox/browserOverlay.css
  128. +201 −148 trace/FBTrace/chrome/firebug/content/firefox/browserOverlay.js
  129. +1 −1 trace/FBTrace/chrome/firebug/content/firefox/external-editors/externalEditors.js
  130. +1 −0 trace/FBTrace/chrome/firebug/content/firefox/firebug.xul
  131. +4 −4 trace/FBTrace/chrome/firebug/content/firefox/firebugFrame.xul
  132. +88 −90 trace/FBTrace/chrome/firebug/content/firefox/firebugMenuOverlay.xul
  133. +13 −19 trace/FBTrace/chrome/firebug/content/firefox/start-button/startButtonOverlay.js
  134. +119 −85 trace/FBTrace/chrome/firebug/content/html/htmlPanel.js
  135. +4 −4 trace/FBTrace/chrome/firebug/content/html/inspector.js
  136. +0 −10 trace/FBTrace/chrome/firebug/content/html/layout.js
  137. +78 −12 trace/FBTrace/chrome/firebug/content/js/breakpoint.js
  138. +92 −37 trace/FBTrace/chrome/firebug/content/js/debugger.js
  139. +18 −14 trace/FBTrace/chrome/firebug/content/js/scriptPanel.js
  140. +1 −1 trace/FBTrace/chrome/firebug/content/js/sourceBox.js
  141. +8 −4 trace/FBTrace/chrome/firebug/content/js/sourceFile.js
  142. +7 −7 trace/FBTrace/chrome/firebug/content/js/stackFrame.js
  143. +9 −3 trace/FBTrace/chrome/firebug/content/js/watchPanel.js
  144. +532 −249 trace/FBTrace/chrome/firebug/content/lib/css.js
  145. +8 −8 trace/FBTrace/chrome/firebug/content/lib/dom.js
  146. +8 −4 trace/FBTrace/chrome/firebug/content/lib/options.js
  147. +3 −11 trace/FBTrace/chrome/firebug/content/lib/xml.js
  148. +1 −2 trace/FBTrace/chrome/firebug/content/moduleConfig.js
  149. +23 −13 trace/FBTrace/chrome/firebug/content/net/netDebugger.js
  150. +1 −1 trace/FBTrace/chrome/firebug/content/net/netMonitor.js
  151. +5 −4 trace/FBTrace/chrome/firebug/content/net/netPanel.js
  152. +24 −3 trace/FBTrace/chrome/firebug/content/net/netReps.js
  153. +47 −32 trace/FBTrace/chrome/firebug/modules/firebug-service.js
  154. +136 −0 trace/FBTrace/chrome/firebug/modules/gcli.js
  155. +8 −1 trace/FBTrace/chrome/firebug/modules/locale.js
  156. +3 −0 trace/FBTrace/chrome/firebug/modules/mini-require.js
  157. +2 −1 trace/FBTrace/chrome/firebug/modules/prefLoader.js
  158. +84 −3 trace/FBTrace/chrome/firebug/skin/classic/breakpoint.css
  159. +59 −7 trace/FBTrace/chrome/firebug/skin/classic/console.css
  160. +122 −0 trace/FBTrace/chrome/firebug/skin/classic/cookies/cookie.svg
  161. +31 −30 trace/FBTrace/chrome/firebug/skin/classic/cookies/cookies.css
  162. +6 −0 trace/FBTrace/chrome/firebug/skin/classic/cookies/trace.css
  163. +0 −86 trace/FBTrace/chrome/firebug/skin/classic/debugger.css
  164. +3 −3 trace/FBTrace/chrome/firebug/skin/classic/firebug.css
  165. +4 −0 trace/FBTrace/chrome/firebug/skin/classic/net.css
@@ -1,5 +1,5 @@
# DO NOT MERGE INTO TRUNK
-RELEASE=.0b2
+RELEASE=.0b3
VERSION=1.10
TRUNK=
# To allow build.xml to drop the xpi directly into the svn working copy for getfirebug.com
@@ -1056,6 +1056,9 @@ var FirebugChrome =
updateOrient: function(value)
{
var panelPane = FirebugChrome.$("fbPanelPane");
+ if (!panelPane)
+ return;
+
var newOrient = value ? "vertical" : "horizontal";
if (panelPane.orient == newOrient)
return;
@@ -1386,14 +1389,14 @@ var FirebugChrome =
onMenuShowing: function(popup)
{
- var detachFirebug = Dom.getElementsByAttribute(popup, "id", "menu_detachFirebug")[0];
+ var detachFirebug = Dom.getElementsByAttribute(popup, "id", "menu_firebug_detachFirebug")[0];
if (detachFirebug)
{
detachFirebug.setAttribute("label", (Firebug.isDetached() ?
Locale.$STR("firebug.AttachFirebug") : Locale.$STR("firebug.DetachFirebug")));
}
- var toggleFirebug = Dom.getElementsByAttribute(popup, "id", "menu_toggleFirebug")[0];
+ var toggleFirebug = Dom.getElementsByAttribute(popup, "id", "menu_firebug_toggleFirebug")[0];
if (toggleFirebug)
{
var fbContentBox = FirebugChrome.$("fbContentBox");
@@ -1469,7 +1472,7 @@ var FirebugChrome =
// selected in the panel.
var sel = target.ownerDocument.defaultView.getSelection();
if (!this.contextMenuObject &&
- !FirebugChrome.$("cmd_copy").getAttribute("disabled") &&
+ !FirebugChrome.$("cmd_copy").getAttribute("disabled") &&
!sel.isCollapsed)
{
var menuitem = Menu.createMenuItem(popup, {label: "Copy"});
@@ -1691,7 +1694,7 @@ var FirebugChrome =
breakOnNext: function(context, event)
{
// Avoid bubbling from associated options.
- if (event.target.id != "cmd_toggleBreakOn")
+ if (event.target.id != "cmd_firebug_toggleBreakOn")
return;
if (!context)
@@ -16,7 +16,16 @@ var wm = Cc["@mozilla.org/appshell/window-mediator;1"].getService(Ci.nsIWindowMe
function getBrowserDocument()
{
// TODO: this function is called very frequently, worth optimizing
- return Firebug.chrome.inDetachedScope ? Firebug.chrome.originalBrowser.ownerDocument : top.document;
+ try
+ {
+ var chrome = Firebug.chrome;
+ return chrome.inDetachedScope ? chrome.originalBrowser.ownerDocument : top.document;
+ }
+ catch (e)
+ {
+ if (FBTrace.DBG_ERRORS)
+ FBTrace.sysout("firefox.getBrowserDocument; EXCEPTION " + e, e);
+ }
}
// ********************************************************************************************* //
@@ -464,6 +464,49 @@ FirebugReps.Obj = domplate(Firebug.Rep,
}
});
+// ********************************************************************************************* //
+// Reference
+
+/**
+ * A placeholder used instead of cycle reference within arrays.
+ * @param {Object} target The original referenced object
+ */
+FirebugReps.ReferenceObj = function(target)
+{
+ this.target = target;
+}
+
+/**
+ * Rep for cycle reference in an array.
+ */
+FirebugReps.Reference = domplate(Firebug.Rep,
+{
+ tag:
+ OBJECTLINK({_repObject: "$object"},
+ SPAN({title: "$object|getTooltip"},
+ "[...]")
+ ),
+
+ // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ className: "Reference",
+
+ supportsObject: function(object, type)
+ {
+ return (object instanceof FirebugReps.ReferenceObj);
+ },
+
+ getTooltip: function(object)
+ {
+ return Locale.$STR("firebug.reps.reference");
+ },
+
+ getRealObject: function(object)
+ {
+ return object.target;
+ },
+});
+
// ********************************************************************************************* //
FirebugReps.Arr = domplate(Firebug.Rep,
@@ -513,12 +556,16 @@ FirebugReps.Arr = domplate(Firebug.Rep,
{
var delim = (i == array.length-1 ? "" : ", ");
var value = array[i];
+
+ // Cycle detected
+ if (value === array)
+ value = new FirebugReps.ReferenceObj(value);
+
var rep = Firebug.getRep(value);
var tag = rep.shortTag || rep.tag;
-
items.push({object: value, tag: tag, delim: delim});
}
- catch(exc)
+ catch (exc)
{
var rep = Firebug.getRep(exc);
var tag = rep.shortTag || rep.tag;
@@ -3158,7 +3205,8 @@ Firebug.registerRep(
FirebugReps.StorageList,
FirebugReps.Attr,
FirebugReps.Date,
- FirebugReps.NamedNodeMap
+ FirebugReps.NamedNodeMap,
+ FirebugReps.Reference
);
Firebug.setDefaultReps(FirebugReps.Func, FirebugReps.Obj);
@@ -61,16 +61,16 @@ Firebug.ShortcutsModel = Obj.extend(Firebug.Module,
var shortcut = branch.getCharPref("shortcut." + element);
var tokens = shortcut.split(" ");
var key = tokens.pop();
- var modifiers = tokens.join(",")
+ var modifiers = tokens.join(",");
- var keyElem = document.getElementById("key_" + element);
+ var keyElem = document.getElementById("key_firebug_" + element);
if (!keyElem)
{
// If key is not defined in xul, add it
keyElem = document.createElement("key");
keyElem.className = "fbOnlyKey";
- keyElem.id = "key_"+element;
- keyElem.command = "cmd_"+element;
+ keyElem.id = "key_firebug_" + element;
+ keyElem.command = "cmd_firebug_" + element;
document.getElementById("mainKeyset").appendChild(keyElem);
}
@@ -101,8 +101,7 @@ Firebug.ShortcutsModel = Obj.extend(Firebug.Module,
this.keysets.push(keyElem.parentNode);
// Modify shortcut for global key, if it exists
- var keyElem = Firefox.getElementById("key_" + element);
-
+ var keyElem = Firefox.getElementById("key_firebug_" + element);
if (!keyElem)
return;
@@ -113,10 +112,11 @@ Firebug.ShortcutsModel = Obj.extend(Firebug.Module,
}
// Disable existing global shortcuts
- var selector = "key["+attr+"='"+key+"'][modifiers='"+modifiers+"']"
- + ":not([id='key_"+element+"']):not([disabled='true'])";
+ var selector = "key[" + attr + "='" + key + "'][modifiers='" + modifiers + "']"
+ + ":not([id='key_firebug_" + element + "']):not([disabled='true'])";
+
var existingKeyElements = keyElem.ownerDocument.querySelectorAll(selector);
- for (var i = existingKeyElements.length - 1; i >= 0; i--)
+ for (var i=existingKeyElements.length-1; i>=0; i--)
{
var existingKeyElement = existingKeyElements[i];
existingKeyElement.setAttribute("disabled", "true");
@@ -21,12 +21,13 @@ define([
"firebug/console/eventMonitor",
"firebug/lib/keywords",
"firebug/console/console",
+ "firebug/console/commandLineHelp",
"firebug/console/commandLineExposed",
"firebug/console/autoCompleter",
"firebug/console/commandHistory"
],
function(Obj, Firebug, FirebugReps, Locale, Events, Wrapper, Url, Css, Dom, Firefox, Win, System,
- Xpath, Str, Xml, Arr, Persist, EventMonitor, Keywords, Console) {
+ Xpath, Str, Xml, Arr, Persist, EventMonitor, Keywords, Console, CommandLineHelp) {
// ********************************************************************************************* //
// Constants
@@ -1195,6 +1196,12 @@ function FirebugCommandLineAPI(context)
return Firebug.Console.getDefaultReturnValue(context.window);
};
+ this.help = function()
+ {
+ CommandLineHelp.render(context);
+ return Firebug.Console.getDefaultReturnValue(context.window);
+ };
+
// xxxHonza: removed from 1.10 (issue 5599)
/*this.memoryProfile = function(title)
{
@@ -1348,9 +1355,17 @@ Firebug.CommandLine.injector =
// ********************************************************************************************* //
// CommandLine Handler
+/**
+ * This object is responsible for handling commands executing in the page context.
+ * When a command (CMD API) is being executed, the page sends a DOM event that is
+ * handled by 'handleEvent' method.
+ *
+ * @param {Object} context
+ * @param {Object} win is the window the handler is bound into
+ */
function CommandLineHandler(context, win)
{
- this.handleEvent = function(event) // win is the window the handler is bound into
+ this.handleEvent = function(event)
{
context.baseWindow = context.baseWindow || context.window;
this.api = new FirebugCommandLineAPI(context);
Oops, something went wrong.

0 comments on commit 29aafda

Please sign in to comment.