Skip to content

Commit a863704

Browse files
krausestkrausest
committed
Merge branch 'ts-thomas-master'
2 parents add69b2 + b87ab81 commit a863704

File tree

18 files changed

+182
-649
lines changed

18 files changed

+182
-649
lines changed

‎frameworks/keyed/mikado/index.html‎

Lines changed: 3 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -3,50 +3,12 @@
33
<head>
44
<meta charset="utf-8"/>
55
<title>Mikado-"keyed"</title>
6+
<link rel="preload" href="dist/main.js" as="script">
67
<link href="/css/currentStyle.css" rel="stylesheet"/>
8+
<!--<script src="node_modules/mikado/src/config.js"></script><script type="module" src="src/main.js"></script>-->
79
</head>
810
<body>
9-
<div id="main">
10-
<div class="container">
11-
<div class="jumbotron">
12-
<div class="row">
13-
<div class="col-md-6">
14-
<h1>Mikado-"keyed"</h1>
15-
</div>
16-
<div class="col-md-6">
17-
<div class="row">
18-
<div class="col-sm-6 smallpad">
19-
<button type="button" class="btn btn-primary btn-block" id="run" click="run">Create 1,000 rows</button>
20-
</div>
21-
<div class="col-sm-6 smallpad">
22-
<button type="button" class="btn btn-primary btn-block" id="runlots" click="runlots">Create 10,000 rows</button>
23-
</div>
24-
<div class="col-sm-6 smallpad">
25-
<button type="button" class="btn btn-primary btn-block" id="add" click="add">Append 1,000 rows</button>
26-
</div>
27-
<div class="col-sm-6 smallpad">
28-
<button type="button" class="btn btn-primary btn-block" id="update" click="update">Update every 10th row</button>
29-
</div>
30-
<div class="col-sm-6 smallpad">
31-
<button type="button" class="btn btn-primary btn-block" id="clear" click="clear">Clear</button>
32-
</div>
33-
<div class="col-sm-6 smallpad">
34-
<button type="button" class="btn btn-primary btn-block" id="swaprows" click="swaprows">Swap Rows</button>
35-
</div>
36-
</div>
37-
</div>
38-
</div>
39-
</div>
40-
<table class="table table-hover table-striped test-data">
41-
<tbody id="tbody"></tbody>
42-
</table>
43-
<span class="preloadicon glyphicon glyphicon-remove" aria-hidden="true"></span>
44-
</div>
45-
</div>
11+
<div id="main"></div>
4612
<script src="dist/main.js"></script>
47-
<!--
48-
<script src="src/config.js"></script>
49-
<script type="module" src="src/main.js"></script>
50-
-->
5113
</body>
5214
</html>

‎frameworks/keyed/mikado/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919
"url": "https://github.com/krausest/js-framework-benchmark.git"
2020
},
2121
"scripts": {
22-
"compile": "node task/compile && echo Compile Complete. && exit 0",
23-
"build": "node task/compile src/template.html && node task/build DEBUG=false ENABLE_CACHE=false BUILD_LIGHT=false && exit 0",
22+
"compile": "node node_modules/mikado/task/compile ./../../src/template/app.html && node node_modules/mikado/task/compile ./../../src/template/item.html && echo Compile Complete. && exit 0",
23+
"build": "npm run compile && node task/build RELEASE=custom DEBUG=false USE_POLYFILL=false SUPPORT_CACHE=false SUPPORT_EVENTS=true SUPPORT_STORAGE=true SUPPORT_HELPERS=true SUPPORT_ASYNC=false SUPPORT_TRANSPORT=false SUPPORT_LOOP_INCLUDE=false SUPPORT_CONDITIONAL=false && exit 0",
2424
"build-prod": "npm run build"
2525
},
2626
"dependencies": {
27-
"mikado": "0.0.7"
27+
"mikado": "^0.1.2"
2828
},
2929
"devDependencies": {
30-
"google-closure-compiler": "^20190904.0.0-nightly",
30+
"google-closure-compiler": "^20190910.0.0-nightly",
3131
"html2json": "^1.0.2"
3232
}
3333
}

‎frameworks/keyed/mikado/src/config.js‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎frameworks/keyed/mikado/src/main.js‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
11
"use strict";
22

33
import Mikado from "../node_modules/mikado/src/mikado.js";
4-
import template from "./template.es6.js";
4+
import app from "./template/app.es6.js";
5+
import item from "./template/item.es6.js";
56
import { buildData } from "./data.js";
67
import { startMeasure, stopMeasure } from "./bench.js";
78

