Skip to content

Commit 8f7d261

Browse files
krausestkrausest
committed
Merge branch 'paulfalgout-update-marionette'
2 parents 2a790b4 + fba2704 commit 8f7d261

File tree

15 files changed

+625
-197
lines changed

15 files changed

+625
-197
lines changed

‎marionette-v3.3.1-keyed/src/Main.js‎

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

‎marionette-v3.3.1-keyed/.babelrc‎ renamed to ‎marionette-v3.4.0-domapi-keyed/.babelrc‎

File renamed without changes.

‎marionette-v3.4.0-domapi-keyed/index.html‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8"/>
5+
<title>Marionette-v3.4.0-domapi</title>
6+
<link href="/css/currentStyle.css" rel="stylesheet"/>
7+
</head>
8+
<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>Marionette-v3.4.0 DomApi</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'>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'>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'>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'>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'>Clear</button>
32+
</div>
33+
<div class="col-sm-6 smallpad">
34+
<button type='button' class='btn btn-primary btn-block' id='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">
42+
</tbody>
43+
</table>
44+
<span class="preloadicon glyphicon glyphicon-remove" aria-hidden="true"></span>
45+
</div>
46+
</div>
47+
<script src='dist/main.js'></script>
48+
</body>
49+
</html>

‎marionette-v3.3.1-keyed/package.json‎ renamed to ‎marionette-v3.4.0-domapi-keyed/package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "js-framework-benchmark-marionette",
33
"version": "1.0.0",
4-
"description": "Marionette v3.1.0 demo",
4+
"description": "Marionette v3.4.0 Dom API",
55
"main": "index.js",
66
"scripts": {
77
"build-dev": "webpack -w -d",
@@ -15,9 +15,10 @@
1515
},
1616
"dependencies": {
1717
"backbone": "1.3.3",
18-
"backbone.marionette": "3.3.1",
18+
"backbone.marionette": "3.4.0",
1919
"backbone.radio": "2.0.0",
2020
"jquery": "3.2.1",
21+
"morphdom": "^2.3.3",
2122
"underscore": "1.8.3"
2223
}
2324
}

0 commit comments

Comments
 (0)