Merge 37eb7b5 into 3d583e2

forkcms · Aug 4, 2017 · 00a6340 · 00a6340
2 parents 3d583e2 + 37eb7b5
commit 00a6340
Show file tree

Hide file tree

Showing 29 changed files with 9,804 additions and 2,590 deletions.
diff --git a/css/vendors/bootstrap-datepicker3.standalone.min.css b/css/vendors/bootstrap-datepicker3.standalone.min.css
diff --git a/css/vendors/jstree/30px.png b/css/vendors/jstree/30px.png
diff --git a/css/vendors/jstree/32px.png b/css/vendors/jstree/32px.png
diff --git a/css/vendors/jstree/style.css b/css/vendors/jstree/style.css
diff --git a/css/vendors/jstree/throbber.gif b/css/vendors/jstree/throbber.gif
diff --git a/gulpfile.js b/gulpfile.js
@@ -42,6 +42,17 @@ gulp.task("build:backend:assets:copy-fine-uploader-css-and-images", function() {
       .pipe(gulp.dest("./css/vendors/fine-uploader"));
 });
 
+gulp.task("build:backend:assets:copy-jstree-css-and-images", function() {
+    return gulp.src([
+        "node_modules/jstree-bootstrap-theme/dist/themes/proton/style.css",
+        "node_modules/jstree-bootstrap-theme/dist/themes/proton/30px.png",
+        "node_modules/jstree-bootstrap-theme/dist/themes/proton/32px.png",
+        "node_modules/jstree-bootstrap-theme/dist/themes/proton/throbber.gif",
+        "node_modules/jstree-bootstrap-theme/dist/themes/proton/32px.png",
+    ])
+        .pipe(gulp.dest("./css/vendors/jstree"));
+});
+
 gulp.task("build:backend:assets:copy-js-vendors", function() {
   return gulp.src([
     "node_modules/jquery/dist/jquery.min.js",
@@ -53,6 +64,8 @@ gulp.task("build:backend:assets:copy-js-vendors", function() {
     "node_modules/simple-ajax-uploader/SimpleAjaxUploader.min.js",
     "node_modules/bootstrap-datepicker/dist/js/bootstrap-datepicker.min.js",
     "node_modules/cropper/dist/cropper.js",
+    "node_modules/jstree/dist/jstree.js",
+    "node_modules/typeahead.js/dist/typeahead.bundle.min.js",
   ])
       .pipe(gulp.dest("js/vendors"));
 });
@@ -85,6 +98,7 @@ gulp.task("build:backend", function() {
       "build:backend:assets:copy-fonts-vendors",
       "build:backend:assets:copy-js-vendors",
       "build:backend:assets:copy-fine-uploader-css-and-images",
+      "build:backend:assets:copy-jstree-css-and-images",
       "build:backend:sass:generate-css"
   );
 });

diff --git a/js/vendors/bootstrap-datepicker.min.js b/js/vendors/bootstrap-datepicker.min.js