diff --git a/gulp/build.js b/gulp/build.js index fea762d..79bcf23 100644 --- a/gulp/build.js +++ b/gulp/build.js @@ -78,14 +78,15 @@ gulp.task('fonts', function () { .pipe(gulp.dest(path.join(conf.paths.dist, '/fonts/'))); }); -gulp.task('other', function () { +gulp.task('other', ['copyVendorImages'], function () { var fileFilter = $.filter(function (file) { return file.stat.isFile(); }); return gulp.src([ path.join(conf.paths.src, '/**/*'), - path.join('!' + conf.paths.src, '/**/*.{html,css,js,scss,md}') + path.join('!' + conf.paths.src, '/**/*.{html,css,js,scss,md}'), + path.join(conf.paths.tmp, '/serve/**/assets/img/theme/vendor/**/*') ]) .pipe(fileFilter) .pipe(gulp.dest(path.join(conf.paths.dist, '/'))); diff --git a/gulp/images.js b/gulp/images.js index a1c2280..3b7ba97 100644 --- a/gulp/images.js +++ b/gulp/images.js @@ -4,12 +4,15 @@ var path = require('path'); var gulp = require('gulp'); var conf = require('./conf'); -gulp.task('copyVendorImages',function () { - return gulp.src([ - path.join(conf.wiredep.directory, '**/ammap/dist/ammap/images/**/*'), - path.join(conf.wiredep.directory, '**/amcharts/dist/amcharts/images/**/*'), - path.join(conf.wiredep.directory, '**/ionrangeslider/img/**/*') - ]) - .pipe(gulp.dest(path.join(conf.paths.dist, '/assets/img/theme/vendor'))); +gulp.task('copyVendorImages', function () { + return gulp + .src([ + path.join(conf.wiredep.directory, '**/ammap/dist/ammap/images/**/*'), + path.join(conf.wiredep.directory, '**/amcharts/dist/amcharts/images/**/*'), + path.join(conf.wiredep.directory, '**/ionrangeslider/img/**/*'), + path.join(conf.wiredep.directory, '**/jstree/dist/themes/**/*'), + path.join(conf.wiredep.directory, '**/leaflet/dist/images/**/*') + ]) + .pipe(gulp.dest(path.join(conf.paths.tmp, 'serve', '/assets/img/theme/vendor'))); }); diff --git a/src/app/theme/theme.run.js b/src/app/theme/theme.run.js index 67dfb62..54fe26e 100644 --- a/src/app/theme/theme.run.js +++ b/src/app/theme/theme.run.js @@ -23,6 +23,9 @@ editableOptions.theme = 'bs3'; editableThemes['bs3'].submitTpl = ''; editableThemes['bs3'].cancelTpl = ''; + + $.jstree.defaults.core.themes.url = true; + $.jstree.defaults.core.themes.dir = "assets/img/theme/vendor/jstree/dist/themes"; } })(); \ No newline at end of file