Permalink
Browse files

Merging latest changes from v080-rc

  • Loading branch information...
briancavalier committed Apr 23, 2012
2 parents b8bd8a3 + 28c9eff commit c43bf3a92b4398d4b5bc6ecd17a9061ae433b1f3
Showing with 13,142 additions and 74 deletions.
  1. +2 −1 dom/render.js
  2. +3 −1 lib/plugin-base/dom.js
  3. +3 −0 sizzle.js
  4. +8 −9 test/basic-types1.html
  5. +0 −1 test/cola/bind.html
  6. +0 −1 test/connect.html
  7. +0 −1 test/create-constructor.html
  8. +0 −1 test/destroy.html
  9. +0 −1 test/dojo/dijit1.html
  10. +4 −5 test/dojo/dom-insert.html
  11. +0 −1 test/dojo/dom.html
  12. +0 −1 test/dojo/events1.html
  13. +0 −1 test/dojo/events2.html
  14. +0 −1 test/dojo/pubsub1.html
  15. +0 −1 test/dojo/rest1/index.html
  16. +0 −1 test/dojo/store.html
  17. +0 −1 test/dom-insert.html
  18. +0 −1 test/dom-render.html
  19. +0 −1 test/dom.html
  20. +15 −0 test/firebug-lite/build/.htaccess
  21. +8,257 −0 test/firebug-lite/build/firebug-lite.js
  22. +30 −0 test/firebug-lite/license.txt
  23. BIN test/firebug-lite/skin/xp/blank.gif
  24. BIN test/firebug-lite/skin/xp/buttonBg.png
  25. BIN test/firebug-lite/skin/xp/buttonBgHover.png
  26. +331 −0 test/firebug-lite/skin/xp/debugger.css
  27. BIN test/firebug-lite/skin/xp/detach.png
  28. BIN test/firebug-lite/skin/xp/detachHover.png
  29. BIN test/firebug-lite/skin/xp/disable.gif
  30. BIN test/firebug-lite/skin/xp/disable.png
  31. BIN test/firebug-lite/skin/xp/disableHover.gif
  32. BIN test/firebug-lite/skin/xp/disableHover.png
  33. BIN test/firebug-lite/skin/xp/down.png
  34. BIN test/firebug-lite/skin/xp/downActive.png
  35. BIN test/firebug-lite/skin/xp/downHover.png
  36. BIN test/firebug-lite/skin/xp/errorIcon-sm.png
  37. BIN test/firebug-lite/skin/xp/errorIcon.gif
  38. BIN test/firebug-lite/skin/xp/errorIcon.png
  39. +817 −0 test/firebug-lite/skin/xp/firebug-1.3a2.css
  40. +20 −0 test/firebug-lite/skin/xp/firebug.IE6.css
  41. +3,147 −0 test/firebug-lite/skin/xp/firebug.css
  42. +215 −0 test/firebug-lite/skin/xp/firebug.html
  43. BIN test/firebug-lite/skin/xp/firebug.png
  44. BIN test/firebug-lite/skin/xp/group.gif
  45. +272 −0 test/firebug-lite/skin/xp/html.css
  46. BIN test/firebug-lite/skin/xp/infoIcon.gif
  47. BIN test/firebug-lite/skin/xp/infoIcon.png
  48. BIN test/firebug-lite/skin/xp/loading_16.gif
  49. BIN test/firebug-lite/skin/xp/min.png
  50. BIN test/firebug-lite/skin/xp/minHover.png
  51. BIN test/firebug-lite/skin/xp/off.png
  52. BIN test/firebug-lite/skin/xp/offHover.png
  53. BIN test/firebug-lite/skin/xp/pixel_transparent.gif
  54. +6 −0 test/firebug-lite/skin/xp/roundCorner.svg
  55. BIN test/firebug-lite/skin/xp/search.gif
  56. BIN test/firebug-lite/skin/xp/search.png
  57. BIN test/firebug-lite/skin/xp/shadow.gif
  58. BIN test/firebug-lite/skin/xp/shadow2.gif
  59. BIN test/firebug-lite/skin/xp/shadowAlpha.png
  60. BIN test/firebug-lite/skin/xp/sprite.png
  61. BIN test/firebug-lite/skin/xp/tabHoverLeft.png
  62. BIN test/firebug-lite/skin/xp/tabHoverMid.png
  63. BIN test/firebug-lite/skin/xp/tabHoverRight.png
  64. BIN test/firebug-lite/skin/xp/tabLeft.png
  65. BIN test/firebug-lite/skin/xp/tabMenuCheckbox.png
  66. BIN test/firebug-lite/skin/xp/tabMenuPin.png
  67. BIN test/firebug-lite/skin/xp/tabMenuRadio.png
  68. BIN test/firebug-lite/skin/xp/tabMenuTarget.png
  69. BIN test/firebug-lite/skin/xp/tabMenuTargetHover.png
  70. BIN test/firebug-lite/skin/xp/tabMid.png
  71. BIN test/firebug-lite/skin/xp/tabRight.png
  72. BIN test/firebug-lite/skin/xp/textEditorBorders.gif
  73. BIN test/firebug-lite/skin/xp/textEditorBorders.png
  74. BIN test/firebug-lite/skin/xp/textEditorCorners.gif
  75. BIN test/firebug-lite/skin/xp/textEditorCorners.png
  76. BIN test/firebug-lite/skin/xp/titlebarMid.png
  77. BIN test/firebug-lite/skin/xp/toolbarMid.png
  78. BIN test/firebug-lite/skin/xp/tree_close.gif
  79. BIN test/firebug-lite/skin/xp/tree_open.gif
  80. BIN test/firebug-lite/skin/xp/twistyClosed.png
  81. BIN test/firebug-lite/skin/xp/twistyOpen.png
  82. BIN test/firebug-lite/skin/xp/up.png
  83. BIN test/firebug-lite/skin/xp/upActive.png
  84. BIN test/firebug-lite/skin/xp/upHover.png
  85. BIN test/firebug-lite/skin/xp/warningIcon.gif
  86. BIN test/firebug-lite/skin/xp/warningIcon.png
  87. +0 −1 test/init-error.html
  88. +0 −1 test/init.html
  89. +4 −5 test/jquery/dom-insert.html
  90. +0 −1 test/jquery/dom.html
  91. +0 −1 test/literal.html
  92. +0 −1 test/nested1.html
  93. +0 −1 test/nested2.html
  94. +0 −1 test/nested3.html
  95. +1 −0 test/non-amd.html
  96. +0 −1 test/prototype1.html
  97. +0 −1 test/ready.html
  98. +0 −1 test/ref-missing1.html
  99. +0 −1 test/ref-missing2.html
  100. +0 −1 test/refs1.html
  101. +0 −1 test/required-modules.html
  102. +1 −1 test/requirejs
  103. +0 −1 test/scope1.html
  104. +0 −1 test/sizzle.html
  105. +5 −14 test/test-config.js
  106. +1 −1 test/test-dom.js
  107. +0 −1 test/wire-factory1.html
  108. +0 −1 test/wire-resolver1.html
  109. +0 −1 test/wire/aop/advice1.html
  110. +0 −1 test/wire/aop/decorate1.html
  111. +0 −1 test/wire/aop/introduce1.html
  112. +0 −1 test/wire/aop/promise.html
  113. +0 −1 test/wire/aop/single-advice.html
  114. +0 −1 test/wire/aop/weave1.html
