Skip to content

Commit

Permalink
Merge branch 'master' into frame-scope
Browse files Browse the repository at this point in the history
  • Loading branch information
gleneivey committed Apr 14, 2010
2 parents 6ee9290 + 6d02a6b commit 40d5235
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 1 deletion.
1 change: 1 addition & 0 deletions specs/console/index.html
Expand Up @@ -19,6 +19,7 @@ <h1 id="qunit-header">
<img src="../fixtures/images/icon-green.png"/>
<span>Envjs Console Spec</span>
</h1>
<h2 id="qunit-banner"></h2>
<h2 id="qunit-userAgent"></h2>
<div id='qunit-filter-pass'></div>
<div id='qunit-testrunner-toolbar'></div>
Expand Down
1 change: 1 addition & 0 deletions specs/dom/index.html
Expand Up @@ -20,6 +20,7 @@ <h1 id="qunit-header">
<img src="../fixtures/images/icon-green.png"/>
<span>Envjs DOM Spec</span>
</h1>
<h2 id="qunit-banner"></h2>
<h2 id="qunit-userAgent"></h2>
<div id='qunit-testrunner-toolbar'></div>
<div id='qunit-test-summary'>
Expand Down
3 changes: 2 additions & 1 deletion specs/dom/spec.js
Expand Up @@ -823,7 +823,8 @@ test('parseFromString', function(){
test('getElementsByTagName', function() {
var nodes, doc;
doc = domparser.parseFromString(
'<root><div><div>123</div></div><div></div></root>'
'<root><div><div>123</div></div><div></div></root>',
'text/xml'
);

nodes = doc.getElementsByTagName('*');
Expand Down
1 change: 1 addition & 0 deletions specs/event/index.html
Expand Up @@ -20,6 +20,7 @@ <h1 id="qunit-header">
<img src="../fixtures/images/icon-green.png"/>
<span>Envjs Event Spec</span>
</h1>
<h2 id="qunit-banner"></h2>
<h2 id="qunit-userAgent"></h2>
<div id='qunit-testrunner-toolbar'></div>
<div id='qunit-test-summary'>
Expand Down
1 change: 1 addition & 0 deletions specs/html/index.html
Expand Up @@ -19,6 +19,7 @@ <h1 id="qunit-header">
<img src="../fixtures/images/icon-green.png"/>
<span>Envjs HTML Spec</span>
</h1>
<h2 id="qunit-banner"></h2>
<h2 id="qunit-userAgent"></h2>
<div id='qunit-testrunner-toolbar'></div>
<div id='qunit-test-summary'>
Expand Down
1 change: 1 addition & 0 deletions specs/parser/index.html
Expand Up @@ -20,6 +20,7 @@ <h1 id="qunit-header">
<img src="../fixtures/images/icon-green.png"/>
<span>Envjs Parser Spec</span>
</h1>
<h2 id="qunit-banner"></h2>
<h2 id="qunit-userAgent"></h2>
<div id='qunit-testrunner-toolbar'></div>
<div id='qunit-test-summary'>
Expand Down
1 change: 1 addition & 0 deletions specs/timer/index.html
Expand Up @@ -20,6 +20,7 @@ <h1 id="qunit-header">
<img src="../fixtures/images/icon-green.png"/>
<span>Envjs Timer Spec</span>
</h1>
<h2 id="qunit-banner"></h2>
<h2 id="qunit-userAgent"></h2>
<div id='qunit-testrunner-toolbar'></div>
<div id='qunit-test-summary'>
Expand Down
1 change: 1 addition & 0 deletions specs/window/index.html
Expand Up @@ -28,6 +28,7 @@ <h1 id="qunit-header">
<img src="../fixtures/images/icon-green.png"/>
<span>Envjs Window Spec</span>
</h1>
<h2 id="qunit-banner"></h2>
<h2 id="qunit-userAgent"></h2>
<div id='qunit-testrunner-toolbar'></div>
<div id='qunit-test-summary'>
Expand Down
1 change: 1 addition & 0 deletions specs/xhr/index.html
Expand Up @@ -22,6 +22,7 @@ <h1 id="qunit-header">
<img src="../fixtures/images/icon-green.png"/>
<span>Envjs XMLHttpRequest Spec</span>
</h1>
<h2 id="qunit-banner"></h2>
<h2 id="qunit-userAgent"></h2>
<div id='qunit-testrunner-toolbar'></div>
<div id='qunit-test-summary'>
Expand Down

0 comments on commit 40d5235

Please sign in to comment.