ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1562 from emanuelschuetze/chromium-fixes

Browse Source 
Fix JavaScript errors in chromium (Fixed #1530)
This commit is contained in:
Oskar Hahn 2015-06-22 14:12:12 +02:00
commit 3f321051c5
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gulpfile.js
View File

@ -50,7 +50,7 @@ gulp.task('css', function() {
// Catches all font files from all bower components. // Catches all font files from all bower components.
gulp.task('fonts', function() { gulp.task('fonts', function() {
return gulp.src(mainBowerFiles({ return gulp.src(mainBowerFiles({
filter: /\.(eot)|(svg)|(ttf)|(woff)$/ filter: /\.(eot)|(svg)|(ttf)|(woff)|(woff2)$/
})) }))
.pipe(gulp.dest(path.join(output_directory, 'fonts'))); .pipe(gulp.dest(path.join(output_directory, 'fonts')));
}); });

3
openslides/agenda/static/js/agenda/agenda.js
View File

@ -86,7 +86,8 @@ angular.module('OpenSlidesApp.agenda.site', ['OpenSlidesApp.agenda'])
// get a 'flat' (ordered) array of agenda tree to display in table // get a 'flat' (ordered) array of agenda tree to display in table
$scope.flattenedTree = buildTree(tree.data); $scope.flattenedTree = buildTree(tree.data);
function buildTree(tree, level = 0) { function buildTree(tree, level) {
var level = level || 0
var nodes = []; var nodes = [];
var defaultlevel = level; var defaultlevel = level;
_.each(tree, function(node) { _.each(tree, function(node) {