Merge branch 'develop' of github.com:datavisyn/lineupjs into develop

# Conflicts: # src/model/CategoricalColumn.ts # src/model/ICategoricalColumn.ts # src/model/StringColumn.ts
lineupjs · Oct 30, 2018 · 6c585c8 · 6c585c8
2 parents e9e2a84 + 675a074
commit 6c585c8
Show file tree

Hide file tree

Showing 81 changed files with 2,875 additions and 2,428 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -23,5 +23,5 @@
   "typescript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": false,
   "tsimporter.spaceBetweenBraces": false,
   "tsimporter.noStatusBar": true,
-  "typescriptHero.codeOutline.enabled": false
+  "typescript.tsdk": "node_modules\\typescript\\lib"
 }
diff --git a/demo/builder2.html b/demo/builder2.html
@@ -28,7 +28,7 @@
     // manually define columns
     builder
       .sidePanel(true, true)
-      .column(LineUpJS.buildStringColumn('d').label('Label').width(100))
+      .column(LineUpJS.buildStringColumn('d').label('Label').alignment('right').width(100))
       .column(LineUpJS.buildCategoricalColumn('cat', cats).color('green'))
       .column(LineUpJS.buildCategoricalColumn('cat2', cats).color('blue'))
       .column(LineUpJS.buildNumberColumn('a', [0, 10]).color('blue'));

diff --git a/demo/builder4.html b/demo/builder4.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html>
+<head lang="en">
+  <meta charset="UTF-8">
+  <title>LineUp Builder Test</title>
+
+  <link href="./LineUpJS.css" rel="stylesheet">
+  <link href="./demo.css" rel="stylesheet">
+</head>
+<body>
+<script src="./LineUpJS.js"></script>
+<script src="./helper/testRules.js"></script>
+
+<script>
+  window.onload = function () {
+    const arr = [];
+    const l = new Array(10).fill(0);
+    const cats = ['c1', 'c2', 'c3'];
+    for (let i = 0; i < 100; ++i) {
+      arr.push({
+        a: Math.random() * 10,
+        d: 'Row ' + i,
+        cat: cats[Math.floor(Math.random() * 3)],
+        cat2: cats[Math.floor(Math.random() * 3)],
+        as: l.map(() => Math.random() * 10)
+      })
+    }
+    const builder = LineUpJS.builder(arr);
+    builder.deriveColumns().animated(false);
+    // and two rankings
+    const ranking = LineUpJS.buildRanking()
+      .supportTypes()
+      .allColumns() // add all columns
+      .groupBy('cat')
+      .sortBy('a', 'desc')
+      .sortBy('d', 'asc')
+
+    builder
+      .ranking(ranking);
+
+
+    builder.buildTaggle(document.body);
+  };
+</script>
+
+</body>
+</html>
diff --git a/demo/link.html b/demo/link.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html>
+<head lang="en">
+  <meta charset="UTF-8">
+  <title>LineUp Builder Test</title>
+
+  <link href="./LineUpJS.css" rel="stylesheet">
+  <link href="./demo.css" rel="stylesheet">
+</head>
+<body>
+<script src="./LineUpJS.js"></script>
+
+<script>
+  window.onload = function () {
+    const arr = [];
+    const cats = ['c1', 'c2', 'c3'];
+    const template = new Array(10).fill(0);
+    for (let i = 0; i < 100; ++i) {
+      arr.push({
+        a: Math.random() * 10,
+        d: 'Row ' + i,
+        cat: cats[Math.floor(Math.random() * 3)],
+        cat2: cats[Math.floor(Math.random() * 3)],
+        as: template.map((d) => Math.random() * 10)
+      })
+    }
+    const builder = LineUpJS.builder(arr);
+    builder.deriveColumns();
+    builder.column(LineUpJS.buildStringColumn('d').label('Link').pattern('https://duckduckgo.com/?q=${escapedValue}').width(100));
+
+    builder.buildTaggle(document.body);
+  };
+</script>
+
+</body>
+</html>
diff --git a/jest.config.js b/jest.config.js
@@ -11,9 +11,9 @@ module.exports = {
   verbose: true,
   globals: {
     'ts-jest': {
-      tsConfigFile: 'tsconfig.test.json',
-      enableTsDiagnostics: true,
-      skipBabel: true
+      tsConfig: 'tsconfig.test.json',
+      diagnostics: true,
+      babelConfig: false
     }
   }
 };