Permalink
Browse files

Merge branch 'master' into httpmonitor

  • Loading branch information...
2 parents ee62449 + 3652209 commit 4f1bbb1340e304a0cca7e515481a0e4a56956cbf @janodvarko janodvarko committed May 30, 2012
Showing with 2,794 additions and 1,294 deletions.
  1. +2 −0 .gitignore
  2. +1 −1 extension/content/firebug/accessible/a11y.js
  3. +1 −1 extension/content/firebug/branch.properties
  4. +4 −4 extension/content/firebug/chrome/reps.js
  5. +247 −83 extension/content/firebug/console/autoCompleter.js
  6. +7 −2 extension/content/firebug/console/commandEditor.js
  7. +10 −6 extension/content/firebug/console/commandLineExposed.js
  8. +17 −21 extension/content/firebug/css/computedPanel.js
  9. +45 −3 extension/content/firebug/css/cssModule.js
  10. +97 −60 extension/content/firebug/css/cssPanel.js
  11. +3 −2 extension/content/firebug/css/cssReps.js
  12. +116 −29 extension/content/firebug/css/stylePanel.js
  13. +13 −5 extension/content/firebug/editor/editor.js
  14. +1 −1 extension/content/firebug/firebug.js
  15. +6 −30 extension/content/firebug/firefox/browserOverlay.css
  16. +8 −4 extension/content/firebug/firefox/browserOverlay.js
  17. +159 −0 extension/content/firebug/html/highlighterCache.js
  18. +2 −1 extension/content/firebug/html/htmlLib.js
  19. +126 −46 extension/content/firebug/html/htmlPanel.js
  20. +9 −8 extension/content/firebug/html/insideOutBox.js
  21. +177 −289 extension/content/firebug/html/inspector.js
  22. +71 −2 extension/content/firebug/lib/css.js
  23. +1 −0 extension/content/firebug/lib/options.js
  24. +1 −1 extension/install.rdf
  25. +21 −2 extension/locale/en-US/firebug.properties
  26. +7 −9 extension/locale/pl/firebug-amo.properties
  27. +64 −6 extension/locale/pl/firebug-tracing.properties
  28. +538 −490 extension/locale/pl/firebug.properties
  29. +5 −2 extension/modules/loader.js
  30. BIN extension/skin/classic/Templarian_inspector.png
  31. +3 −3 extension/skin/classic/console.css
  32. +4 −2 extension/skin/classic/css.css
  33. BIN extension/skin/classic/disable.png
  34. +18 −0 extension/skin/classic/disable.svg
  35. BIN extension/skin/classic/disableHover.png
  36. +1 −1 extension/skin/classic/dom.css
  37. +40 −0 extension/skin/classic/error.svg
  38. BIN extension/skin/classic/errorIcon-sm.png
  39. BIN extension/skin/classic/errorIcon.png
  40. +40 −0 extension/skin/classic/errorSmall.svg
  41. BIN extension/skin/classic/firebug-gray-16.png
  42. +2 −2 extension/skin/classic/firebug.css
  43. +38 −0 extension/skin/classic/info.svg
  44. BIN extension/skin/classic/infoIcon.png
  45. BIN extension/skin/classic/inspect.png
  46. +1 −1 extension/skin/classic/net.css
  47. BIN extension/skin/classic/notloading_16.png
  48. BIN extension/skin/classic/okIcon-sm.png
  49. +15 −119 extension/skin/classic/orion-firebug.css
  50. +48 −0 extension/skin/classic/warning.svg
  51. BIN extension/skin/classic/warningIcon.png
  52. +25 −4 tests/FBTest/content/FBTestFirebug.js
  53. +1 −1 tests/FBTest/content/fbtest.properties
  54. +1 −1 tests/FBTest/content/testConsole.js
  55. +1 −0 tests/content/commandLine/2934/issue2934.html
  56. +1 −0 tests/content/commandLine/3363/issue3363.html
  57. +1 −0 tests/content/commandLine/3599/issue3599.html
  58. +1 −0 tests/content/commandLine/3703/issue3703.html
  59. +1 −0 tests/content/commandLine/3709/issue3709.htm
  60. +1 −0 tests/content/commandLine/4209/issue4209.html
  61. +1 −0 tests/content/commandLine/4234/issue4234.html
  62. +1 −0 tests/content/commandLine/4391/issue4391.html
  63. +1 −0 tests/content/commandLine/4453/issue4453.html
  64. +59 −0 tests/content/console/completion/3660/issue3660.html
  65. +221 −0 tests/content/console/completion/3660/issue3660.js
  66. +2 −1 tests/content/css/5262/issue5262.js
  67. +38 −0 tests/content/css/5430/issue5430.html
  68. +23 −0 tests/content/css/5430/issue5430.js
  69. +41 −0 tests/content/css/5461/issue5461.html
  70. +42 −0 tests/content/css/5461/issue5461.js
  71. +46 −0 tests/content/css/5469/issue5469.html
  72. +41 −0 tests/content/css/5469/issue5469.js
  73. +1 −1 tests/content/css/{ → computed}/3207/issue3207.html
  74. +2 −2 tests/content/css/{ → computed}/3207/issue3207.js
  75. +18 −4 tests/content/css/computed/5449/issue5449.html
  76. +8 −1 tests/content/firebug.html
  77. +46 −42 tests/content/firebug/4553/issue4553.html
  78. +34 −0 tests/content/html/5255/issue5255.html
  79. +47 −0 tests/content/html/5255/issue5255.js
  80. +34 −0 tests/content/html/5448/issue5448.html
  81. +34 −0 tests/content/html/5448/issue5448.js
  82. +25 −0 tests/content/html/5504/issue5504.html
  83. +26 −0 tests/content/html/5504/issue5504.js
  84. +1 −1 trace/FBTrace/chrome/content/traceCommandLine.js
