summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Gardian <mgardian@gmail.com>2010-02-05 13:20:39 +0800
committerMichael Leibman <michael.leibman@gmail.com>2010-02-08 05:58:59 +0800
commit01d2a22f1b0b40d4fcec351ca5e7c81c40c0f329 (patch)
tree3bad8b79d9a15d61f5560588f7b8f41f9ec89d67
parenta7dce10a36b5a9623f906b39a3c0fb414962afbc (diff)
downloadSlickGrid-01d2a22f1b0b40d4fcec351ca5e7c81c40c0f329.zip
SlickGrid-01d2a22f1b0b40d4fcec351ca5e7c81c40c0f329.tar.gz
SlickGrid-01d2a22f1b0b40d4fcec351ca5e7c81c40c0f329.tar.bz2
Perform explicit checks that expected JavaScript modules have been loaded on slick.grid.js script load and during grid initialization
Diffstat
-rw-r--r--examples/example1-simple.html6
-rw-r--r--examples/example10-async-post-render.html23
-rw-r--r--examples/example11-autoheight.html6
-rw-r--r--examples/example12-fillbrowser.html11
-rw-r--r--examples/example2-formatters.html27
-rw-r--r--examples/example3-editing.html24
-rw-r--r--examples/example4-model.html30
-rw-r--r--examples/example5-collapsing.html32
-rw-r--r--examples/example6-ajax-loading.html27
-rw-r--r--examples/example7-events.html28
-rw-r--r--examples/example8-alternative-display.html21
-rw-r--r--examples/example9-row-reordering.html24
-rw-r--r--slick.grid.js26
-rw-r--r--tests/model benchmarks.html2
-rw-r--r--tests/scrolling benchmarks.html4
15 files changed, 139 insertions, 152 deletions
diff --git a/examples/example1-simple.html b/examples/example1-simple.html
index 0c5f3ca..18072cc 100644
--- a/examples/example1-simple.html
+++ b/examples/example1-simple.html
@@ -6,8 +6,6 @@
<link rel="stylesheet" href="../slick.grid.css" type="text/css" media="screen" charset="utf-8" />
<link rel="stylesheet" href="../css/custom-theme/jquery-ui-1.7.2.custom.css" type="text/css" media="screen" charset="utf-8" />
<link rel="stylesheet" href="examples.css" type="text/css" media="screen" charset="utf-8" />
- <style>
- </style>
</head>
<body>
<table width="100%">
@@ -27,7 +25,9 @@
<script language="JavaScript" src="../lib/jquery-1.4.1.min.js"></script>
<script language="JavaScript" src="../lib/jquery.rule-1.0.1-min.js"></script>
<script language="JavaScript" src="../lib/jquery.event.drag.custom.js"></script>
- <script language="JavaScript" src="../slick.grid.js"></script>
+
+ <script language="JavaScript" src="../slick.grid.js"></script>
+
<script>
var grid;
diff --git a/examples/example10-async-post-render.html b/examples/example10-async-post-render.html
index 09747cc..46233ac 100644
--- a/examples/example10-async-post-render.html
+++ b/examples/example10-async-post-render.html
@@ -2,7 +2,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>SlickGrid example</title>
+ <title>SlickGrid example 10: Async post render</title>
<link rel="stylesheet" href="../slick.grid.css" type="text/css" media="screen" charset="utf-8" />
<link rel="stylesheet" href="../css/custom-theme/jquery-ui-1.7.2.custom.css" type="text/css" media="screen" charset="utf-8" />
<link rel="stylesheet" href="examples.css" type="text/css" media="screen" charset="utf-8" />
@@ -21,17 +21,6 @@
</style>
</head>
<body>
- <script language="JavaScript" src="../lib/firebugx.js"></script>
- <script language="JavaScript" src="../lib/jquery-1.4.1.min.js"></script>
- <script language="JavaScript" src="../lib/jquery-ui-1.7.2.custom.min.js"></script>
- <script language="JavaScript" src="../lib/jquery.rule-1.0.1-min.js"></script>
- <script language="JavaScript" src="../lib/jquery.event.drag.custom.js"></script>
- <script language="JavaScript" src="../lib/jquery.sparkline.min.js"></script>
-
- <script language="JavaScript" src="../slick.editors.js"></script>
- <script language="JavaScript" src="../slick.grid.js"></script>
- <script language="JavaScript" src="../slick.globaleditorlock.js"></script>
-
<div style="width:600px;float:left;">
<div class="grid-header" style="width:100%">
<label>Scores:</label>
@@ -58,7 +47,17 @@
</p>
</div>
+ <script language="JavaScript" src="../lib/firebugx.js"></script>
+
+ <script language="JavaScript" src="../lib/jquery-1.4.1.min.js"></script>
+ <script language="JavaScript" src="../lib/jquery-ui-1.7.2.custom.min.js"></script>
+ <script language="JavaScript" src="../lib/jquery.rule-1.0.1-min.js"></script>
+ <script language="JavaScript" src="../lib/jquery.event.drag.custom.js"></script>
+ <script language="JavaScript" src="../lib/jquery.sparkline.min.js"></script>
+ <script language="JavaScript" src="../slick.editors.js"></script>
+ <script language="JavaScript" src="../slick.globaleditorlock.js"></script>
+ <script language="JavaScript" src="../slick.grid.js"></script>
<script>
function requiredFieldValidator(value) {
diff --git a/examples/example11-autoheight.html b/examples/example11-autoheight.html
index 790878d..d26dcdb 100644
--- a/examples/example11-autoheight.html
+++ b/examples/example11-autoheight.html
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>Large grid example - SlickGrid</title>
+ <title>SlickGrid example 11: No vertical scrolling (autoHeight)</title>
<link rel="stylesheet" href="../slick.grid.css" type="text/css" media="screen" charset="utf-8" />
<link rel="stylesheet" href="examples.css" type="text/css" media="screen" charset="utf-8" />
<style>
@@ -26,9 +26,11 @@
<script language="JavaScript" src="../lib/jquery-ui-1.7.2.custom.min.js"></script>
<script language="JavaScript" src="../lib/jquery.rule-1.0.1-min.js"></script>
<script language="JavaScript" src="../lib/jquery.event.drag.custom.js"></script>
+
<script language="JavaScript" src="../slick.editors.js"></script>
- <script language="JavaScript" src="../slick.grid.js"></script>
<script language="JavaScript" src="../slick.globaleditorlock.js"></script>
+ <script language="JavaScript" src="../slick.grid.js"></script>
+
<script>
var grid,
data = [],
diff --git a/examples/example12-fillbrowser.html b/examples/example12-fillbrowser.html
index cc2b73c..e8fb93c 100644
--- a/examples/example12-fillbrowser.html
+++ b/examples/example12-fillbrowser.html
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>Large grid example - SlickGrid</title>
+ <title>SlickGrid example 12: Fill browser</title>
<link rel="stylesheet" href="../slick.grid.css" type="text/css" media="screen" charset="utf-8" />
<link rel="stylesheet" href="examples.css" type="text/css" media="screen" charset="utf-8" />
<style>
@@ -26,12 +26,10 @@
</div>
<script language="JavaScript" src="../lib/jquery-1.4.1.min.js"></script>
- <script language="JavaScript" src="../lib/jquery-ui-1.7.2.custom.min.js"></script>
<script language="JavaScript" src="../lib/jquery.rule-1.0.1-min.js"></script>
<script language="JavaScript" src="../lib/jquery.event.drag.custom.js"></script>
- <script language="JavaScript" src="../slick.editors.js"></script>
+
<script language="JavaScript" src="../slick.grid.js"></script>
- <script language="JavaScript" src="../slick.globaleditorlock.js"></script>
<script>
var grid,
data = [],
@@ -55,9 +53,8 @@
{ id:"c17", name:"C17", field:"c17", width:120 }
],
options = {
- editable: false,
- enableAddRow: false,
- enableCellNavigation: false
+ enableCellNavigation: false,
+ enableColumnReorder: false
};
for (var i = 10000; i-- > 0;) {
diff --git a/examples/example2-formatters.html b/examples/example2-formatters.html
index cedea09..e9354ff 100644
--- a/examples/example2-formatters.html
+++ b/examples/example2-formatters.html
@@ -2,7 +2,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>SlickGrid example</title>
+ <title>SlickGrid example 2: Formatters</title>
<link rel="stylesheet" href="../slick.grid.css" type="text/css" media="screen" charset="utf-8" />
<link rel="stylesheet" href="../css/custom-theme/jquery-ui-1.7.2.custom.css" type="text/css" media="screen" charset="utf-8" />
<link rel="stylesheet" href="examples.css" type="text/css" media="screen" charset="utf-8" />
@@ -17,17 +17,6 @@
</style>
</head>
<body>
- <script language="JavaScript" src="../lib/firebugx.js"></script>
- <script language="JavaScript" src="../lib/jquery-1.4.1.min.js"></script>
- <script language="JavaScript" src="../lib/jquery-ui-1.7.2.custom.min.js"></script>
- <script language="JavaScript" src="../lib/jquery.rule-1.0.1-min.js"></script>
- <script language="JavaScript" src="../lib/jquery.event.drag.custom.js"></script>
-
- <script language="JavaScript" src="../slick.editors.js"></script>
- <script language="JavaScript" src="../slick.grid.js"></script>
- <script language="JavaScript" src="../slick.globaleditorlock.js"></script>
-
-
<table width="100%">
<tr>
<td valign="top" width="50%">
@@ -35,20 +24,26 @@
</td>
<td valign="top">
<h2>Demonstrates:</h2>
-
<ul>
<li>width, minWidth, maxWidth, resizable, cssClass column attributes</li>
<li>custom column formatters</li>
-
</ul>
-
</td>
</tr>
</table>
+ <script language="JavaScript" src="../lib/firebugx.js"></script>
+ <script language="JavaScript" src="../lib/jquery-1.4.1.min.js"></script>
+ <script language="JavaScript" src="../lib/jquery-ui-1.7.2.custom.min.js"></script>
+ <script language="JavaScript" src="../lib/jquery.rule-1.0.1-min.js"></script>
+ <script language="JavaScript" src="../lib/jquery.event.drag.custom.js"></script>
+
+ <script language="JavaScript" src="../slick.editors.js"></script>
+ <script language="JavaScript" src="../slick.globaleditorlock.js"></script>
+ <script language="JavaScript" src="../slick.grid.js"></script>
- <script>
+ <script>
var grid;
var data = [];
diff --git a/examples/example3-editing.html b/examples/example3-editing.html
index ccbe2b3..f12e015 100644
--- a/examples/example3-editing.html
+++ b/examples/example3-editing.html
@@ -2,7 +2,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>SlickGrid example</title>
+ <title>SlickGrid example 3: Editing</title>
<link rel="stylesheet" href="../slick.grid.css" type="text/css" media="screen" charset="utf-8" />
<link rel="stylesheet" href="../css/custom-theme/jquery-ui-1.7.2.custom.css" type="text/css" media="screen" charset="utf-8" />
<link rel="stylesheet" href="examples.css" type="text/css" media="screen" charset="utf-8" />
@@ -17,17 +17,6 @@
</style>
</head>
<body>
- <script language="JavaScript" src="../lib/firebugx.js"></script>
- <script language="JavaScript" src="../lib/jquery-1.4.1.min.js"></script>
- <script language="JavaScript" src="../lib/jquery-ui-1.7.2.custom.min.js"></script>
- <script language="JavaScript" src="../lib/jquery.rule-1.0.1-min.js"></script>
- <script language="JavaScript" src="../lib/jquery.event.drag.custom.js"></script>
-
- <script language="JavaScript" src="../slick.editors.js"></script>
- <script language="JavaScript" src="../slick.grid.js"></script>
- <script language="JavaScript" src="../slick.globaleditorlock.js"></script>
-
-
<table width="100%">
<tr>
<td valign="top" width="50%">
@@ -35,17 +24,24 @@
</td>
<td valign="top">
<h2>Demonstrates:</h2>
-
<ul>
<li>adding basic keyboard navigation and editing</li>
<li>custom editors and validators</li>
</ul>
-
</td>
</tr>
</table>
+ <script language="JavaScript" src="../lib/firebugx.js"></script>
+ <script language="JavaScript" src="../lib/jquery-1.4.1.min.js"></script>
+ <script language="JavaScript" src="../lib/jquery-ui-1.7.2.custom.min.js"></script>
+ <script language="JavaScript" src="../lib/jquery.rule-1.0.1-min.js"></script>
+ <script language="JavaScript" src="../lib/jquery.event.drag.custom.js"></script>
+
+ <script language="JavaScript" src="../slick.editors.js"></script>
+ <script language="JavaScript" src="../slick.globaleditorlock.js"></script>
+ <script language="JavaScript" src="../slick.grid.js"></script>
<script>
function requiredFieldValidator(value) {
diff --git a/examples/example4-model.html b/examples/example4-model.html
index ca0f685..7b3205c 100644
--- a/examples/example4-model.html
+++ b/examples/example4-model.html
@@ -2,7 +2,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>SlickGrid example</title>
+ <title>SlickGrid example 4: Model</title>
<link rel="stylesheet" href="../slick.grid.css" type="text/css" media="screen" charset="utf-8" />
<link rel="stylesheet" href="../slick.pager.css" type="text/css" media="screen" charset="utf-8" />
<link rel="stylesheet" href="../css/custom-theme/jquery-ui-1.7.2.custom.css" type="text/css" media="screen" charset="utf-8" />
@@ -19,20 +19,6 @@
</style>
</head>
<body>
- <script language="JavaScript" src="../lib/firebugx.js"></script>
- <script language="JavaScript" src="../lib/jquery-1.4.1.min.js"></script>
- <script language="JavaScript" src="../lib/jquery-ui-1.7.2.custom.min.js"></script>
- <script language="JavaScript" src="../lib/jquery.rule-1.0.1-min.js"></script>
- <script language="JavaScript" src="../lib/jquery.event.drag.custom.js"></script>
-
- <script language="JavaScript" src="../slick.editors.js"></script>
- <script language="JavaScript" src="../slick.grid.js"></script>
- <script language="JavaScript" src="../slick.globaleditorlock.js"></script>
- <script language="JavaScript" src="../slick.model.js"></script>
- <script language="JavaScript" src="../slick.pager.js"></script>
- <script language="JavaScript" src="../slick.columnpicker.js"></script>
-
-
<div style="width:600px;float:left;">
<div class="grid-header" style="width:100%">
<label>SlickGrid</label>
@@ -57,7 +43,6 @@
</div>
</div>
-
<div style="margin-left:650px;margin-top:40px;;">
<h2>Demonstrates:</h2>
@@ -76,6 +61,19 @@
</ul>
</div>
+ <script language="JavaScript" src="../lib/firebugx.js"></script>
+
+ <script language="JavaScript" src="../lib/jquery-1.4.1.min.js"></script>
+ <script language="JavaScript" src="../lib/jquery-ui-1.7.2.custom.min.js"></script>
+ <script language="JavaScript" src="../lib/jquery.rule-1.0.1-min.js"></script>
+ <script language="JavaScript" src="../lib/jquery.event.drag.custom.js"></script>
+
+ <script language="JavaScript" src="../slick.editors.js"></script>
+ <script language="JavaScript" src="../slick.globaleditorlock.js"></script>
+ <script language="JavaScript" src="../slick.grid.js"></script>
+ <script language="JavaScript" src="../slick.model.js"></script>
+ <script language="JavaScript" src="../slick.pager.js"></script>
+ <script language="JavaScript" src="../slick.columnpicker.js"></script>
<script>
var dataView;
diff --git a/examples/example5-collapsing.html b/examples/example5-collapsing.html
index ee7140c..1e06510 100644
--- a/examples/example5-collapsing.html
+++ b/examples/example5-collapsing.html
@@ -2,7 +2,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>SlickGrid example</title>
+ <title>SlickGrid example 5: Collapsing</title>
<link rel="stylesheet" href="../slick.grid.css" type="text/css" media="screen" charset="utf-8" />
<link rel="stylesheet" href="../css/custom-theme/jquery-ui-1.7.2.custom.css" type="text/css" media="screen" charset="utf-8" />
<link rel="stylesheet" href="examples.css" type="text/css" media="screen" charset="utf-8" />
@@ -32,51 +32,41 @@
</style>
</head>
<body>
- <script language="JavaScript" src="../lib/firebugx.js"></script>
- <script language="JavaScript" src="../lib/jquery-1.4.1.min.js"></script>
- <script language="JavaScript" src="../lib/jquery-ui-1.7.2.custom.min.js"></script>
- <script language="JavaScript" src="../lib/jquery.rule-1.0.1-min.js"></script>
- <script language="JavaScript" src="../lib/jquery.event.drag.custom.js"></script>
-
- <script language="JavaScript" src="../slick.editors.js"></script>
- <script language="JavaScript" src="../slick.grid.js"></script>
- <script language="JavaScript" src="../slick.globaleditorlock.js"></script>
- <script language="JavaScript" src="../slick.model.js"></script>
-
-
<table width="100%">
<tr>
<td valign="top" width="50%">
-
<div style="border:1px solid gray;background:wheat;padding:6px;">
-
<label>Show tasks with % at least: </label>
<div style="padding:4px;">
<div style="width:100px;" id="pcSlider"></div>
</div>
-
<br/>
-
<label>And title including:</label>
<input type=text id="txtSearch">
</div>
-
<br/>
-
<div id="myGrid" style="width:600px;height:500px;"></div>
</td>
<td valign="top">
<h2>Demonstrates:</h2>
-
<ul>
<li>implementing expand/collapse as a filter for DataView</li>
</ul>
-
</td>
</tr>
</table>
+ <script language="JavaScript" src="../lib/firebugx.js"></script>
+ <script language="JavaScript" src="../lib/jquery-1.4.1.min.js"></script>
+ <script language="JavaScript" src="../lib/jquery-ui-1.7.2.custom.min.js"></script>
+ <script language="JavaScript" src="../lib/jquery.rule-1.0.1-min.js"></script>
+ <script language="JavaScript" src="../lib/jquery.event.drag.custom.js"></script>
+
+ <script language="JavaScript" src="../slick.editors.js"></script>
+ <script language="JavaScript" src="../slick.globaleditorlock.js"></script>
+ <script language="JavaScript" src="../slick.grid.js"></script>
+ <script language="JavaScript" src="../slick.model.js"></script>
<script>
function requiredFieldValidator(value) {
diff --git a/examples/example6-ajax-loading.html b/examples/example6-ajax-loading.html
index e7b6b30..19fcc3f 100644
--- a/examples/example6-ajax-loading.html
+++ b/examples/example6-ajax-loading.html
@@ -2,7 +2,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>SlickGrid example</title>
+ <title>SlickGrid example 6: AJAX Load</title>
<link rel="stylesheet" href="../slick.grid.css" type="text/css" media="screen" charset="utf-8" />
<link rel="stylesheet" href="../css/custom-theme/jquery-ui-1.7.2.custom.css" type="text/css" media="screen" charset="utf-8" />
<link rel="stylesheet" href="examples.css" type="text/css" media="screen" charset="utf-8" />
@@ -35,17 +35,6 @@
</style>
</head>
<body>
- <script language="JavaScript" src="../lib/firebugx.js"></script>
- <script language="JavaScript" src="../lib/jquery-1.4.1.min.js"></script>
- <script language="JavaScript" src="../lib/jquery-ui-1.7.2.custom.min.js"></script>
- <script language="JavaScript" src="../lib/jquery.rule-1.0.1-min.js"></script>
- <script language="JavaScript" src="../lib/jquery.event.drag.custom.js"></script>
- <script language="JavaScript" src="../lib/jquery.jsonp-1.1.0.min.js"></script>
-
- <script language="JavaScript" src="../slick.remotemodel.js"></script>
- <script language="JavaScript" src="../slick.grid.js"></script>
- <script language="JavaScript" src="../slick.globaleditorlock.js"></script>
-
<div style="width:700px;float:left;">
<div class="grid-header" style="width:100%">
<label>Digg stories</label>
@@ -57,8 +46,6 @@
<div id="myGrid" style="width:100%;height:600px;"></div>
<div id="pager" style="width:100%;height:20px;"></div>
</div>
-
-
<div style="margin-left:750px;margin-top:40px;;">
<h2>Demonstrates:</h2>
<ul>
@@ -67,6 +54,18 @@
</ul>
</div>
+ <script language="JavaScript" src="../lib/firebugx.js"></script>
+
+ <script language="JavaScript" src="../lib/jquery-1.4.1.min.js"></script>
+ <script language="JavaScript" src="../lib/jquery-ui-1.7.2.custom.min.js"></script>
+ <script language="JavaScript" src="../lib/jquery.rule-1.0.1-min.js"></script>
+ <script language="JavaScript" src="../lib/jquery.event.drag.custom.js"></script>
+ <script language="JavaScript" src="../lib/jquery.jsonp-1.1.0.min.js"></script>
+
+ <script language="JavaScript" src="../slick.remotemodel.js"></script>
+ <script language="JavaScript" src="../slick.globaleditorlock.js"></script>
+ <script language="JavaScript" src="../slick.grid.js"></script>
+
<script>
var grid;
var data = [];
diff --git a/examples/example7-events.html b/examples/example7-events.html
index f8480d3..9ea15c1 100644
--- a/examples/example7-events.html
+++ b/examples/example7-events.html
@@ -2,7 +2,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>SlickGrid example</title>
+ <title>SlickGrid example 7: Events</title>
<link rel="stylesheet" href="../slick.grid.css" type="text/css" media="screen" charset="utf-8" />
<link rel="stylesheet" href="../css/custom-theme/jquery-ui-1.7.2.custom.css" type="text/css" media="screen" charset="utf-8" />
<link rel="stylesheet" href="examples.css" type="text/css" media="screen" charset="utf-8" />
@@ -40,17 +40,6 @@
</style>
</head>
<body>
- <script language="JavaScript" src="../lib/firebugx.js"></script>
- <script language="JavaScript" src="../lib/jquery-1.4.1.min.js"></script>
- <script language="JavaScript" src="../lib/jquery-ui-1.7.2.custom.min.js"></script>
- <script language="JavaScript" src="../lib/jquery.rule-1.0.1-min.js"></script>
- <script language="JavaScript" src="../lib/jquery.event.drag.custom.js"></script>
-
- <script language="JavaScript" src="../slick.editors.js"></script>
- <script language="JavaScript" src="../slick.grid.js"></script>
- <script language="JavaScript" src="../slick.globaleditorlock.js"></script>
-
-
<table width="100%">
<tr>
<td valign="top" width="50%">
@@ -58,20 +47,14 @@
</td>
<td valign="top">
<h2>Demonstrates:</h2>
-
<ul>
<li>handling events from the grid:</li>
<li>Right-click the row to open the context menu</li>
<li>Click the priority cell to toggle values</li>
</ul>
-
</td>
</tr>
</table>
-
-
-
-
<ul id="contextMenu" style="display:none;position:absolute">
<b>Set priority:</b>
<li data="Low">Low</li>
@@ -79,7 +62,16 @@
<li data="High">High</li>
</ul>
+ <script language="JavaScript" src="../lib/firebugx.js"></script>
+ <script language="JavaScript" src="../lib/jquery-1.4.1.min.js"></script>
+ <script language="JavaScript" src="../lib/jquery-ui-1.7.2.custom.min.js"></script>
+ <script language="JavaScript" src="../lib/jquery.rule-1.0.1-min.js"></script>
+ <script language="JavaScript" src="../lib/jquery.event.drag.custom.js"></script>
+
+ <script language="JavaScript" src="../slick.editors.js"></script>
+ <script language="JavaScript" src="../slick.globaleditorlock.js"></script>
+ <script language="JavaScript" src="../slick.grid.js"></script>
<script>
var grid;
diff --git a/examples/example8-alternative-display.html b/examples/example8-alternative-display.html
index efe80d3..18262d1 100644
--- a/examples/example8-alternative-display.html
+++ b/examples/example8-alternative-display.html
@@ -2,7 +2,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>SlickGrid example</title>
+ <title>SlickGrid example 8: Alternative display</title>
<link rel="stylesheet" href="../slick.grid.css" type="text/css" media="screen" charset="utf-8" />
<link rel="stylesheet" href="../css/custom-theme/jquery-ui-1.7.2.custom.css" type="text/css" media="screen" charset="utf-8" />
<link rel="stylesheet" href="examples.css" type="text/css" media="screen" charset="utf-8" />
@@ -59,16 +59,6 @@
</style>
</head>
<body>
- <script language="JavaScript" src="../lib/firebugx.js"></script>
- <script language="JavaScript" src="../lib/jquery-1.4.1.min.js"></script>
- <script language="JavaScript" src="../lib/jquery-ui-1.7.2.custom.min.js"></script>
- <script language="JavaScript" src="../lib/jquery.rule-1.0.1-min.js"></script>
- <script language="JavaScript" src="../lib/jquery.event.drag.custom.js"></script>
-
- <script language="JavaScript" src="../slick.grid.js"></script>
- <script language="JavaScript" src="../slick.globaleditorlock.js"></script>
-
-
<table width="100%">
<tr>
<td valign="top" width="50%">
@@ -84,7 +74,6 @@
</tr>
</table>
-
<!-- cell template -->
<script type="text/html" id="cell_template">
<div class="cell-inner">
@@ -98,7 +87,15 @@
</div>
</script>
+ <script language="JavaScript" src="../lib/firebugx.js"></script>
+ <script language="JavaScript" src="../lib/jquery-1.4.1.min.js"></script>
+ <script language="JavaScript" src="../lib/jquery-ui-1.7.2.custom.min.js"></script>
+ <script language="JavaScript" src="../lib/jquery.rule-1.0.1-min.js"></script>
+ <script language="JavaScript" src="../lib/jquery.event.drag.custom.js"></script>
+
+ <script language="JavaScript" src="../slick.globaleditorlock.js"></script>
+ <script language="JavaScript" src="../slick.grid.js"></script>
<script>
// Simple JavaScript Templating
diff --git a/examples/example9-row-reordering.html b/examples/example9-row-reordering.html
index 66eff99..5c5badd 100644
--- a/examples/example9-row-reordering.html
+++ b/examples/example9-row-reordering.html
@@ -2,7 +2,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>SlickGrid example</title>
+ <title>SlickGrid example 9: Row reordering</title>
<link rel="stylesheet" href="../slick.grid.css" type="text/css" media="screen" charset="utf-8" />
<link rel="stylesheet" href="../css/custom-theme/jquery-ui-1.7.2.custom.css" type="text/css" media="screen" charset="utf-8" />
<link rel="stylesheet" href="examples.css" type="text/css" media="screen" charset="utf-8" />
@@ -22,24 +22,12 @@
</style>
</head>
<body>
- <script language="JavaScript" src="../lib/firebugx.js"></script>
- <script language="JavaScript" src="../lib/jquery-1.4.1.min.js"></script>
- <script language="JavaScript" src="../lib/jquery-ui-1.7.2.custom.min.js"></script>
- <script language="JavaScript" src="../lib/jquery.rule-1.0.1-min.js"></script>
- <script language="JavaScript" src="../lib/jquery.event.drag.custom.js"></script>
-
- <script language="JavaScript" src="../slick.editors.js"></script>
- <script language="JavaScript" src="../slick.grid.js"></script>
- <script language="JavaScript" src="../slick.globaleditorlock.js"></script>
-
-
<div style="width:600px;float:left;">
<div class="grid-header" style="width:100%">
<label>Santa's TODO list:</label>
</div>
<div id="myGrid" style="width:100%;height:500px;"></div>
</div>
-
<div class="options-panel" style="width:320px;margin-left:650px;">
<b>Tips:</b>
<hr/>
@@ -49,6 +37,16 @@
</div>
</div>
+ <script language="JavaScript" src="../lib/firebugx.js"></script>
+
+ <script language="JavaScript" src="../lib/jquery-1.4.1.min.js"></script>
+ <script language="JavaScript" src="../lib/jquery-ui-1.7.2.custom.min.js"></script>
+ <script language="JavaScript" src="../lib/jquery.rule-1.0.1-min.js"></script>
+ <script language="JavaScript" src="../lib/jquery.event.drag.custom.js"></script>
+
+ <script language="JavaScript" src="../slick.editors.js"></script>
+ <script language="JavaScript" src="../slick.globaleditorlock.js"></script>
+ <script language="JavaScript" src="../slick.grid.js"></script>
<script>
var grid;
diff --git a/slick.grid.js b/slick.grid.js
index 7362362..99a2c3f 100644
--- a/slick.grid.js
+++ b/slick.grid.js
@@ -81,6 +81,18 @@
* @param {Object} options Grid options.
*
*/
+
+// make sure required JavaScript modules are loaded
+if (typeof jQuery === "undefined") {
+ throw new Error("SlickGrid requires jquery module to be loaded");
+}
+if (!jQuery.rule) {
+ throw new Error("SlickGrid requires jquery.rule module to be loaded");
+}
+if (!jQuery.fn.drag) {
+ throw new Error("SlickGrid requires jquery.event.drag module to be loaded");
+}
+
(function() {
var scrollbarDimensions; // shared across all grids on this page
@@ -211,6 +223,20 @@
options = $.extend({},defaults,options);
columnDefaults.width = options.defaultColumnWidth;
+ // validate loaded JavaScript modules against requested options
+ if (options.enableColumnReorder && !jQuery.fn.sortable) {
+ throw new Error("SlickGrid's \"enableColumnReorder = true\" option requires jquery-ui.sortable module to be loaded");
+ }
+ if (options.editable) {
+ if (typeof SelectorCellFormatter === "undefined") {
+ throw new Error("SlickGrid's \"editable = true\" option requires slick.editors module to be loaded");
+ }
+ if (!Slick.GlobalEditorLock) {
+ throw new Error("SlickGrid's \"editable = true\" option requires slick.globaleditorlock module to be loaded");
+ }
+ }
+
+
$container
.empty()
.attr("tabIndex",0)
diff --git a/tests/model benchmarks.html b/tests/model benchmarks.html
index d96e566..a94c50a 100644
--- a/tests/model benchmarks.html
+++ b/tests/model benchmarks.html
@@ -2,7 +2,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title></title>
+ <title>SlickGrid Model Benchmark</title>
</head>
<body>
<script language="JavaScript" src="../lib/firebugx.js"></script>
diff --git a/tests/scrolling benchmarks.html b/tests/scrolling benchmarks.html
index 3b8a74a..72186a9 100644
--- a/tests/scrolling benchmarks.html
+++ b/tests/scrolling benchmarks.html
@@ -2,7 +2,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>SlickGrid</title>
+ <title>SlickGrid Scrolling Benchmark</title>
<link rel="stylesheet" href="../slick.grid.css" type="text/css" media="screen" charset="utf-8" />
<link rel="stylesheet" href="../css/custom-theme/jquery-ui-1.7.2.custom.css" type="text/css" media="screen" charset="utf-8" />
<link rel="stylesheet" href="../examples/examples.css" type="text/css" media="screen" charset="utf-8" />
@@ -37,8 +37,6 @@
<div id="myGrid" style="width:600px;height:600px;"></div>
-
-
<script>
var grid;
var data = [];
generated by cgit v1.1 at 2025-06-06 10:58:45 +0000