<commit_before><!DOCTYPE html>
<html>
	<head>
		<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">
			@import "../../dojo/resources/dojo.css";
			@import "../css/skins/claro.css";
			@import "../css/dgrid.css"; /* this ensures that are rules come after dgrid.css */
			.heading {
				font-weight: bold;
				padding-bottom: 0.25em;
			}
			.grid { 
				width: 700px;
			}
			.grid .dgrid-column-set-0 { 
				width: 50%;
			}
			.grid .field-col1 {
				width: 200px;
			}
			.grid .field-col2 {
				width: 100px;
			}
			.grid .field-col4 {
				width: 500px;
			}
			.ui-widget{
				margin: 10px;
			}
			.dgrid-sort-arrow {
				float: left;
			}
		</style>

		<script type="text/javascript" src="../../dojo/dojo.js" 
			data-dojo-config="async: true"></script>
		<script type="text/javascript">
			require(["dgrid/OnDemandGrid", "dgrid/GridWithColumnSetsFromHtml", "dgrid/extensions/ColumnReorder", "dgrid/ColumnSet", "dgrid/Tree", "dgrid/Selection", "dgrid/Keyboard", "dojo/_base/declare", "dojo/on", "dojo/parser", "dgrid/test/data/base", "dgrid/test/data/DeferredWrapper", "dojo/domReady!"],
				function(Grid, GridFromHtml, ColumnReorder, ColumnSet, Tree, Selection, Keyboard, declare, on, parser, testStore, DeferredWrapper){
					var columnSets1 = [
							[
								[{label: 'Column 1', field: 'col1'},
										{label: 'Column 2', field: 'col2', sortable: false}],
									[{label: 'Column 3', field: 'col3', colSpan: 2}]],
							[
								[{label: 'Column 1', field: 'col1', rowSpan: 2},
									{label: 'Column 4', field: 'col4'}],
									[{label: 'Column 5', field: 'col5'}]
							]],
						columnSets2 = [
							[
								[{label: 'Column 1', field: 'col1'},
									{label: 'Column 3', field: 'col3', rowSpan: 2}],
								[{label: 'Column 2', field: 'col2', sortable: false}]],
							[
								[{label: 'Column 1', field: 'col1', colSpan: 2}],
								[{label: 'Column 1.5', field: 'col1', colSpan: 2}],
								[{label: 'Column 1.6', field: 'col1', colSpan: 2}],
								[{label: 'Column 4', field: 'col4'},
									{label: 'Column 5', field: 'col5'}]
							]],
						columnSets3 = [
							[
								[{label: 'Column 1', field: 'col1'},
										{label: 'Column 2', field: 'col2', sortable: false}],
									[{label: 'Column 3', field: 'col3', colSpan: 2}]],
							[[{label: 'Column 1', field: 'col1', rowSpan: 2}]],
							[
								[{label: 'Column 4', field: 'col4'}],
									[{label: 'Column 5', field: 'col5'}]
							]],
						// same structures as above, without being split into ColumnSets
						subRows1 = [
							[
								{label: 'Column 1', field: 'col1'},
								{label: 'Column 2', field: 'col2', sortable: false},
								{label: 'Column 1', field: 'col1', rowSpan: 2},
								{label: 'Column 4', field: 'col4'}
							], [
								{label: 'Column 3', field: 'col3', colSpan: 2},
								{label: 'Column 5', field: 'col5'}
							]],
						subRows2 = [
							[
								{label: 'Column 1', field: 'col1'},
								{label: 'Column 3', field: 'col3', rowSpan: 2},
								{label: 'Column 1', field: 'col1', colSpan: 2}
							], [
								{label: 'Column 2', field: 'col2', sortable: false},
								{label: 'Column 4', field: 'col4'},
								{label: 'Column 5', field: 'col5'}
							]],
						columnSetsSingleRow = [
							[
								[
									{label: 'Column 1', field: 'col1'},
									{label: 'Column 2', field: 'col2', sortable: false}
								]
							], [
								[
									{label: 'Column 1', field: 'col1'},
									{label: 'Column 4', field: 'col4'}
								]
							]];
					
					function byId(id){ return document.getElementById(id); }

					var ComplexGrid = declare([Grid, ColumnSet, ColumnReorder, Selection, Keyboard]);

					window.gridNoColumnSets = new (declare([Grid, Selection, Keyboard]))({
						store: DeferredWrapper(testStore),
						subRows: subRows1
					}, "gridNoColumnSets");
					<commit_msg>Revert bogus complex_column changes from 97b1d9<commit_after><!DOCTYPE html>
<html>
	<head>
		<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">
			@import "../../dojo/resources/dojo.css";
			@import "../css/skins/claro.css";
			@import "../css/dgrid.css"; /* this ensures that are rules come after dgrid.css */
			.heading {
				font-weight: bold;
				padding-bottom: 0.25em;
			}
			.grid { 
				width: 700px;
			}
			.grid .dgrid-column-set-0 { 
				width: 50%;
			}
			.grid .field-col1 {
				width: 200px;
			}
			.grid .field-col2 {
				width: 100px;
			}
			.grid .field-col4 {
				width: 500px;
			}
			.ui-widget{
				margin: 10px;
			}
			.dgrid-sort-arrow {
				float: left;
			}
		</style>

		<script type="text/javascript" src="../../dojo/dojo.js" 
			data-dojo-config="async: true"></script>
		<script type="text/javascript">
			require(["dgrid/OnDemandGrid", "dgrid/GridWithColumnSetsFromHtml", "dgrid/ColumnSet", "dgrid/Tree", "dgrid/Selection", "dgrid/Keyboard", "dojo/_base/declare", "dojo/on", "dojo/parser", "dgrid/test/data/base", "dgrid/test/data/DeferredWrapper", "dojo/domReady!"],
				function(Grid, GridFromHtml, ColumnSet, Tree, Selection, Keyboard, declare, on, parser, testStore, DeferredWrapper){
					var columnSets1 = [
							[
								[{label: 'Column 1', field: 'col1'},
										{label: 'Column 2', field: 'col2', sortable: false}],
									[{label: 'Column 3', field: 'col3', colSpan: 2}]],
							[
								[{label: 'Column 1', field: 'col1', rowSpan: 2},
									{label: 'Column 4', field: 'col4'}],
									[{label: 'Column 5', field: 'col5'}]
							]],
						columnSets2 = [
							[
								[{label: 'Column 1', field: 'col1'},
									{label: 'Column 3', field: 'col3', rowSpan: 2}],
								[{label: 'Column 2', field: 'col2', sortable: false}]],
							[
								[{label: 'Column 1', field: 'col1', colSpan: 2}],
								[{label: 'Column 4', field: 'col4'},
									{label: 'Column 5', field: 'col5'}]
							]],
						columnSets3 = [
							[
								[{label: 'Column 1', field: 'col1'},
										{label: 'Column 2', field: 'col2', sortable: false}],
									[{label: 'Column 3', field: 'col3', colSpan: 2}]],
							[[{label: 'Column 1', field: 'col1', rowSpan: 2}]],
							[
								[{label: 'Column 4', field: 'col4'}],
									[{label: 'Column 5', field: 'col5'}]
							]],
						// same structures as above, without being split into ColumnSets
						subRows1 = [
							[
								{label: 'Column 1', field: 'col1'},
								{label: 'Column 2', field: 'col2', sortable: false},
								{label: 'Column 1', field: 'col1', rowSpan: 2},
								{label: 'Column 4', field: 'col4'}
							], [
								{label: 'Column 3', field: 'col3', colSpan: 2},
								{label: 'Column 5', field: 'col5'}
							]],
						subRows2 = [
							[
								{label: 'Column 1', field: 'col1'},
								{label: 'Column 3', field: 'col3', rowSpan: 2},
								{label: 'Column 1', field: 'col1', colSpan: 2}
							], [
								{label: 'Column 2', field: 'col2', sortable: false},
								{label: 'Column 4', field: 'col4'},
								{label: 'Column 5', field: 'col5'}
							]],
						columnSetsSingleRow = [
							[
								[
									{label: 'Column 1', field: 'col1'},
									{label: 'Column 2', field: 'col2', sortable: false}
								]
							], [
								[
									{label: 'Column 1', field: 'col1'},
									{label: 'Column 4', field: 'col4'}
								]
							]];
					
					function byId(id){ return document.getElementById(id); }

					var ComplexGrid = declare([Grid, ColumnSet, Selection, Keyboard]);

					window.gridNoColumnSets = new (declare([Grid, Selection, Keyboard]))({
						store: DeferredWrapper(testStore),
						subRows: subRows1
					}, "gridNoColumnSets");
					
{'fraction_non_alphanumeric': 0.191594718131031, 'fraction_numerical': 0.029710512950736415, 'mean_word_length': 2.414390983961855, 'pattern_counts': {'":': 0, '<': 27, '<?xml version=': 0, '>': 27, 'https://': 0, 'lorem ipsum': 0, 'www.': 0, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '7453707', 'n_tokens_mistral': 3947, 'n_tokens_neox': 2683, 'n_words': 682}