Merge pull request #1562 from emanuelschuetze/chromium-fixes
Fix JavaScript errors in chromium (Fixed #1530)
This commit is contained in:
commit
3f321051c5
@ -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')));
|
||||
});
|
||||
|
@ -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) {
|
||||
|
Loading…
Reference in New Issue
Block a user