Skip to content

Commit 4eccf8d

Browse files
committed
Merge branch 'paulfalgout-update-marionette'
2 parents fa7aa43 + 9f58f4a commit 4eccf8d

File tree

14 files changed

+11
-20
lines changed

14 files changed

+11
-20
lines changed
File renamed without changes.

marionette-v3.4.0-domapi-keyed/index.html renamed to marionette-v3.4.2-domapi-keyed/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en">
33
<head>
44
<meta charset="utf-8"/>
5-
<title>Marionette-v3.4.0-domapi</title>
5+
<title>Marionette-v3.4.2-domapi</title>
66
<link href="/css/currentStyle.css" rel="stylesheet"/>
77
</head>
88
<body>
@@ -11,7 +11,7 @@
1111
<div class="jumbotron">
1212
<div class="row">
1313
<div class="col-md-6">
14-
<h1>Marionette-v3.4.0 DomApi</h1>
14+
<h1>Marionette-v3.4.2 DomApi</h1>
1515
</div>
1616
<div class="col-md-6">
1717
<div class="row">

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

Lines changed: 2 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.4.0 Dom API",
4+
"description": "Marionette v3.4.2 Dom API",
55
"main": "index.js",
66
"scripts": {
77
"build-dev": "webpack -w -d",
@@ -15,7 +15,7 @@
1515
},
1616
"dependencies": {
1717
"backbone": "1.3.3",
18-
"backbone.marionette": "3.4.0",
18+
"backbone.marionette": "3.4.2",
1919
"backbone.radio": "2.0.0",
2020
"jquery": "3.2.1",
2121
"morphdom": "^2.3.3",

marionette-v3.4.0-domapi-keyed/src/Main.js renamed to marionette-v3.4.2-domapi-keyed/src/Main.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,9 @@ var startMeasure = function(name) {
1818
var stopMeasure = function() {
1919
var last = lastMeasure;
2020
if (lastMeasure) {
21-
// console.profileEnd(lastMeasure);
2221
window.setTimeout(function () {
2322
lastMeasure = null;
2423
var stop = performance.now();
25-
var duration = 0;
2624
console.log(last+" took "+(stop-startTime));
2725
}, 0);
2826
}
@@ -104,6 +102,7 @@ const Store = Bb.Collection.extend({
104102
const store = new Store();
105103

106104
const ChildView = Mn.View.extend({
105+
el: document.createElement('div'),
107106
monitorViewEvents: false,
108107
template: rowTemplate
109108
});
@@ -175,10 +174,6 @@ const CollectionView = Mn.NextCollectionView.extend({
175174
}
176175
const curSelected = this.children.findByModel(selected);
177176
curSelected.$el.removeClass('danger');
178-
},
179-
onBeforeDestroyChildren() {
180-
// Handles bugfix coming in v3.4.1
181-
this.Dom.detachContents(this.el, this.$el);
182177
}
183178
});
184179

File renamed without changes.

marionette-v3.4.0-keyed/index.html renamed to marionette-v3.4.2-keyed/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en">
33
<head>
44
<meta charset="utf-8"/>
5-
<title>Marionette-v3.4.0</title>
5+
<title>Marionette-v3.4.2</title>
66
<link href="/css/currentStyle.css" rel="stylesheet"/>
77
</head>
88
<body>
@@ -11,7 +11,7 @@
1111
<div class="jumbotron">
1212
<div class="row">
1313
<div class="col-md-6">
14-
<h1>Marionette-v3.4.0</h1>
14+
<h1>Marionette-v3.4.2</h1>
1515
</div>
1616
<div class="col-md-6">
1717
<div class="row">

0 commit comments

Comments
 (0)