Skip to content

Commit c43bf3a

Browse files
briancavalierbriancavalier
committed
Merging latest changes from v080-rc
2 parents b8bd8a3 + 28c9eff commit c43bf3a

File tree

114 files changed

+13142
-74
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+13142
-74
lines changed

‎dom/render.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,8 @@ define(['./../lib/dom/base', 'when'], function (base, when) {
166166
newNode.className = (oldNode.className ? oldNode.className + ' ' : '')
167167
+ newNode.className;
168168
}
169-
else if (!newNode.hasAttribute(attr.name)) {
169+
// Note: IE6&7 don't support node.hasAttribute() so we're using node.attributes
170+
else if (!newNode.attributes[attr.name]) {
170171
newNode.setAttribute(attr.name, oldNode.getAttribute(attr.name));
171172
}
172173
}

‎lib/plugin-base/dom.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,10 @@ define(['wire/domReady', 'when', '../dom/base'], function(domReady, when, base)
4848

4949
domReady(function() {
5050
var node;
51+
5152
// if dev omitted name, they're looking for the resolver itself
52-
if (!name) resolver.resolve(getById);
53+
if (!name) return resolver.resolve(getById);
54+
5355
node = getById(name);
5456
if (node) {
5557
resolver.resolve(node);

‎sizzle.js

+3
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ define(['./lib/plugin-base/dom', 'sizzle'], function(createDomPlugin, sizzle) {
5858

5959
return createDomPlugin({
6060
query: sizzle,
61+
first: function (selector, root) {
62+
return sizzle(selector, root)[0];
63+
},
6164
addClass: addClass,
6265
removeClass: removeClass
6366
});

‎test/basic-types1.html

+8-9
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
<meta charset="UTF-8">
55
<title>Basic types test</title>
66

7-
<script src="util/doh/runner.js"></script>
8-
<script src="test-config.js"></script>
7+
<script src="test-config.js"></script>
98

109
<script type="text/javascript">
1110
// Simple example of wiring in objects by reference using JSON ref syntax
@@ -15,21 +14,21 @@
1514
// Order doesn't matter. Forward refs are ok
1615
numberRef: { $ref: 'number' },
1716
objectRef: { $ref: 'object' },
18-
17+
1918
// Plain strings and numbers
2019
string: 'this is a string',
21-
20+
2221
number: 10,
23-
22+
2423
// Builtins that look like objects are supported directly
2524
date: new Date(),
26-
25+
2726
regex1: /^blah$/,
2827
regex2: new RegExp("^foobar$"),
2928

3029
boolean1: true,
3130
boolean2: new Boolean(false),
32-
31+
3332
// As are plain objects, which also provide scoping
3433
object: {
3534
string: "I'm a nested a string",
@@ -82,7 +81,7 @@
8281
var t = context.array;
8382
doh.assertEqual('[object Array]', tos(t));
8483
doh.assertEqual(5, t.length);
85-
84+
8685
doh.assertEqual('bar', t[2].foo);
8786

8887
doh.assertEqual('[object Array]', tos(t[3]));
@@ -99,7 +98,7 @@
9998
console.error(err);
10099
}
101100
);
102-
101+
103102
});
104103
</script>
105104
</head>

‎test/cola/bind.html

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<meta charset="UTF-8">
55
<title>wire/cola bind test</title>
66

7-
<script src="../util/doh/runner.js"></script>
87
<script src="../test-config.js"></script>
98

109
<script type="text/javascript">

‎test/connect.html

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<meta charset="UTF-8">
55
<title>wire/connect test</title>
66

7-
<script src="util/doh/runner.js"></script>
87
<script src="test-config.js"></script>
98

109
<script type="text/javascript">

‎test/create-constructor.html

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<meta charset="UTF-8">
55
<title>Launcher test</title>
66

7-
<script src="util/doh/runner.js"></script>
87
<script src="test-config.js"></script>
98

109
<script type="text/javascript">

‎test/destroy.html

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<meta charset="UTF-8">
55
<title>Destroy test</title>
66

7-
<script src="util/doh/runner.js"></script>
87
<script src="test-config.js"></script>
98

109
<script type="text/javascript">

‎test/dojo/dijit1.html

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<meta charset="UTF-8">
55
<title>Launcher test</title>
66

7-
<script src="../util/doh/runner.js"></script>
87
<script src="../test-config.js"></script>
98

109
<style>

‎test/dojo/dom-insert.html

+4-5
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@
66

77
<!--change these next two lines for each dom plugin-->
88
<script>var pluginName = 'wire/dojo/dom';</script>
9-
<base href="../">
9+
<!--<base href="../">-->
1010

11-
<script src="util/doh/runner.js"></script>
12-
<script src="test-config.js"></script>
11+
<script src="../test-config.js"></script>
1312

14-
<script src="test-dom-insert.js"></script>
13+
<script src="../test-dom-insert.js"></script>
1514
</head>
1615
<body>
1716
<div>
@@ -30,4 +29,4 @@
3029
<p id="negative">-1</p>
3130
</div>
3231
</body>
33-
</html>
32+
</html>

‎test/dojo/dom.html

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<meta charset="UTF-8">
55
<title>dom test</title>
66

7-
<script src="../util/doh/runner.js"></script>
87
<script src="../test-config.js"></script>
98

109
<script type="text/javascript">

‎test/dojo/events1.html

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<meta charset="UTF-8">
55
<title>Dojo connect test</title>
66

7-
<script src="../util/doh/runner.js"></script>
87
<script src="../test-config.js"></script>
98

109
<script type="text/javascript">

‎test/dojo/events2.html

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<meta charset="UTF-8">
55
<title>Dojo connect test</title>
66

7-
<script src="../util/doh/runner.js"></script>
87
<script src="../test-config.js"></script>
98

109
<script type="text/javascript">

‎test/dojo/pubsub1.html

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<meta charset="UTF-8">
55
<title>Dojo pubsub test</title>
66

7-
<script src="../util/doh/runner.js"></script>
87
<script src="../test-config.js"></script>
98

109
<script type="text/javascript">

‎test/dojo/rest1/index.html

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<meta charset="UTF-8">
55
<title>Launcher test</title>
66

7-
<script src="../../util/doh/runner.js"></script>
87
<script src="../../test-config.js"></script>
98

109
<script type="text/javascript">

‎test/dojo/store.html

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<meta charset="UTF-8">
55
<title>wire/dojo/store test</title>
66

7-
<script src="../util/doh/runner.js"></script>
87
<script src="../test-config.js"></script>
98

109
<script type="text/javascript">

‎test/dom-insert.html

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<meta charset="UTF-8">
55
<title>dom plugin insert facet test</title>
66

7-
<script src="util/doh/runner.js"></script>
87
<script src="test-config.js"></script>
98

109
<script>var pluginName = 'wire/dom';</script>

‎test/dom-render.html

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<meta charset="UTF-8">
55
<title>dom/render plugin test</title>
66

7-
<script src="util/doh/runner.js"></script>
87
<script src="test-config.js"></script>
98

109
<script type="text/javascript">

‎test/dom.html

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<meta charset="UTF-8">
55
<title>dom test</title>
66

7-
<script src="util/doh/runner.js"></script>
87
<script src="test-config.js"></script>
98

109
<script type="text/javascript">

‎test/firebug-lite/build/.htaccess

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
AddType "text/javascript;charset=UTF-8" .jgz .js
2+
AddEncoding gzip .jgz
3+
4+
<IfModule expires_module>
5+
ExpiresActive On
6+
ExpiresDefault A86400
7+
</IfModule>
8+
9+
<IfModule rewrite_module>
10+
RewriteEngine on
11+
#RewriteCond %{HTTP_USER_AGENT} ".*Safari.*" [OR]
12+
RewriteCond %{HTTP_USER_AGENT} ".*MSIE 6.*" [OR]
13+
RewriteCond %{HTTP:Accept-Encoding} !gzip
14+
RewriteRule (.*)\.jgz$ $1.js [L]
15+
</IfModule>

0 commit comments

Comments
 (0)