9+
const main = document.getElementById("main");
10+
new Mikado(main, app).render().destroy(true);
11+
12+
const state = { "selected": -1 };
813
const root = document.getElementById("tbody");
9-
const mikado = new Mikado(root, /** @type {Template} */ (template), {
14+
const mikado = Mikado.new(root, item, {
1015

1116
"store": true,
1217
"loose": true,
13-
"reuse": false
14-
15-
}).route("run", function(){
18+
"reuse": false,
19+
"state": state // external reference
20+
})
21+
.route("run", function(){
1622
if(DEBUG) startMeasure("run");
1723
mikado.render(buildData(1000));
1824
if(DEBUG) stopMeasure();
@@ -29,10 +35,9 @@ const mikado = new Mikado(root, /** @type {Template} */ (template), {
2935
})
3036
.route("update", function(){
3137
if(DEBUG) startMeasure("update");
32-
for(let i = 0, item, len = mikado.length; i < len; i += 10){
33-
item = mikado.item(i);
34-
item.label += " !!!";
35-
mikado.update(i);
38+
for(let i = 0, len = mikado.length; i < len; i += 10){
39+
mikado.item(i).label += " !!!";
40+
mikado.refresh(i);
3641
}
3742
if(DEBUG) stopMeasure();
3843
})
@@ -46,21 +51,17 @@ const mikado = new Mikado(root, /** @type {Template} */ (template), {
4651
mikado.swap(1, 998);
4752
if(DEBUG) stopMeasure();
4853
})
49-
.route("remove", function(node){
54+
.route("remove", function(target){
5055
if(DEBUG) startMeasure("remove");
51-
mikado.remove(node);
56+
mikado.remove(target);
5257
if(DEBUG) stopMeasure();
5358
})
54-
.route("select", function(node){
59+
.route("select", function(target){
5560
if(DEBUG) startMeasure("select");
56-
let selected = mikado.state.selected;
57-
if(selected >= 0){
58-
selected = mikado.node(selected);
59-
if(selected === node) return;
60-
selected.className = "";
61-
}
62-
node.className = "danger";
63-
mikado.state.selected = mikado.index(node);
61+
const selected = state["selected"];
62+
if(selected >= 0) mikado.node(selected).className = "";
63+
target.className = "danger";
64+
state["selected"] = mikado.index(target);
6465
if(DEBUG) stopMeasure();
6566
})
6667
.listen("click");

‎frameworks/keyed/mikado/src/template/app.html‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<div class="container">
2+
<div class="jumbotron">
3+
<div class="row">
4+
<div class="col-md-6">
5+
<h1>Mikado-"keyed"</h1>
6+
</div>
7+
<div class="col-md-6">
8+
<div class="row">
9+
<div class="col-sm-6 smallpad">
10+
<button type="button" class="btn btn-primary btn-block" id="run" click="run">Create 1,000 rows</button>
11+
</div>
12+
<div class="col-sm-6 smallpad">
13+
<button type="button" class="btn btn-primary btn-block" id="runlots" click="runlots">Create 10,000 rows</button>
14+
</div>
15+
<div class="col-sm-6 smallpad">
16+
<button type="button" class="btn btn-primary btn-block" id="add" click="add">Append 1,000 rows</button>
17+
</div>
18+
<div class="col-sm-6 smallpad">
19+
<button type="button" class="btn btn-primary btn-block" id="update" click="update">Update every 10th row</button>
20+
</div>
21+
<div class="col-sm-6 smallpad">
22+
<button type="button" class="btn btn-primary btn-block" id="clear" click="clear">Clear</button>
23+
</div>
24+
<div class="col-sm-6 smallpad">
25+
<button type="button" class="btn btn-primary btn-block" id="swaprows" click="swaprows">Swap Rows</button>
26+
</div>
27+
</div>
28+
</div>
29+
</div>
30+
</div>
31+
<table class="table table-hover table-striped test-data">
32+
<tbody id="tbody"></tbody>
33+
</table>
34+
<span class="preloadicon glyphicon glyphicon-remove" aria-hidden="true"></span>
35+
</div>

‎frameworks/keyed/mikado/src/template.html‎ renamed to ‎frameworks/keyed/mikado/src/template/item.html‎

File renamed without changes.

‎frameworks/keyed/mikado/src/type.js‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎frameworks/keyed/mikado/task/build.js‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,34 @@ console.log();
66

77
fs.existsSync("log") || fs.mkdirSync("log");
88

9+
let flag_str = "";
10+
11+
var options = (function(argv){
12+
13+
const arr = {};
14+
let count = 0;
15+
16+
argv.forEach(function(val, index) {
17+
18+
if(++count > 2){
19+
20+
index = val.split('=');
21+
val = index[1];
22+
index = index[0].toUpperCase();
23+
24+
flag_str += " --define='" + index + "=" + val + "'";
25+
arr[index] = val;
26+
27+
if(count > 3) console.log(index + ': ' + val);
28+
}
29+
});
30+
31+
console.log('RELEASE: ' + (arr['RELEASE'] || 'custom'));
32+
33+
return arr;
34+
35+
})(process.argv);
36+
937
const parameter = (function(opt){
1038

1139
let parameter = '';
@@ -60,7 +88,7 @@ const parameter = (function(opt){
6088
//formatting: "PRETTY_PRINT"
6189
});
6290

63-
exec("java -jar node_modules/google-closure-compiler-java/compiler.jar" + parameter + " --js='src/**.js' --js='node_modules/mikado/src/mikado.js' --js_output_file='dist/main.js' && exit 0", function(){
91+
exec("java -jar node_modules/google-closure-compiler-java/compiler.jar" + parameter + " --js='src/*.js' --js='src/template/*.es6.js' --js='node_modules/mikado/src/*.js'" + flag_str + " --js_output_file='dist/main.js' && exit 0", function(){
6492

6593
console.log("Build Complete.");
6694
});

0 commit comments

Comments
 (0)