Skip to content

Commit

Permalink
Clean up test doctypes and unnecessary type attributes
Browse files Browse the repository at this point in the history
  • Loading branch information
kfranqueiro committed Jan 29, 2013
1 parent c44fd78 commit e7a5081
Show file tree
Hide file tree
Showing 50 changed files with 157 additions and 174 deletions.
4 changes: 2 additions & 2 deletions demos/dTuned/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,9 @@
text-align: right;
}
</style>
<script type="text/javascript" src="../../../dojo/dojo.js"
<script src="../../../dojo/dojo.js"
data-dojo-config="async: true"></script>
<script type="text/javascript">
<script>
function unique(arr){
// create a unique list of items from the passed array
// (removing duplicates). This is quick and dirty.
Expand Down
9 changes: 4 additions & 5 deletions test/GridFromHtml.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
<!DOCTYPE html>
<html>
<head>
<title>GridFromHtml Tests</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta name="viewport" content="width=570" />
<style type="text/css">
<style>
@import "../../dojo/resources/dojo.css";
@import "../css/skins/claro.css";
body {
Expand All @@ -20,9 +19,9 @@
text-decoration: underline;
}
</style>
<script type="text/javascript" src="../../dojo/dojo.js"
<script src="../../dojo/dojo.js"
data-dojo-config="async: true"></script>
<script type="text/javascript">
<script>
var store; // defined later, Memory store containing data

function getOrdinal(num){
Expand Down
9 changes: 4 additions & 5 deletions test/GridFromHtml_Editors.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
<!DOCTYPE html>
<html>
<head>
<title>Test declarative cell editors </title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta name="viewport" content="width=570" />
<style type="text/css">
<style>
@import "../../dojo/resources/dojo.css";
@import "../../dijit/themes/claro/claro.css";
@import "../css/skins/claro.css";
Expand All @@ -21,9 +20,9 @@
text-decoration: underline;
}
</style>
<script type="text/javascript" src="../../dojo/dojo.js"
<script src="../../dojo/dojo.js"
data-dojo-config="async: true"></script>
<script type="text/javascript">
<script>
require(["dgrid/GridFromHtml", "dgrid/OnDemandList", "dgrid/Keyboard",
"dojo/store/Memory", "dojo/store/Observable",
"dojo/_base/declare", "dojo/parser", "dojo/query",
Expand Down
6 changes: 3 additions & 3 deletions test/Grid_headerless.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<title>Test Grid Common Cases</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta name="viewport" content="width=570" />
<style type="text/css">
<style>
@import "../../dojo/resources/dojo.css";
@import "../css/dgrid.css";
@import "../css/skins/claro.css";
Expand Down Expand Up @@ -63,9 +63,9 @@
width: 6em;
}
</style>
<script type="text/javascript" src="../../dojo/dojo.js"
<script src="../../dojo/dojo.js"
data-dojo-config="async: true"></script>
<script type="text/javascript">
<script>
require(["dojo/on", "dgrid/List", "dgrid/OnDemandGrid", "dgrid/tree", "dgrid/editor", "dgrid/Selection", "dgrid/Keyboard", "dojo/_base/declare", "dijit/form/DateTextBox", "dijit/form/HorizontalSlider", "dijit/form/NumberSpinner", "dgrid/test/data/base", "dojo/domReady!"],
function(on, List, Grid, tree, editor, Selection, Keyboard, declare, DateTextBox, Slider, NumberSpinner, testStore){

Expand Down
6 changes: 3 additions & 3 deletions test/Grid_mouseevents.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<title>Test delegated mouse events</title>
<meta charset="utf-8">
<meta name="viewport" content="width=570">
<style type="text/css">
<style>
@import "../../dojo/resources/dojo.css";
@import "../css/skins/claro.css";
.heading {
Expand All @@ -24,9 +24,9 @@
width: 18%;
}
</style>
<script type="text/javascript" src="../../dojo/dojo.js"
<script src="../../dojo/dojo.js"
data-dojo-config="async: true"></script>
<script type="text/javascript">
<script>
var columns = {
order: "step", // give column a custom name
name: {},
Expand Down
9 changes: 4 additions & 5 deletions test/Grid_rendering.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
<!DOCTYPE html>
<html>
<head>
<title>Test renderRow and legacy functionality</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta name="viewport" content="width=570" />
<style type="text/css">
<style>
@import "../../dojo/resources/dojo.css";
@import "../css/skins/claro.css";
body {
Expand All @@ -20,9 +19,9 @@
text-decoration: underline;
}
</style>
<script type="text/javascript" src="../../dojo/dojo.js"
<script src="../../dojo/dojo.js"
data-dojo-config="async: true"></script>
<script type="text/javascript">
<script>
var store; // defined later, Memory store containing data

function getOrdinal(num){
Expand Down
9 changes: 4 additions & 5 deletions test/JsonRest.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
<!DOCTYPE html>
<html>
<head>
<title>Test JsonRest store</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta name="viewport" content="width=570" />
<style type="text/css">
<style>
@import "../../dojo/resources/dojo.css";
@import "../css/skins/claro.css";
h2 {
Expand All @@ -19,9 +18,9 @@
margin: 10px;
}
</style>
<script type="text/javascript" src="../../dojo/dojo.js"
<script src="../../dojo/dojo.js"
data-dojo-config="async: true"></script>
<script type="text/javascript">
<script>
require(["dgrid/List", "dgrid/OnDemandGrid","dgrid/Selection", "dgrid/editor", "dgrid/Keyboard", "dgrid/tree", "dojo/_base/declare", "dojo/store/JsonRest", "dojo/store/Observable", "dojo/store/Cache", "dojo/store/Memory", "dojo/domReady!"],
function(List, Grid, Selection, editor, Keyboard, tree, declare, JsonRest, Observable, Cache, Memory){
var testStore = Observable(Cache(JsonRest({
Expand Down
6 changes: 3 additions & 3 deletions test/JsonRest_duplicates.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<title>Test JsonRest Tree with objects repeated in different places in hierarchy</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta name="viewport" content="width=570" />
<style type="text/css">
<style>
@import "../../dojo/resources/dojo.css";
@import "../css/skins/claro.css";
h2 {
Expand All @@ -14,9 +14,9 @@
margin: 10px;
}
</style>
<script type="text/javascript" src="../../dojo/dojo.js"
<script src="../../dojo/dojo.js"
data-dojo-config="async: true"></script>
<script type="text/javascript">
<script>
function deleteSelected(){
for(var i in grid.selection){
testStore.remove(i);
Expand Down
6 changes: 3 additions & 3 deletions test/Keyboard.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8">
<title>Test Keyboard Mixin</title>
<meta name="viewport" content="width=570">
<style type="text/css">
<style>
@import "../../dojo/resources/dojo.css";
@import "../css/skins/claro.css";
/* add styles to size this grid appropriately */
Expand All @@ -28,9 +28,9 @@
clear: both;
}
</style>
<script type="text/javascript" src="../../dojo/dojo.js"
<script src="../../dojo/dojo.js"
data-dojo-config="async: true"></script>
<script type="text/javascript">
<script>
var getFirstTarget; // function, defined within require callback

require(["dgrid/List", "dgrid/Grid", "dgrid/Keyboard", "dojo/_base/declare", "dojo/on", "dojo/query", "put-selector/put", "dojo/domReady!"],
Expand Down
6 changes: 3 additions & 3 deletions test/List_no_params.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
<title>Test Simple List</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta name="viewport" content="width=570" />
<style type="text/css">
<style>
@import "../../dojo/resources/dojo.css";
@import "../css/skins/claro.css";
.ui-widget{
margin: 10px;
}
</style>
<script type="text/javascript" src="../../dojo/dojo.js"
<script src="../../dojo/dojo.js"
data-dojo-config="async: true"></script>
<script type="text/javascript">
<script>
require(["dgrid/List", "dojo/domReady!"], function(List){
var data = [ "foo", "bar", "baz" ];
var list = window.list = new List();
Expand Down
6 changes: 3 additions & 3 deletions test/OnDemand.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<title>Test Grid Store Observation</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta name="viewport" content="width=570" />
<style type="text/css">
<style>
@import "../../dojo/resources/dojo.css";
@import "../../dijit/themes/claro/claro.css";
@import "../css/skins/claro.css";
Expand Down Expand Up @@ -53,9 +53,9 @@
<script>
var start= new Date().getTime();
</script>
<script type="text/javascript" src="../../dojo/dojo.js"
<script src="../../dojo/dojo.js"
data-dojo-config="async: true"></script>
<script type="text/javascript">
<script>
require(["dojo/on", "dgrid/OnDemandList", "dgrid/OnDemandGrid","dgrid/Keyboard", "dgrid/Selection", "dgrid/editor", "dijit/form/DateTextBox", "dijit/form/HorizontalSlider", "dijit/form/NumberSpinner", "dgrid/test/data/base", "dojo/_base/lang", "dojo/_base/declare", "dojo/_base/array", "dojo/_base/Deferred", "dojo/dom-construct", "dojo/store/Memory", "dojo/domReady!"],
function(on, List, Grid, Keyboard, Selection, editor, DateTextBox, Slider, NumberSpinner, data, lang, declare, arrayUtil, Deferred, domConstruct, Memory){

Expand Down
6 changes: 3 additions & 3 deletions test/OnDemand_tile.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title>Test Tile Layout in OnDemandList</title>
<style type="text/css">
<style>
@import "../../dojo/resources/dojo.css";
@import "../css/dgrid.css";
@import "../css/skins/claro.css";
Expand All @@ -29,9 +29,9 @@
clear: both;
}
</style>
<script type="text/javascript" src="../../dojo/dojo.js"
<script src="../../dojo/dojo.js"
data-dojo-config="async: true"></script>
<script type="text/javascript">
<script>
var logRendered; // Function defined in require factory
require(["dgrid/OnDemandList", "dojo/query", "dojo/store/Memory", "put-selector/put", "dojo/domReady!"],
function(OnDemandList, query, Memory, put){
Expand Down
6 changes: 3 additions & 3 deletions test/Selection.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<title>Test Selection</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta name="viewport" content="width=570" />
<style type="text/css">
<style>
@import "../../dojo/resources/dojo.css";
@import "../css/skins/nihilo.css";
.heading {
Expand All @@ -18,9 +18,9 @@
margin: 10px;
}
</style>
<script type="text/javascript" src="../../dojo/dojo.js"
<script src="../../dojo/dojo.js"
data-dojo-config="async: true"></script>
<script type="text/javascript">
<script>
require(["dojo/_base/lang", "dojo/_base/declare", "dojo/_base/array", "dojo/json", "dojo/on",
"dgrid/OnDemandGrid", "dgrid/editor","dgrid/Selection", "dgrid/CellSelection", "dgrid/Keyboard",
"dgrid/test/data/base", "dojo/domReady!"],
Expand Down
9 changes: 4 additions & 5 deletions test/autoheight.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
<!DOCTYPE html>
<html>
<head>
<title>Test height:auto</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta name="viewport" content="width=570" />
<style type="text/css">
<style>
@import "../../dojo/resources/dojo.css";
@import "../css/dgrid.css";
@import "../css/skins/claro.css";
Expand Down Expand Up @@ -36,9 +35,9 @@
right: 0;
}
</style>
<script type="text/javascript" src="../../dojo/dojo.js"
<script src="../../dojo/dojo.js"
data-dojo-config="async: true"></script>
<script type="text/javascript">
<script>
require(["dgrid/List", "dgrid/OnDemandGrid","dgrid/Selection", "dgrid/Keyboard", "dojo/_base/declare", "dgrid/test/data/base", "dojo/domReady!"],
function(List, Grid, Selection, Keyboard, declare){
window.grid = new (declare([Grid, Selection, Keyboard]))({
Expand Down
6 changes: 3 additions & 3 deletions test/common_cases.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<title>Test Grid Common Cases</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta name="viewport" content="width=570" />
<style type="text/css">
<style>
@import "../../dojo/resources/dojo.css";
@import "../css/dgrid.css";
@import "../css/skins/claro.css";
Expand Down Expand Up @@ -61,9 +61,9 @@
<script>
var start= new Date().getTime();
</script>
<script type="text/javascript" src="../../dojo/dojo.js"
<script src="../../dojo/dojo.js"
data-dojo-config="async: true"></script>
<script type="text/javascript">
<script>
require(["dojo/on", "dgrid/List", "dgrid/OnDemandGrid", "dgrid/tree", "dgrid/editor", "dgrid/Selection", "dgrid/Keyboard", "dgrid/test/data/base", "dojo/_base/declare", "dojo/_base/array", "dojo/domReady!"],
function(on, List, Grid, tree, editor, Selection, Keyboard, testStore, declare, arrayUtil){
console.log("loaded in " + (new Date().getTime() - start));
Expand Down
6 changes: 3 additions & 3 deletions test/complex_column.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<title>Test Grid Complex Columns</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta name="viewport" content="width=570" />
<style type="text/css">
<style>
@import "../../dojo/resources/dojo.css";
@import "../css/skins/claro.css";
@import "../css/dgrid.css"; /* this ensures that are rules come after dgrid.css */
Expand Down Expand Up @@ -35,9 +35,9 @@
}
</style>

<script type="text/javascript" src="../../dojo/dojo.js"
<script src="../../dojo/dojo.js"
data-dojo-config="async: true"></script>
<script type="text/javascript">
<script>
require(["dgrid/OnDemandGrid", "dgrid/GridWithColumnSetsFromHtml", "dgrid/ColumnSet", "dgrid/Selection", "dgrid/Keyboard", "dojo/_base/declare", "dojo/on", "dojo/parser", "dgrid/test/data/base", "dgrid/test/data/DeferredWrapper", "dojo/domReady!"],
function(OnDemandGrid, GridFromHtml, ColumnSet, Selection, Keyboard, declare, on, parser, testStore, DeferredWrapper){
var columnSets1 = [
Expand Down
9 changes: 4 additions & 5 deletions test/destroy.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
<!DOCTYPE html>
<html>
<head>
<title>Test List/Grid Destruction</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta name="viewport" content="width=570" />
<style type="text/css">
<style>
@import "../../dojo/resources/dojo.css";
@import "../../dijit/themes/claro/claro.css";
@import "../css/skins/claro.css";
Expand Down Expand Up @@ -37,9 +36,9 @@
float: right;
}
</style>
<script type="text/javascript" src="../../dojo/dojo.js"
<script src="../../dojo/dojo.js"
data-dojo-config="async: true"></script>
<script type="text/javascript">
<script>
var data = [
{order: 1, name:"preheat", description:"Preheat your oven to 350F",date: new Date()},
{order: 2, name:"mix dry", description:"In a medium bowl, combine flour, salt, and baking soda",date: new Date()},
Expand Down
6 changes: 3 additions & 3 deletions test/dijit_layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<title>Test renderRow and legacy functionality</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta name="viewport" content="width=570"/>
<style type="text/css">
<style>
@import "../../dijit/themes/claro/document.css";
@import "../../dijit/themes/claro/claro.css";
@import "../css/skins/claro.css";
Expand All @@ -24,9 +24,9 @@
width: 500px;
}
</style>
<script type="text/javascript" src="../../dojo/dojo.js"
<script src="../../dojo/dojo.js"
data-dojo-config="async: true"></script>
<script type="text/javascript">
<script>
// callbacks for button clicks
function showDeclDialog(){ dlgDecl.show(); }

Expand Down
Loading

0 comments on commit e7a5081

Please sign in to comment.