Skip to content

Commit

Permalink
fixed issue #156
Browse files Browse the repository at this point in the history
  • Loading branch information
TonyGermaneri committed Aug 10, 2018
1 parent 7a989a4 commit 8558ac8
Show file tree
Hide file tree
Showing 10 changed files with 5,536 additions and 5,671 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "canvas-datagrid",
"main": "lib/main.js",
"version": "0.21.2",
"version": "0.21.3",
"ignore": [
"**/.*",
"node_modules",
Expand Down
2 changes: 1 addition & 1 deletion build.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2015
2016
11,026 changes: 5,495 additions & 5,531 deletions dist/canvas-datagrid.debug.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/canvas-datagrid.debug.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/canvas-datagrid.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/canvas-datagrid.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/intf.js
Original file line number Diff line number Diff line change
Expand Up @@ -902,7 +902,7 @@ define([], function () {
if (!Array.isArray(val)) {
throw new TypeError('Value must be an array.');
}
if (val.length < s.length) {
if (val.length < self.getSchema().length) {
throw new RangeError('Array length must be equal to or greater than number of columns.');
}
self.orders.columns = val;
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "canvas-datagrid",
"version": "0.21.2",
"version": "0.21.3",
"description": "Canvas based data grid web component. Capable of displaying millions of contiguous hierarchical rows and columns without paging or loading, on a single canvas element.",
"main": "./dist/canvas-datagrid.js",
"scripts": {
Expand Down
84 changes: 23 additions & 61 deletions tutorials/developer.html
Original file line number Diff line number Diff line change
@@ -1,68 +1,30 @@
<!doctype html>
<!DOCTYPE html>
<html>
<head>
<!-- this file is for developing in a sandbox on a local machine -->
<script src="./developer.js"></script>
<script>
var s = document.createElement('script');
s.src = "../dist/canvas-datagrid.debug.js?cacheBust=" + +new Date();
s.onload = function () {
setTimeout(g, 1000);
}
document.head.appendChild(s);
</script>
<meta name="viewport" content="width=device-width">
<style>
html, body {
height: 100%;
min-height: 100%;
margin: 0;
padding: 0;
overflow: auto;
/* --cdg-height: 100%;
--cdg-width: 100%;*/
}
/* .n {
height: 300px;
width: 300px;
position: absolute;
top: 900px;
left: 100px;
overflow: scroll;
}*/
.some {
<script type="text/javascript" src="../dist/canvas-datagrid.debug.js"></script>
<style type="text/css">
#grid { height: 300px; } #grid canvas, #grid canvas-datagrid { --cdg-height: 300px; }
</style>

}
.grid {
<script type="text/javascript">
window.addEventListener('load', function () {
var parentNode = document.getElementById('grid');
var grid = document.createElement('canvas-datagrid');
parentNode.appendChild(grid);
grid.data = [
{col1: 'foo', col2: 0, col3: 'a'},
{col1: 'bar', col2: 1, col3: 'b'},
{col1: 'baz', col2: 2, col3: 'c'}
];
grid.columnOrder = [2, 1, 0];
grid.addEventListener('reorder', function () {
//grid.columnOrder = [1, 2, 0];
});
});
</script>

/*--cdg-grid-background-color: dodgerblue;*/
}
</style>
</head>
<body>
<!-- <div class="grid" id="grid"></div> -->
<!-- <div class="n">
<div class="grid" id="grid"></div>
</div> -->
<!-- <script>debugger;</script> -->
<!-- <canvas-datagrid class="grid" style="height: 20%;" selectionMode="row"><script>[[1, 2, 3, 4], [1, 2, 3, 4]]</script></canvas-datagrid>
<canvas-datagrid class="grid" style="height: 20%;"><script>[
{"e": 1, "b": 2},
{"e": 1, "b": 2},
{"e": 1, "b": 2},
{"e": 1, "b": 2},
{"e": 1, "b": 2},
{"e": 1, "b": 2},
{"e": 1, "b": 2},
{"e": 1, "b": 2},
{"e": 1, "b": 2},
{"e": 1, "b": 2},
{"e": 1, "b": 2},
{"e": 1, "b": 2},
{"e": 1, "b": 2},
{"e": 1, "b": 2},
{"e": 1, "b": 2},
{"e": 3, "b": 4}
]</script></canvas-datagrid> -->
<div id="grid"></div>
</body>
</html>
</html>
83 changes: 11 additions & 72 deletions tutorials/developer.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,77 +3,16 @@
/* this file is for developing in a sandbox on a local machine */
function g() {
'use strict';
var difficult = 'leam lee leg leechees lecythi leakproof leaguer leaked lecturn';
var veryDifficult = '1leam 2lee 3leg 4leechees 5lecythi 6leakproof 7leaguer 8leakproof-leaguer 9leaked 10lecturn 1leam 2lee 3leg 4leechees 5lecythi 6leakproof 7leaguer 8leakproof-leaguer 9leaked 10lecturn';
function randomWords(num) {
var out = [];
num = num || 20;
var words = ["leafletting","leaflike","leafs","leafstalk","leafstalks","leafworm","leafworms","leafy","league","leagued","leaguer","leaguered","leaguering","leaguers","leagues","leaguing","leak","leakage","leakages","leaked","leaker","leakers","leakier","leakiest","leakily","leakiness","leakinesses","leaking","leakless","leakproof","leaks","leaky","leal","lealer","lealest","leally","lealties","lealty","leam","leamed","leaming","leams","lean","leaned","leaner","leaners","leanest","leaning","leanings","leanly","leanness","leannesses","leans","leant","leany","leap","leaped","leaper","leaperous","leapers","leapfrog","leapfrogged","leapfrogging","leapfrogs","leaping","leaporous","leaprous","leaps","leapt","lear","leare","leared","leares","learier","leariest","leariness","learinesses","learing","learn","learnabilities","learnability","learnable","learned","learnedly","learnedness","learnednesses","learner","learners","learning","learnings","learns","learnt","lears","leary","leas","leasable","lease","leaseback","leasebacks","leased","leasehold","leaseholder","leaseholders","leaseholds","leaser","leasers","leases","leash","leashed","leashes","leashing","leasing","leasings","leasow","leasowe","leasowed","leasowes","leasowing","leasows","least","leastaways","leasts","leastways","leastwise","leasure","leasures","leat","leather","leatherback","leatherbacks","leathered","leatherette","leatherettes","leathergoods","leatherhead","leatherheads","leatherier","leatheriest","leatheriness","leatherinesses","leathering","leatherings","leatherjacket","leatherjackets","leatherleaf","leatherleaves","leatherlike","leathern","leatherneck","leathernecks","leathers","leatherwood","leatherwoods","leathery","leats","leave","leaved","leaven","leavened","leavening","leavenings","leavenous","leavens","leaver","leavers","leaves","leavier","leaviest","leaving","leavings","leavy","leaze","leazes","lebbek","lebbeks","leben","lebens","lebensraum","lebensraums","lebkuchen","lecanora","lecanoras","leccies","leccy","lech","lechaim","lechaims","lechayim","lechayims","leched","lecher","lechered","lecheries","lechering","lecherous","lecherously","lecherousness","lecherousnesses","lechers","lechery","leches","leching","lechwe","lechwes","lecithin","lecithinase","lecithinases","lecithins","lectern","lecterns","lectin","lectins","lection","lectionaries","lectionary","lections","lectisternia","lectisternium","lector","lectorate","lectorates","lectors","lectorship","lectorships","lectotype","lectotypes","lectress","lectresses","lecture","lectured","lecturer","lecturers","lectures","lectureship","lectureships","lecturing","lecturn","lecturns","lecythi","lecythidaceous","lecythis","lecythus","led","ledden","leddens","lederhosen","ledge","ledged","ledger","ledgered","ledgering","ledgers","ledges","ledgier","ledgiest","ledgy","ledum","ledums","lee","leear","leears","leeboard","leeboards","leech","leechcraft","leechcrafts","leechdom","leechdoms","leeched","leechee","leechees","leeches","leeching","leechlike","leed","leeing","leek","leeks","leep","leeped","leeping","leeps","leer","leered","leerier","leeriest","leerily","leeriness","leerinesses","leering","leeringly","leerings","leers","leery","lees","leese","leeses","leesing","leet","leetle","leets","leetspeak","leetspeaks","leeward","leewardly","leewards","leeway","leeways","leeze","left","lefte","lefter","leftest","leftie","lefties","leftish","leftism","leftisms","leftist","leftists","leftmost","leftmosts","leftover","leftovers","lefts","leftward","leftwardly","leftwards","leftwing","lefty","leg","legacies","legacy","legal","legalese","legaleses","legalisation","legalisations","legalise","legalised","legaliser","legalisers","legalises","legalising","legalism","legalisms","legalist","legalistic","legalistically","legalists","legalities","legality","legalization","legalizations","legalize","legalized","legalizer","legalizers","legalizes","legalizing","legally","legals","legataries","legatary","legate","legated","legatee","legatees","legates","legateship","legateships","legatine","legating","legation","legationary","legations","legatissimo","legato","legator","legatorial","legators","legatos","legend","legendaries","legendarily","legendary","legendise","legendised","legendises","legendising","legendist","legendists","legendize","legendized","legendizes","legendizing","legendries","legendry","legends","leger","legerdemain","legerdemainist","legerdemainists","legerdemains","legering","legerings","legerities","legerity","legers","leges","legge","legged","legger","leggers","legges","leggie","leggier","leggiero","leggies","leggiest","leggin","legginess","legginesses","legging","legginged","leggings"];
var l = Math.floor(Math.random() * 10);
for (var x = l ; x < l + Math.floor(Math.random() * num); x += 1) {
out.push(words[Math.floor(Math.random() * words.length) % words.length]);
}
return out.join(' ');
}
var x,
y,
grid = canvasDatagrid({
parentNode: document.body,
debug: false,
showPerformance: true,
globalRowResize: true,
multiLine: true
});
// grid.data = [
// {a: veryDifficult, b: 'smal', c: '1', d: '1 2 3 4 5', e: '1,2,3,4,5'}
// ];
// grid.addEventListener('expandtree', function (e) {
// e.treeGrid.data = getData('');
// });
// grid.style.columnHeaderCellHeight = 40;
grid.style.cellHeight = 70;
function getData(prefix) {
var data = [];
for (x = 0; x < 100; x += 1) {
data[x] = {};
for (y = 0; y < 100; y += 1) {
data[x][String.fromCharCode(65 + y)] = randomWords();
}
}
data[x - 1].A = 'EOF';
data[x - 1][String.fromCharCode(65 + y - 1)] = 'EOF';
return data;
}
grid.data = getData('');
grid.addEventListener('beforerendercell', function (e) {
e.cell.innerHTML = e.cell.value;
var parentNode = document.getElementById('grid');
var grid = document.createElement('canvas-datagrid');
parentNode.appendChild(grid);
grid.data = [
{col1: 'foo', col2: 0, col3: 'a'},
{col1: 'bar', col2: 1, col3: 'b'},
{col1: 'baz', col2: 2, col3: 'c'}
];
grid.columnOrder = [2, 1, 0];
grid.addEventListener('reorder', function () {
grid.columnOrder = [1, 2, 0];
});
// for (x = 0; x < 40; x += 1) {
// // grid.schema[x].width = 500 * Math.random();
// // grid.schema[x].hidden = Math.random() > 0.5;
// }

// [0, 1, 2].forEach(function (x) {
// grid.schema[x].width = 100;
// grid.schema[x].hidden = false;
// });
// grid.schema[0].hidden = false;
grid.style.height = '100%';
grid.style.width = '100%';
grid.style.cellWhiteSpace = 'normal';
grid.style.cellHorizontalAlignment = 'right';
grid.style.activeCellHorizontalAlignment = 'right';
// grid.style.cellVerticalAlignment = 'top';
// grid.style.activeCellVerticalAlignment = 'top';
// grid.data[0][grid.schema[0].name] = difficult;
// grid.data[0][grid.schema[1].name] = veryDifficult;
//console.log(grid.columnOrder);
//grid.columnOrder = [4, 3, 2, 1, 0];
//console.log(grid.rowOrder);
//grid.rowOrder = [4, 3, 2, 1, 0];
// grid.style.height = 'auto';
// grid.style.width = 'auto';
// setTimeout(function () {
// grid.scrollIntoView(20, 75, .5, .5);
// }, 1000);
}

0 comments on commit 8558ac8

Please sign in to comment.