From 66f44e0131ee663c151fdea9ee55b3669e654721 Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Mon, 6 Mar 2017 09:36:30 -0700
Subject: [PATCH] Update Gruntfile to include added JS files, should fix bugs
 with minified JS

---
 Gruntfile.js | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index b68656eeb2..954d7011ed 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -172,13 +172,13 @@ module.exports = function (grunt) {
 						"api/js/etemplate/et2_extension_nextmatch.js",
 						"api/js/etemplate/et2_widget_favorites.js",
 						"api/js/etemplate/et2_widget_html.js",
-						"vendor/egroupware/ckeditor/adapters/jquery.js",
 						"api/js/etemplate/et2_widget_htmlarea.js",
 						"api/js/etemplate/et2_widget_tabs.js",
 						"api/js/etemplate/et2_widget_toolbar.js",
 						"api/js/etemplate/et2_widget_tree.js",
 						"api/js/etemplate/et2_widget_historylog.js",
 						"api/js/etemplate/et2_widget_hrule.js",
+						"vendor/bower-asset/cropper/dist/cropper.min.js",
 						"api/js/etemplate/et2_widget_image.js",
 						"api/js/etemplate/et2_widget_iframe.js",
 						"api/js/Resumable/resumable.js",
@@ -263,6 +263,7 @@ module.exports = function (grunt) {
 				files: {
 					"projectmanager/js/app.min.js": [
 						"projectmanager/js/dhtmlxGantt/codebase/dhtmlxgantt.js",
+						"projectmanager/js/dhtmlxGantt/codebase/ext/dhtmlxgantt_marker.js",
 						"projectmanager/js/et2_widget_gantt.js",
 						"projectmanager/js/app.js"
 					]
@@ -317,10 +318,59 @@ module.exports = function (grunt) {
 						"api/js/dhtmlxtree/codebase/dhtmlxtree.css",
 						"api/js/egw_action/test/skins/dhtmlxmenu_egw.css",
 						"api/js/etemplate/lib/jsdifflib/diffview.css",
+						"vendor/bower-asset/cropper/dist/cropper.min.css",
 						"api/templates/default/etemplate2.css",
 						"pixelegg/mobile/fw_mobile.css",
 						"api/templates/default/print.css",
 						"pixelegg/print.css"
+					],
+					"pixelegg/css/Standard.min.css": [
+						"api/js/jquery/chosen/chosen.css",
+						"vendor/bower-asset/jquery-ui/themes/redmond/jquery-ui.css",
+						"api/js/jquery/magicsuggest/magicsuggest.css",
+						"api/js/jquery/jpicker/css/jPicker-1.1.6.min.css",
+						"api/js/jquery/jquery-ui-timepicker-addon.css",
+						"api/js/jquery/blueimp/css/blueimp-gallery.min.css",
+						"api/js/dhtmlxtree/codebase/dhtmlxtree.css",
+						"api/js/egw_action/test/skins/dhtmlxmenu_egw.css",
+						"api/js/etemplate/lib/jsdifflib/diffview.css",
+						"vendor/bower-asset/cropper/dist/cropper.min.css",
+						"api/templates/default/etemplate2.css",
+						"pixelegg/css/pixelegg.css",
+						"api/templates/default/print.css",
+						"pixelegg/print.css"
+					],
+					"pixelegg/css/Compact.min.css": [
+						"api/js/jquery/chosen/chosen.css",
+						"vendor/bower-asset/jquery-ui/themes/redmond/jquery-ui.css",
+						"api/js/jquery/magicsuggest/magicsuggest.css",
+						"api/js/jquery/jpicker/css/jPicker-1.1.6.min.css",
+						"api/js/jquery/jquery-ui-timepicker-addon.css",
+						"api/js/jquery/blueimp/css/blueimp-gallery.min.css",
+						"api/js/dhtmlxtree/codebase/dhtmlxtree.css",
+						"api/js/egw_action/test/skins/dhtmlxmenu_egw.css",
+						"api/js/etemplate/lib/jsdifflib/diffview.css",
+						"vendor/bower-asset/cropper/dist/cropper.min.css",
+						"api/templates/default/etemplate2.css",
+						"pixelegg/css/pixelegg.css",
+						"api/templates/default/print.css",
+						"pixelegg/print.css"
+					],
+					"pixelegg/css/Traditional.min.css": [
+						"api/js/jquery/chosen/chosen.css",
+						"vendor/bower-asset/jquery-ui/themes/redmond/jquery-ui.css",
+						"api/js/jquery/magicsuggest/magicsuggest.css",
+						"api/js/jquery/jpicker/css/jPicker-1.1.6.min.css",
+						"api/js/jquery/jquery-ui-timepicker-addon.css",
+						"api/js/jquery/blueimp/css/blueimp-gallery.min.css",
+						"api/js/dhtmlxtree/codebase/dhtmlxtree.css",
+						"api/js/egw_action/test/skins/dhtmlxmenu_egw.css",
+						"api/js/etemplate/lib/jsdifflib/diffview.css",
+						"vendor/bower-asset/cropper/dist/cropper.min.css",
+						"api/templates/default/etemplate2.css",
+						"pixelegg/css/pixelegg.css",
+						"api/templates/default/print.css",
+						"pixelegg/print.css"
 					]
 				}
 			},