From 002a4d583ea6cc68e76f63e6bc4f3969929f9d51 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Sun, 21 Jun 2015 19:39:36 +0200 Subject: [PATCH] Fix JavaScript errors in chromium. --- gulpfile.js | 2 +- openslides/agenda/static/js/agenda/agenda.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 7a69a1ed4..2c91e09a0 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -50,7 +50,7 @@ gulp.task('css', function() { // Catches all font files from all bower components. gulp.task('fonts', function() { return gulp.src(mainBowerFiles({ - filter: /\.(eot)|(svg)|(ttf)|(woff)$/ + filter: /\.(eot)|(svg)|(ttf)|(woff)|(woff2)$/ })) .pipe(gulp.dest(path.join(output_directory, 'fonts'))); }); diff --git a/openslides/agenda/static/js/agenda/agenda.js b/openslides/agenda/static/js/agenda/agenda.js index 9955ee880..414bbcc84 100644 --- a/openslides/agenda/static/js/agenda/agenda.js +++ b/openslides/agenda/static/js/agenda/agenda.js @@ -86,7 +86,8 @@ angular.module('OpenSlidesApp.agenda.site', ['OpenSlidesApp.agenda']) // get a 'flat' (ordered) array of agenda tree to display in table $scope.flattenedTree = buildTree(tree.data); - function buildTree(tree, level = 0) { + function buildTree(tree, level) { + var level = level || 0 var nodes = []; var defaultlevel = level; _.each(tree, function(node) {