View
@@ -4,6 +4,7 @@
*.swp
*.tmp
.*.gz
+*.patch
# Temporary files created by Eclipse
.tmp*
@@ -19,6 +20,7 @@
# Build Files
/extension/build/
/extension/release/
+/tests/FBTest/release/
*.graphml
# Files from NPM
@@ -1278,7 +1278,7 @@ Firebug.A11yModel = Obj.extend(Firebug.Module,
case Node.ATTRIBUTE_NODE:
elem = node.ownerElement;
matchFeedback += Locale.$STRF("a11y.updates.match found in attribute",
- [match.match[0], node.nodeName, node.nodeValue, elem.nodeName,
+ [match.match[0], node.name, node.value, elem.nodeName,
Xpath.getElementTreeXPath(elem)]);
break;
@@ -1,5 +1,5 @@
# DO NOT MERGE INTO TRUNK
-RELEASE=.0a8
+RELEASE=.0a9
VERSION=1.10
TRUNK=
# To allow build.xml to drop the xpi directly into the svn working copy for getfirebug.com
@@ -834,7 +834,7 @@ FirebugReps.Element = domplate(Firebug.Rep,
getAttrValue: function(attr)
{
var limit = Firebug.displayedAttributeValueLimit;
- return (limit > 0) ? Str.cropString(attr.nodeValue, limit) : attr.nodeValue;
+ return (limit > 0) ? Str.cropString(attr.value, limit) : attr.value;
},
getVisible: function(elt)
@@ -2905,18 +2905,18 @@ FirebugReps.Attr = domplate(Firebug.Rep,
SPAN(
SPAN({"class": "attrTitle"}, "$object|getTitle"),
SPAN({"class": "attrEqual"}, "="),
- TAG("$object|getValueTag", {object: "$object.nodeValue"})
+ TAG("$object|getValueTag", {object: "$object.value"})
)
),
getTitle: function(attr)
{
- return attr.nodeName;
+ return attr.name;
},
getValueTag: function(object)
{
- return Firebug.getRep(object.nodeValue).tag;
+ return Firebug.getRep(object.value).tag;
},
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Oops, something went wrong.

0 comments on commit 4f1bbb1

Please sign in to comment.