View
@@ -166,7 +166,8 @@ define(['./../lib/dom/base', 'when'], function (base, when) {
newNode.className = (oldNode.className ? oldNode.className + ' ' : '')
+ newNode.className;
}
- else if (!newNode.hasAttribute(attr.name)) {
+ // Note: IE6&7 don't support node.hasAttribute() so we're using node.attributes
+ else if (!newNode.attributes[attr.name]) {
newNode.setAttribute(attr.name, oldNode.getAttribute(attr.name));
}
}
View
@@ -48,8 +48,10 @@ define(['wire/domReady', 'when', '../dom/base'], function(domReady, when, base)
domReady(function() {
var node;
+
// if dev omitted name, they're looking for the resolver itself
- if (!name) resolver.resolve(getById);
+ if (!name) return resolver.resolve(getById);
+
node = getById(name);
if (node) {
resolver.resolve(node);
View
@@ -58,6 +58,9 @@ define(['./lib/plugin-base/dom', 'sizzle'], function(createDomPlugin, sizzle) {
return createDomPlugin({
query: sizzle,
+ first: function (selector, root) {
+ return sizzle(selector, root)[0];
+ },
addClass: addClass,
removeClass: removeClass
});
View
@@ -4,8 +4,7 @@
<meta charset="UTF-8">
<title>Basic types test</title>
- <script src="util/doh/runner.js"></script>
- <script src="test-config.js"></script>
+ <script src="test-config.js"></script>
<script type="text/javascript">
// Simple example of wiring in objects by reference using JSON ref syntax
@@ -15,21 +14,21 @@
// Order doesn't matter. Forward refs are ok
numberRef: { $ref: 'number' },
objectRef: { $ref: 'object' },
-
+
// Plain strings and numbers
string: 'this is a string',
-
+
number: 10,
-
+
// Builtins that look like objects are supported directly
date: new Date(),
-
+
regex1: /^blah$/,
regex2: new RegExp("^foobar$"),
boolean1: true,
boolean2: new Boolean(false),
-
+
// As are plain objects, which also provide scoping
object: {
string: "I'm a nested a string",
@@ -82,7 +81,7 @@
var t = context.array;
doh.assertEqual('[object Array]', tos(t));
doh.assertEqual(5, t.length);
-
+
doh.assertEqual('bar', t[2].foo);
doh.assertEqual('[object Array]', tos(t[3]));
@@ -99,7 +98,7 @@
console.error(err);
}
);
-
+
});
</script>
</head>
View
@@ -4,7 +4,6 @@
<meta charset="UTF-8">
<title>wire/cola bind test</title>
- <script src="../util/doh/runner.js"></script>
<script src="../test-config.js"></script>
<script type="text/javascript">
View
@@ -4,7 +4,6 @@
<meta charset="UTF-8">
<title>wire/connect test</title>
- <script src="util/doh/runner.js"></script>
<script src="test-config.js"></script>
<script type="text/javascript">
@@ -4,7 +4,6 @@
<meta charset="UTF-8">
<title>Launcher test</title>
- <script src="util/doh/runner.js"></script>
<script src="test-config.js"></script>
<script type="text/javascript">
View
@@ -4,7 +4,6 @@
<meta charset="UTF-8">
<title>Destroy test</title>
- <script src="util/doh/runner.js"></script>
<script src="test-config.js"></script>
<script type="text/javascript">
View
@@ -4,7 +4,6 @@
<meta charset="UTF-8">
<title>Launcher test</title>
- <script src="../util/doh/runner.js"></script>
<script src="../test-config.js"></script>
<style>
@@ -6,12 +6,11 @@
<!--change these next two lines for each dom plugin-->
<script>var pluginName = 'wire/dojo/dom';</script>
- <base href="../">
+ <!--<base href="../">-->
- <script src="util/doh/runner.js"></script>
- <script src="test-config.js"></script>
+ <script src="../test-config.js"></script>
- <script src="test-dom-insert.js"></script>
+ <script src="../test-dom-insert.js"></script>
</head>
<body>
<div>
@@ -30,4 +29,4 @@
<p id="negative">-1</p>
</div>
</body>
-</html>
+</html>
View
@@ -4,7 +4,6 @@
<meta charset="UTF-8">
<title>dom test</title>
- <script src="../util/doh/runner.js"></script>
<script src="../test-config.js"></script>
<script type="text/javascript">
View
@@ -4,7 +4,6 @@
<meta charset="UTF-8">
<title>Dojo connect test</title>
- <script src="../util/doh/runner.js"></script>
<script src="../test-config.js"></script>
<script type="text/javascript">
View
@@ -4,7 +4,6 @@
<meta charset="UTF-8">
<title>Dojo connect test</title>
- <script src="../util/doh/runner.js"></script>
<script src="../test-config.js"></script>
<script type="text/javascript">
View
@@ -4,7 +4,6 @@
<meta charset="UTF-8">
<title>Dojo pubsub test</title>
- <script src="../util/doh/runner.js"></script>
<script src="../test-config.js"></script>
<script type="text/javascript">
@@ -4,7 +4,6 @@
<meta charset="UTF-8">
<title>Launcher test</title>
- <script src="../../util/doh/runner.js"></script>
<script src="../../test-config.js"></script>
<script type="text/javascript">
View
@@ -4,7 +4,6 @@
<meta charset="UTF-8">
<title>wire/dojo/store test</title>
- <script src="../util/doh/runner.js"></script>
<script src="../test-config.js"></script>
<script type="text/javascript">
View
@@ -4,7 +4,6 @@
<meta charset="UTF-8">
<title>dom plugin insert facet test</title>
- <script src="util/doh/runner.js"></script>
<script src="test-config.js"></script>
<script>var pluginName = 'wire/dom';</script>
View
@@ -4,7 +4,6 @@
<meta charset="UTF-8">
<title>dom/render plugin test</title>
- <script src="util/doh/runner.js"></script>
<script src="test-config.js"></script>
<script type="text/javascript">
View
@@ -4,7 +4,6 @@
<meta charset="UTF-8">
<title>dom test</title>
- <script src="util/doh/runner.js"></script>
<script src="test-config.js"></script>
<script type="text/javascript">
@@ -0,0 +1,15 @@
+AddType "text/javascript;charset=UTF-8" .jgz .js
+AddEncoding gzip .jgz
+
+<IfModule expires_module>
+ ExpiresActive On
+ ExpiresDefault A86400
+</IfModule>
+
+<IfModule rewrite_module>
+ RewriteEngine on
+ #RewriteCond %{HTTP_USER_AGENT} ".*Safari.*" [OR]
+ RewriteCond %{HTTP_USER_AGENT} ".*MSIE 6.*" [OR]
+ RewriteCond %{HTTP:Accept-Encoding} !gzip
+ RewriteRule (.*)\.jgz$ $1.js [L]
+</IfModule>
Oops, something went wrong.

0 comments on commit c43bf3a

Please sign in to comment.