From 1335ba299f7cfd5ab94436753ca63fe49aa37b99 Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Wed, 3 Apr 2019 19:24:19 +0300 Subject: [PATCH] [#922] Refactored file accessing - All plugin files moved to /assets/ inside the jar - InputStreams, lines and flat string now accessed through Resource interface obtained from PlanFiles - Removed FileUtil - Removed old methods from PlanFiles that returned something that is now accessed via Resource interface. - Implemented a PlanFiles class for Sponge that uses Sponge Asset API for fetching items in the jar. --- .../plan/system/export/HtmlExport.java | 16 +- .../plan/system/file/FileResource.java | 81 + .../plan/system/file/JarResource.java | 88 + .../plan/system/file/PlanFiles.java | 74 +- .../djrapitops/plan/system/file/Resource.java | 61 + .../system/info/server/ServerInfoFile.java | 2 +- .../djrapitops/plan/system/locale/Locale.java | 13 +- .../plan/system/locale/LocaleFileReader.java | 12 +- .../plan/system/locale/LocaleSystem.java | 2 +- .../system/settings/BukkitConfigSystem.java | 2 +- .../system/settings/ProxyConfigSystem.java | 2 +- .../system/settings/theme/ThemeConfig.java | 2 +- .../webserver/response/ByteResponse.java | 2 +- .../webserver/response/FileResponse.java | 2 +- .../response/errors/ErrorResponse.java | 2 +- .../plan/utilities/file/FileUtil.java | 134 -- .../utilities/html/pages/AnalysisPage.java | 2 +- .../plan/utilities/html/pages/DebugPage.java | 4 +- .../utilities/html/pages/InspectPage.java | 2 +- .../utilities/html/pages/NetworkPage.java | 2 +- .../utilities/html/pages/PlayersPage.java | 2 +- .../{ => assets}/DefaultServerInfoFile.yml | 0 .../resources/{ => assets}/bungeeconfig.yml | 0 .../main/resources/{ => assets}/config.yml | 0 .../{ => assets}/locale/locale_CN.txt | 0 .../{ => assets}/locale/locale_CZ.txt | 0 .../{ => assets}/locale/locale_DE.txt | 0 .../{ => assets}/locale/locale_EN.txt | 0 .../{ => assets}/locale/locale_FI.txt | 0 .../{ => assets}/locale/locale_FR.txt | 0 .../{ => assets}/locale/locale_FR_old.txt | 0 .../{ => assets}/locale/locale_GA.txt | 0 .../{ => assets}/locale/locale_IT.txt | 0 .../{ => assets}/locale/locale_IT_old.txt | 0 .../{ => assets}/locale/locale_NL.txt | 0 .../{ => assets}/locale/locale_NO.txt | 0 .../{ => assets}/locale/locale_PL.txt | 0 .../{ => assets}/locale/locale_PT.txt | 0 .../{ => assets}/themes/greyscale.yml | 0 .../resources/{ => assets}/themes/mute.yml | 0 .../resources/{ => assets}/themes/pastel.yml | 0 .../resources/{ => assets}/themes/sepia.yml | 0 .../resources/{ => assets}/themes/soft.yml | 0 .../resources/{ => assets}/themes/theme.yml | 0 .../resources/{ => assets}/web/css/main.css | 0 .../{ => assets}/web/css/materialize.css | 0 .../resources/{ => assets}/web/css/style.css | 0 .../{ => assets}/web/css/style.min.css | 0 .../web/css/themes/all-themes.css | 0 .../web/css/themes/all-themes.min.css | 0 .../resources/{ => assets}/web/error.html | 0 .../resources/{ => assets}/web/favicon.ico | Bin .../resources/{ => assets}/web/js/admin.js | 0 .../{ => assets}/web/js/charts/activityPie.js | 0 .../{ => assets}/web/js/charts/diskGraph.js | 0 .../{ => assets}/web/js/charts/healthGauge.js | 0 .../web/js/charts/horizontalBarGraph.js | 0 .../{ => assets}/web/js/charts/lineGraph.js | 0 .../web/js/charts/onlineActivityCalendar.js | 0 .../web/js/charts/performanceGraph.js | 0 .../{ => assets}/web/js/charts/playerGraph.js | 0 .../web/js/charts/playerGraphNoNav.js | 0 .../{ => assets}/web/js/charts/punchCard.js | 0 .../web/js/charts/resourceGraph.js | 0 .../{ => assets}/web/js/charts/serverPie.js | 0 .../web/js/charts/sessionCalendar.js | 0 .../{ => assets}/web/js/charts/stackGraph.js | 0 .../{ => assets}/web/js/charts/tpsGraph.js | 0 .../{ => assets}/web/js/charts/worldGraph.js | 0 .../{ => assets}/web/js/charts/worldMap.js | 0 .../{ => assets}/web/js/charts/worldPie.js | 0 .../resources/{ => assets}/web/js/demo.js | 0 .../resources/{ => assets}/web/js/helpers.js | 0 .../resources/{ => assets}/web/js/script.js | 0 .../resources/{ => assets}/web/network.html | 0 .../resources/{ => assets}/web/player.html | 0 .../resources/{ => assets}/web/players.html | 0 .../web/plugins/animate-css/animate.css | 0 .../web/plugins/animate-css/animate.min.css | 0 .../web/plugins/autosize/autosize.js | 0 .../web/plugins/autosize/autosize.min.js | 0 .../css/bootstrap-colorpicker.css | 0 .../css/bootstrap-colorpicker.css.map | 0 .../css/bootstrap-colorpicker.min.css | 0 .../css/bootstrap-colorpicker.min.css.map | 0 .../alpha-horizontal.png | Bin .../img/bootstrap-colorpicker/alpha.png | Bin .../bootstrap-colorpicker/hue-horizontal.png | Bin .../img/bootstrap-colorpicker/hue.png | Bin .../img/bootstrap-colorpicker/saturation.png | Bin .../js/bootstrap-colorpicker.js | 0 .../js/bootstrap-colorpicker.min.js | 0 .../css/bootstrap-material-datetimepicker.css | 0 .../font/Material-Design-Icons.eot | Bin .../font/Material-Design-Icons.svg | 0 .../font/Material-Design-Icons.ttf | Bin .../font/Material-Design-Icons.woff | Bin .../font/Material-Design-Icons.woff2 | Bin .../js/bootstrap-material-datetimepicker.js | 10 +- .../bootstrap-notify/bootstrap-notify.js | 13 +- .../bootstrap-notify/bootstrap-notify.min.js | 0 .../bootstrap-select/css/bootstrap-select.css | 0 .../css/bootstrap-select.css.map | 0 .../css/bootstrap-select.min.css | 0 .../bootstrap-select/js/bootstrap-select.js | 0 .../js/bootstrap-select.js.map | 0 .../js/bootstrap-select.min.js | 0 .../bootstrap-tagsinput-angular.js | 0 .../bootstrap-tagsinput-angular.min.js | 0 .../bootstrap-tagsinput-typeahead.css | 0 .../bootstrap-tagsinput.css | 0 .../bootstrap-tagsinput.js | 0 .../bootstrap-tagsinput.min.js | 0 .../plugins/bootstrap/css/bootstrap-theme.css | 0 .../bootstrap/css/bootstrap-theme.min.css | 0 .../web/plugins/bootstrap/css/bootstrap.css | 0 .../plugins/bootstrap/css/bootstrap.min.css | 0 .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../fonts/glyphicons-halflings-regular.woff2 | Bin .../web/plugins/bootstrap/js/bootstrap.js | 1446 ++++++++--------- .../web/plugins/bootstrap/js/bootstrap.min.js | 0 .../assets/web/plugins/bootstrap/js/npm.js | 13 + .../plugins/fullcalendar/fullcalendar.min.css | 0 .../plugins/fullcalendar/fullcalendar.min.js | 0 .../plugins/jquery-cookie/jquery.cookie.js | 0 .../plugins/jquery-countto/jquery.countTo.js | 0 .../jquery-datatable/jquery.dataTables.js | 0 .../bootstrap/css/dataTables.bootstrap.css | 0 .../css/dataTables.bootstrap.min.css | 0 .../skin/bootstrap/images/Sorting icons.psd | Bin .../skin/bootstrap/images/favicon.ico | Bin .../skin/bootstrap/images/sort_asc.png | Bin .../bootstrap/images/sort_asc_disabled.png | Bin .../skin/bootstrap/images/sort_both.png | Bin .../skin/bootstrap/images/sort_desc.png | Bin .../bootstrap/images/sort_desc_disabled.png | Bin .../skin/bootstrap/js/dataTables.bootstrap.js | 0 .../bootstrap/js/dataTables.bootstrap.min.js | 0 .../inputmask/inputmask.date.extensions.js | 0 .../inputmask.dependencyLib.jquery.js | 0 .../inputmask/inputmask.extensions.js | 0 .../jquery-inputmask/inputmask/inputmask.js | 0 .../inputmask/inputmask.numeric.extensions.js | 0 .../inputmask/inputmask.phone.extensions.js | 0 .../inputmask/inputmask.regex.extensions.js | 0 .../inputmask/jquery.inputmask.js | 0 .../jquery.inputmask.bundle.js | 0 .../plugins/jquery-knob/jquery.knob.min.js | 0 .../jquery-slimscroll/jquery.slimscroll.js | 0 .../jquery-spinner/css/bootstrap-spinner.css | 0 .../css/bootstrap-spinner.css.map | 0 .../css/bootstrap-spinner.min.css | 0 .../jquery-spinner/js/jquery.spinner.js | 0 .../jquery-spinner/js/jquery.spinner.min.js | 0 .../web/plugins/jquery-steps/jquery.steps.css | 0 .../web/plugins/jquery-steps/jquery.steps.js | 0 .../plugins/jquery-steps/jquery.steps.min.js | 0 .../{ => assets}/web/plugins/jquery/jquery.js | 0 .../web/plugins/jquery/jquery.min.js | 0 .../web/plugins/jquery/jquery.min.map | 0 .../css/material-design-iconic-font.css | 0 .../css/material-design-iconic-font.min.css | 0 .../fonts/Material-Design-Iconic-Font.eot | Bin .../fonts/Material-Design-Iconic-Font.svg | 0 .../fonts/Material-Design-Iconic-Font.ttf | Bin .../fonts/Material-Design-Iconic-Font.woff | Bin .../fonts/Material-Design-Iconic-Font.woff2 | Bin .../materialize-css/css/materialize.css | 0 .../materialize-css/css/materialize.min.css | 0 .../plugins/materialize-css/js/materialize.js | 0 .../materialize-css/js/materialize.min.js | 0 .../assets/web/plugins/momentjs/ender.js | 1 + .../web/plugins/momentjs/moment.js | 0 .../web/plugins/momentjs/package.js | 0 .../plugins/multi-select/css/multi-select.css | 0 .../web/plugins/multi-select/img/switch.png | Bin .../multi-select/js/jquery.multi-select.js | 2 +- .../web/plugins/nestable/jquery-nestable.css | 0 .../web/plugins/nestable/jquery.nestable.js | 0 .../web/plugins/node-waves/waves.css | 0 .../web/plugins/node-waves/waves.js | 0 .../web/plugins/node-waves/waves.min.css | 0 .../web/plugins/node-waves/waves.min.js | 0 .../web/plugins/node-waves/waves.min.js.map | 0 .../web/plugins/nouislider/nouislider.js | 2 +- .../web/plugins/nouislider/nouislider.min.css | 0 .../web/plugins/nouislider/nouislider.min.js | 0 .../{ => assets}/web/plugins/waitme/img.svg | 0 .../web/plugins/waitme/waitMe.css | 0 .../{ => assets}/web/plugins/waitme/waitMe.js | 0 .../web/plugins/waitme/waitMe.min.css | 0 .../web/plugins/waitme/waitMe.min.js | 0 .../resources/{ => assets}/web/server.html | 0 .../resources/web/plugins/bootstrap/js/npm.js | 13 - .../resources/web/plugins/momentjs/ender.js | 1 - .../system/locale/LocaleFileWriterTest.java | 5 +- .../system/settings/ConfigSettingKeyTest.java | 2 +- .../settings/changes/ConfigUpdaterTest.java | 4 +- .../settings/config/ConfigWriterTest.java | 20 +- .../src/test/java/utilities/mocks/Mocker.java | 4 +- .../sponge/SpongeSuperClassBindingModule.java | 5 + .../plan/system/file/SpongeAssetResource.java | 71 + .../plan/system/file/SpongePlanFiles.java | 30 + 206 files changed, 1173 insertions(+), 976 deletions(-) create mode 100644 Plan/common/src/main/java/com/djrapitops/plan/system/file/FileResource.java create mode 100644 Plan/common/src/main/java/com/djrapitops/plan/system/file/JarResource.java create mode 100644 Plan/common/src/main/java/com/djrapitops/plan/system/file/Resource.java delete mode 100644 Plan/common/src/main/java/com/djrapitops/plan/utilities/file/FileUtil.java rename Plan/common/src/main/resources/{ => assets}/DefaultServerInfoFile.yml (100%) rename Plan/common/src/main/resources/{ => assets}/bungeeconfig.yml (100%) rename Plan/common/src/main/resources/{ => assets}/config.yml (100%) rename Plan/common/src/main/resources/{ => assets}/locale/locale_CN.txt (100%) rename Plan/common/src/main/resources/{ => assets}/locale/locale_CZ.txt (100%) rename Plan/common/src/main/resources/{ => assets}/locale/locale_DE.txt (100%) rename Plan/common/src/main/resources/{ => assets}/locale/locale_EN.txt (100%) rename Plan/common/src/main/resources/{ => assets}/locale/locale_FI.txt (100%) rename Plan/common/src/main/resources/{ => assets}/locale/locale_FR.txt (100%) rename Plan/common/src/main/resources/{ => assets}/locale/locale_FR_old.txt (100%) rename Plan/common/src/main/resources/{ => assets}/locale/locale_GA.txt (100%) rename Plan/common/src/main/resources/{ => assets}/locale/locale_IT.txt (100%) rename Plan/common/src/main/resources/{ => assets}/locale/locale_IT_old.txt (100%) rename Plan/common/src/main/resources/{ => assets}/locale/locale_NL.txt (100%) rename Plan/common/src/main/resources/{ => assets}/locale/locale_NO.txt (100%) rename Plan/common/src/main/resources/{ => assets}/locale/locale_PL.txt (100%) rename Plan/common/src/main/resources/{ => assets}/locale/locale_PT.txt (100%) rename Plan/common/src/main/resources/{ => assets}/themes/greyscale.yml (100%) rename Plan/common/src/main/resources/{ => assets}/themes/mute.yml (100%) rename Plan/common/src/main/resources/{ => assets}/themes/pastel.yml (100%) rename Plan/common/src/main/resources/{ => assets}/themes/sepia.yml (100%) rename Plan/common/src/main/resources/{ => assets}/themes/soft.yml (100%) rename Plan/common/src/main/resources/{ => assets}/themes/theme.yml (100%) rename Plan/common/src/main/resources/{ => assets}/web/css/main.css (100%) rename Plan/common/src/main/resources/{ => assets}/web/css/materialize.css (100%) rename Plan/common/src/main/resources/{ => assets}/web/css/style.css (100%) rename Plan/common/src/main/resources/{ => assets}/web/css/style.min.css (100%) rename Plan/common/src/main/resources/{ => assets}/web/css/themes/all-themes.css (100%) rename Plan/common/src/main/resources/{ => assets}/web/css/themes/all-themes.min.css (100%) rename Plan/common/src/main/resources/{ => assets}/web/error.html (100%) rename Plan/common/src/main/resources/{ => assets}/web/favicon.ico (100%) rename Plan/common/src/main/resources/{ => assets}/web/js/admin.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/js/charts/activityPie.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/js/charts/diskGraph.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/js/charts/healthGauge.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/js/charts/horizontalBarGraph.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/js/charts/lineGraph.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/js/charts/onlineActivityCalendar.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/js/charts/performanceGraph.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/js/charts/playerGraph.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/js/charts/playerGraphNoNav.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/js/charts/punchCard.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/js/charts/resourceGraph.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/js/charts/serverPie.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/js/charts/sessionCalendar.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/js/charts/stackGraph.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/js/charts/tpsGraph.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/js/charts/worldGraph.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/js/charts/worldMap.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/js/charts/worldPie.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/js/demo.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/js/helpers.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/js/script.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/network.html (100%) rename Plan/common/src/main/resources/{ => assets}/web/player.html (100%) rename Plan/common/src/main/resources/{ => assets}/web/players.html (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/animate-css/animate.css (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/animate-css/animate.min.css (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/autosize/autosize.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/autosize/autosize.min.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.css (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.css.map (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css.map (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha.png (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/hue.png (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/saturation.png (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap-colorpicker/js/bootstrap-colorpicker.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap-material-datetimepicker/css/bootstrap-material-datetimepicker.css (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.eot (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.svg (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.ttf (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.woff (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.woff2 (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker.js (99%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap-notify/bootstrap-notify.js (99%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap-notify/bootstrap-notify.min.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap-select/css/bootstrap-select.css (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap-select/css/bootstrap-select.css.map (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap-select/css/bootstrap-select.min.css (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap-select/js/bootstrap-select.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap-select/js/bootstrap-select.js.map (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap-select/js/bootstrap-select.min.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput-angular.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput-angular.min.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput-typeahead.css (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput.css (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput.min.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap/css/bootstrap-theme.css (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap/css/bootstrap-theme.min.css (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap/css/bootstrap.css (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap/css/bootstrap.min.css (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.eot (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.svg (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.ttf (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.woff (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.woff2 (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap/js/bootstrap.js (69%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/bootstrap/js/bootstrap.min.js (100%) create mode 100644 Plan/common/src/main/resources/assets/web/plugins/bootstrap/js/npm.js rename Plan/common/src/main/resources/{ => assets}/web/plugins/fullcalendar/fullcalendar.min.css (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/fullcalendar/fullcalendar.min.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/jquery-cookie/jquery.cookie.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/jquery-countto/jquery.countTo.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/jquery-datatable/jquery.dataTables.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/jquery-datatable/skin/bootstrap/css/dataTables.bootstrap.css (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/jquery-datatable/skin/bootstrap/css/dataTables.bootstrap.min.css (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/jquery-datatable/skin/bootstrap/images/Sorting icons.psd (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/jquery-datatable/skin/bootstrap/images/favicon.ico (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/jquery-datatable/skin/bootstrap/images/sort_asc.png (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/jquery-datatable/skin/bootstrap/images/sort_asc_disabled.png (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/jquery-datatable/skin/bootstrap/images/sort_both.png (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/jquery-datatable/skin/bootstrap/images/sort_desc.png (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/jquery-datatable/skin/bootstrap/images/sort_desc_disabled.png (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/jquery-datatable/skin/bootstrap/js/dataTables.bootstrap.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/jquery-datatable/skin/bootstrap/js/dataTables.bootstrap.min.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/jquery-inputmask/inputmask/inputmask.date.extensions.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/jquery-inputmask/inputmask/inputmask.dependencyLib.jquery.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/jquery-inputmask/inputmask/inputmask.extensions.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/jquery-inputmask/inputmask/inputmask.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/jquery-inputmask/inputmask/inputmask.numeric.extensions.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/jquery-inputmask/inputmask/inputmask.phone.extensions.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/jquery-inputmask/inputmask/inputmask.regex.extensions.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/jquery-inputmask/inputmask/jquery.inputmask.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/jquery-inputmask/jquery.inputmask.bundle.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/jquery-knob/jquery.knob.min.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/jquery-slimscroll/jquery.slimscroll.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/jquery-spinner/css/bootstrap-spinner.css (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/jquery-spinner/css/bootstrap-spinner.css.map (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/jquery-spinner/css/bootstrap-spinner.min.css (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/jquery-spinner/js/jquery.spinner.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/jquery-spinner/js/jquery.spinner.min.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/jquery-steps/jquery.steps.css (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/jquery-steps/jquery.steps.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/jquery-steps/jquery.steps.min.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/jquery/jquery.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/jquery/jquery.min.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/jquery/jquery.min.map (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/material-design-iconic-font/css/material-design-iconic-font.css (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/material-design-iconic-font/css/material-design-iconic-font.min.css (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.eot (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.svg (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.ttf (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.woff (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.woff2 (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/materialize-css/css/materialize.css (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/materialize-css/css/materialize.min.css (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/materialize-css/js/materialize.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/materialize-css/js/materialize.min.js (100%) create mode 100644 Plan/common/src/main/resources/assets/web/plugins/momentjs/ender.js rename Plan/common/src/main/resources/{ => assets}/web/plugins/momentjs/moment.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/momentjs/package.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/multi-select/css/multi-select.css (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/multi-select/img/switch.png (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/multi-select/js/jquery.multi-select.js (99%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/nestable/jquery-nestable.css (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/nestable/jquery.nestable.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/node-waves/waves.css (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/node-waves/waves.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/node-waves/waves.min.css (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/node-waves/waves.min.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/node-waves/waves.min.js.map (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/nouislider/nouislider.js (99%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/nouislider/nouislider.min.css (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/nouislider/nouislider.min.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/waitme/img.svg (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/waitme/waitMe.css (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/waitme/waitMe.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/waitme/waitMe.min.css (100%) rename Plan/common/src/main/resources/{ => assets}/web/plugins/waitme/waitMe.min.js (100%) rename Plan/common/src/main/resources/{ => assets}/web/server.html (100%) delete mode 100644 Plan/common/src/main/resources/web/plugins/bootstrap/js/npm.js delete mode 100644 Plan/common/src/main/resources/web/plugins/momentjs/ender.js create mode 100644 Plan/sponge/src/main/java/com/djrapitops/plan/system/file/SpongeAssetResource.java create mode 100644 Plan/sponge/src/main/java/com/djrapitops/plan/system/file/SpongePlanFiles.java diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/export/HtmlExport.java b/Plan/common/src/main/java/com/djrapitops/plan/system/export/HtmlExport.java index 78abc8897..1f6483a08 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/export/HtmlExport.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/export/HtmlExport.java @@ -32,7 +32,6 @@ import com.djrapitops.plan.system.settings.config.PlanConfig; import com.djrapitops.plan.system.settings.paths.ExportSettings; import com.djrapitops.plan.system.settings.theme.Theme; import com.djrapitops.plan.system.settings.theme.ThemeVal; -import com.djrapitops.plan.utilities.file.FileUtil; import com.djrapitops.plan.utilities.html.pages.InspectPage; import com.djrapitops.plan.utilities.html.pages.PageFactory; import com.djrapitops.plugin.api.Check; @@ -217,12 +216,13 @@ public class HtmlExport extends SpecificExport { copyFromJar(resources); try { - String demo = files.readFromResourceFlat("web/js/demo.js") + String demo = files.getCustomizableResourceOrDefault("web/js/demo.js") + .asString() .replace("${defaultTheme}", theme.getValue(ThemeVal.THEME_DEFAULT)); List lines = Arrays.asList(demo.split("\n")); File outputFolder = new File(getFolder(), "js"); Verify.isTrue(outputFolder.exists() && outputFolder.isDirectory() || outputFolder.mkdirs(), - () -> new FileNotFoundException("Output folder could not be created at" + outputFolder.getAbsolutePath())); + () -> new FileNotFoundException("Output folder could not be created at " + outputFolder.getAbsolutePath())); export(new File(outputFolder, "demo.js"), lines); } catch (IOException e) { errorHandler.log(L.WARN, this.getClass(), e); @@ -258,19 +258,21 @@ public class HtmlExport extends SpecificExport { } private void copyFromJar(String resource) throws IOException { - String possibleFile = resource.replace("web/", "").replace("/", File.separator); - List lines = FileUtil.lines(plugin, new File(plugin.getDataFolder(), possibleFile), resource); - String outputFile = possibleFile.replace("web/", ""); - File to = new File(getFolder(), outputFile); + List lines = files.getCustomizableResourceOrDefault(resource).asLines(); + + File to = new File(getFolder(), resource.replace("web/", "").replace("/", File.separator)); File locationFolder = to.getParentFile(); + Verify.isTrue(locationFolder.exists() && locationFolder.isDirectory() || locationFolder.mkdirs(), () -> new FileNotFoundException("Output folder could not be created at" + locationFolder.getAbsolutePath())); + if (to.exists()) { Files.delete(to.toPath()); if (!to.createNewFile()) { return; } } + export(to, lines); } } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/file/FileResource.java b/Plan/common/src/main/java/com/djrapitops/plan/system/file/FileResource.java new file mode 100644 index 000000000..00e239c71 --- /dev/null +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/file/FileResource.java @@ -0,0 +1,81 @@ +/* + * This file is part of Player Analytics (Plan). + * + * Plan is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License v3 as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Plan is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Plan. If not, see . + */ +package com.djrapitops.plan.system.file; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.util.ArrayList; +import java.util.List; +import java.util.Scanner; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +/** + * {@link Resource} implementation for a {@link File}. + * + * @author Rsl1122 + */ +public class FileResource implements Resource { + + private final String resourceName; + private final File file; + + public FileResource(String resourceName, File file) { + this.resourceName = resourceName; + this.file = file; + } + + public static List lines(File file) throws IOException { + List lines = new ArrayList<>(); + if (file != null && file.exists()) { + try (Stream linesStream = Files.lines(file.toPath(), StandardCharsets.UTF_8)) { + lines = linesStream.collect(Collectors.toList()); + } + } + return lines; + } + + @Override + public String getResourceName() { + return resourceName; + } + + @Override + public InputStream asInputStream() throws IOException { + return new FileInputStream(file); + } + + @Override + public List asLines() throws IOException { + return lines(file); + } + + @Override + public String asString() throws IOException { + StringBuilder flat = new StringBuilder(); + try (Scanner scanner = new Scanner(file, "UTF-8")) { + while (scanner.hasNextLine()) { + flat.append(scanner.nextLine()).append("\r\n"); + } + } + return flat.toString(); + } +} \ No newline at end of file diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/file/JarResource.java b/Plan/common/src/main/java/com/djrapitops/plan/system/file/JarResource.java new file mode 100644 index 000000000..406ff6e79 --- /dev/null +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/file/JarResource.java @@ -0,0 +1,88 @@ +/* + * This file is part of Player Analytics (Plan). + * + * Plan is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License v3 as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Plan is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Plan. If not, see . + */ +package com.djrapitops.plan.system.file; + +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; +import java.util.Scanner; + +/** + * {@link Resource} implementation for something that is read via InputStream. + * + * @author Rsl1122 + */ +public class JarResource implements Resource { + + private final String resourceName; + private final StreamSupplier streamSupplier; + + public JarResource(String resourceName, StreamSupplier streamSupplier) { + this.resourceName = resourceName; + this.streamSupplier = streamSupplier; + } + + @Override + public InputStream asInputStream() throws IOException { + InputStream stream = streamSupplier.get(); + if (stream == null) { + throw new FileNotFoundException("a Resource was not found inside the jar (" + resourceName + "), " + + "Plan does not support /reload or updates using " + + "Plugin Managers, restart the server and see if the error persists."); + } + return stream; + } + + @Override + public List asLines() throws IOException { + List lines = new ArrayList<>(); + try ( + InputStream inputStream = asInputStream(); + Scanner scanner = new Scanner(inputStream, "UTF-8") + ) { + while (scanner.hasNextLine()) { + lines.add(scanner.nextLine()); + } + } + return lines; + } + + @Override + public String asString() throws IOException { + StringBuilder flat = new StringBuilder(); + try ( + InputStream inputStream = asInputStream(); + Scanner scanner = new Scanner(inputStream, "UTF-8") + ) { + while (scanner.hasNextLine()) { + flat.append(scanner.nextLine()).append("\r\n"); + } + } + return flat.toString(); + } + + @Override + public String getResourceName() { + return resourceName; + } + + interface StreamSupplier { + InputStream get() throws IOException; + } +} \ No newline at end of file diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/file/PlanFiles.java b/Plan/common/src/main/java/com/djrapitops/plan/system/file/PlanFiles.java index 626ae0dce..f2d561988 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/file/PlanFiles.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/file/PlanFiles.java @@ -19,15 +19,15 @@ package com.djrapitops.plan.system.file; import com.djrapitops.plan.PlanPlugin; import com.djrapitops.plan.api.exceptions.EnableException; import com.djrapitops.plan.system.SubSystem; -import com.djrapitops.plan.utilities.file.FileUtil; import com.djrapitops.plugin.utilities.Verify; import javax.inject.Inject; import javax.inject.Singleton; import java.io.File; import java.io.IOException; -import java.io.InputStream; -import java.util.List; +import java.util.ArrayDeque; +import java.util.Arrays; +import java.util.Optional; /** * Abstracts File methods of Plugin classes so that they can be tested without Mocks. @@ -37,7 +37,7 @@ import java.util.List; @Singleton public class PlanFiles implements SubSystem { - private final PlanPlugin plugin; + protected final PlanPlugin plugin; private final File dataFolder; private final File configFile; @@ -68,7 +68,7 @@ public class PlanFiles implements SubSystem { } public File getFileFromPluginFolder(String name) { - return new File(dataFolder, name); + return new File(dataFolder, name.replace("/", File.separator)); } @Override @@ -89,53 +89,53 @@ public class PlanFiles implements SubSystem { } /** - * Read a file from jar as lines. + * Get a file in the jar as a {@link Resource}. * - * @param fileName Name of the file. - * @return lines of the file - * @throws IOException If the resource can not be read. + * @param resourceName Path to the file inside jar/assets/ folder. + * @return a {@link Resource} for accessing the resource. */ - public List readFromResource(String fileName) throws IOException { - return FileUtil.lines(plugin, fileName); - } - - public InputStream readStreamFromResource(String fileName) throws IOException { - return plugin.getResource(fileName); + public Resource getResourceFromJar(String resourceName) { + return new JarResource("assets/" + resourceName, () -> plugin.getResource("assets/" + resourceName)); } /** - * Read a file from jar as a flat String. + * Get a file from plugin folder as a {@link Resource}. * - * @param fileName Name of the file - * @return Flattened lines with {@code \r\n} line separators. - * @throws IOException If the resource can not be read. + * @param resourceName Path to the file inside the plugin folder. + * @return a {@link Resource} for accessing the resource. */ - public String readFromResourceFlat(String fileName) throws IOException { - return flatten(readFromResource(fileName)); + public Resource getResourceFromPluginFolder(String resourceName) { + return new FileResource(resourceName, getFileFromPluginFolder(resourceName)); } /** - * Read a file from jar or /plugins/Plan/ folder. + * Get a customizable resource from the plugin files or from the jar if one doesn't exist. * - * @param fileName Name of the file - * @return Flattened lines with {@code \r\n} line separators. - * @throws IOException If the resource can not be read. + * @param resourceName Path to the file inside the plugin folder. + * @return a {@link Resource} for accessing the resource, either from the plugin folder or jar. */ - public String readCustomizableResourceFlat(String fileName) throws IOException { - return flatten(FileUtil.lines( - plugin, new File(plugin.getDataFolder(), fileName.replace("/", File.separator)), fileName - )); + public Resource getCustomizableResourceOrDefault(String resourceName) { + return attemptToFind(resourceName).map(file -> (Resource) new FileResource(resourceName, file)).orElse(getResourceFromJar(resourceName)); } - public InputStream readCustomizableResource(String fileName) { - return FileUtil.stream(plugin, new File(plugin.getDataFolder(), fileName.replace("/", File.separator)), fileName); - } + private Optional attemptToFind(String resourceName) { + if (dataFolder.exists() && dataFolder.isDirectory()) { + ArrayDeque que = new ArrayDeque<>(); + que.add(dataFolder); - private String flatten(List lines) { - StringBuilder flat = new StringBuilder(); - for (String line : lines) { - flat.append(line).append("\r\n"); + while (!que.isEmpty()) { + File file = que.pop(); + if (file.isFile() && resourceName.equals(file.getName())) { + return Optional.of(file); + } + if (file.isDirectory()) { + File[] files = file.listFiles(); + if (files != null) { + que.addAll(Arrays.asList(files)); + } + } + } } - return flat.toString(); + return Optional.empty(); } } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/file/Resource.java b/Plan/common/src/main/java/com/djrapitops/plan/system/file/Resource.java new file mode 100644 index 000000000..76f84c14a --- /dev/null +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/file/Resource.java @@ -0,0 +1,61 @@ +/* + * This file is part of Player Analytics (Plan). + * + * Plan is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License v3 as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Plan is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Plan. If not, see . + */ +package com.djrapitops.plan.system.file; + +import java.io.IOException; +import java.io.InputStream; +import java.util.List; + +/** + * Interface for accessing plugin resources in jar or plugin files. + * + * @author Rsl1122 + */ +public interface Resource { + + /** + * Get the name of this Resource. + * + * @return Relative file path given to {@link PlanFiles}. + */ + String getResourceName(); + + /** + * Get the resource as an InputStream. + * + * @return InputStream of the resource, not closed automatically. + * @throws IOException If the resource is unavailable. + */ + InputStream asInputStream() throws IOException; + + /** + * Get the resource as lines. + * + * @return Lines of the resource file. + * @throws IOException If the resource is unavailable. + */ + List asLines() throws IOException; + + /** + * Get the resource as a String with each line separated by CRLF newline characters {@code \r\n}. + * + * @return Flat string with each line separated by {@code \r\n}. + * @throws IOException If the resource is unavailable. + */ + String asString() throws IOException; + +} \ No newline at end of file diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/info/server/ServerInfoFile.java b/Plan/common/src/main/java/com/djrapitops/plan/system/info/server/ServerInfoFile.java index ca74b14b6..2018b23e2 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/info/server/ServerInfoFile.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/info/server/ServerInfoFile.java @@ -45,7 +45,7 @@ public class ServerInfoFile extends Config { } public void prepare() throws IOException { - try (ConfigReader reader = new ConfigReader(files.readStreamFromResource("DefaultServerInfoFile.yml"))) { + try (ConfigReader reader = new ConfigReader(files.getResourceFromJar("DefaultServerInfoFile.yml").asInputStream())) { copyMissing(reader.read()); } save(); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/locale/Locale.java b/Plan/common/src/main/java/com/djrapitops/plan/system/locale/Locale.java index 64a8df5b2..bed27d08e 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/locale/Locale.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/locale/Locale.java @@ -16,7 +16,8 @@ */ package com.djrapitops.plan.system.locale; -import com.djrapitops.plan.PlanPlugin; +import com.djrapitops.plan.system.file.FileResource; +import com.djrapitops.plan.system.file.PlanFiles; import com.djrapitops.plan.system.locale.lang.*; import java.io.File; @@ -36,16 +37,16 @@ import java.util.stream.Collectors; */ public class Locale extends HashMap { - public static Locale forLangCodeString(PlanPlugin plugin, String code) throws IOException { - return forLangCode(LangCode.fromString(code), plugin); + public static Locale forLangCodeString(PlanFiles files, String code) throws IOException { + return forLangCode(LangCode.fromString(code), files); } - public static Locale forLangCode(LangCode code, PlanPlugin plugin) throws IOException { - return new LocaleFileReader(plugin, code.getFileName()).load(); + public static Locale forLangCode(LangCode code, PlanFiles files) throws IOException { + return new LocaleFileReader(files.getResourceFromJar("locale/" + code.getFileName())).load(); } public static Locale fromFile(File file) throws IOException { - return new LocaleFileReader(file).load(); + return new LocaleFileReader(new FileResource(file.getName(), file)).load(); } @Override diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/locale/LocaleFileReader.java b/Plan/common/src/main/java/com/djrapitops/plan/system/locale/LocaleFileReader.java index d6374cb8b..82a0e394f 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/locale/LocaleFileReader.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/locale/LocaleFileReader.java @@ -16,11 +16,9 @@ */ package com.djrapitops.plan.system.locale; -import com.djrapitops.plan.PlanPlugin; +import com.djrapitops.plan.system.file.Resource; import com.djrapitops.plan.system.locale.lang.Lang; -import com.djrapitops.plan.utilities.file.FileUtil; -import java.io.File; import java.io.IOException; import java.util.List; import java.util.Map; @@ -34,12 +32,8 @@ public class LocaleFileReader { private List lines; - public LocaleFileReader(File from) throws IOException { - lines = FileUtil.lines(from); - } - - public LocaleFileReader(PlanPlugin planPlugin, String fileName) throws IOException { - lines = FileUtil.lines(planPlugin, "locale/" + fileName); + public LocaleFileReader(Resource resource) throws IOException { + lines = resource.asLines(); } public Locale load() { diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/locale/LocaleSystem.java b/Plan/common/src/main/java/com/djrapitops/plan/system/locale/LocaleSystem.java index 075b74825..bf8c161b7 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/locale/LocaleSystem.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/locale/LocaleSystem.java @@ -132,7 +132,7 @@ public class LocaleSystem implements SubSystem { try { String setting = config.get(PluginSettings.LOCALE); if (!"default".equalsIgnoreCase(setting)) { - return Optional.of(Locale.forLangCodeString(plugin, setting)); + return Optional.of(Locale.forLangCodeString(files, setting)); } } catch (IOException e) { logger.warn("Failed to read locale from jar: " + config.get(PluginSettings.LOCALE) + ", " + e.toString()); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/settings/BukkitConfigSystem.java b/Plan/common/src/main/java/com/djrapitops/plan/system/settings/BukkitConfigSystem.java index 0e5cd2dad..6cc19dc24 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/settings/BukkitConfigSystem.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/settings/BukkitConfigSystem.java @@ -76,7 +76,7 @@ public class BukkitConfigSystem extends ConfigSystem { @Override protected void copyDefaults() throws IOException { configUpdater.applyConfigUpdate(config); - try (ConfigReader reader = new ConfigReader(files.readStreamFromResource("config.yml"))) { + try (ConfigReader reader = new ConfigReader(files.getResourceFromJar("config.yml").asInputStream())) { config.copyMissing(reader.read()); } } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/settings/ProxyConfigSystem.java b/Plan/common/src/main/java/com/djrapitops/plan/system/settings/ProxyConfigSystem.java index 52fb7db58..ef4369e10 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/settings/ProxyConfigSystem.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/settings/ProxyConfigSystem.java @@ -73,7 +73,7 @@ public class ProxyConfigSystem extends ConfigSystem { @Override protected void copyDefaults() throws IOException { configUpdater.applyConfigUpdate(config); - try (ConfigReader reader = new ConfigReader(files.readStreamFromResource("bungeeconfig.yml"))) { + try (ConfigReader reader = new ConfigReader(files.getResourceFromJar("bungeeconfig.yml").asInputStream())) { config.copyMissing(reader.read()); } } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/settings/theme/ThemeConfig.java b/Plan/common/src/main/java/com/djrapitops/plan/system/settings/theme/ThemeConfig.java index 4dd3fc0c5..0b7505e27 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/settings/theme/ThemeConfig.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/settings/theme/ThemeConfig.java @@ -54,7 +54,7 @@ public class ThemeConfig extends Config { String fileName = config.get(DisplaySettings.THEME); String fileLocation = getFileLocation(fileName); - try (ConfigReader reader = new ConfigReader(files.readStreamFromResource(fileLocation))) { + try (ConfigReader reader = new ConfigReader(files.getResourceFromJar(fileLocation).asInputStream())) { return reader.read(); } catch (IOException e) { logger.error("Could not find theme " + fileLocation + ". Attempting to use default."); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/webserver/response/ByteResponse.java b/Plan/common/src/main/java/com/djrapitops/plan/system/webserver/response/ByteResponse.java index 9ec7cbbed..547fda430 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/webserver/response/ByteResponse.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/webserver/response/ByteResponse.java @@ -49,7 +49,7 @@ public class ByteResponse extends Response { exchange.sendResponseHeaders(getCode(), 0); try (OutputStream out = exchange.getResponseBody(); - InputStream bis = files.readCustomizableResource(fileName)) { + InputStream bis = files.getCustomizableResourceOrDefault(fileName).asInputStream()) { byte[] buffer = new byte[2048]; int count; while ((count = bis.read(buffer)) != -1) { diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/webserver/response/FileResponse.java b/Plan/common/src/main/java/com/djrapitops/plan/system/webserver/response/FileResponse.java index 4d89aea3a..8362a11ca 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/webserver/response/FileResponse.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/webserver/response/FileResponse.java @@ -32,7 +32,7 @@ public class FileResponse extends Response { public FileResponse(String fileName, PlanFiles files) throws IOException { super.setHeader("HTTP/1.1 200 OK"); - super.setContent(files.readCustomizableResourceFlat(fileName)); + super.setContent(files.getCustomizableResourceOrDefault(fileName).asString()); } public static String format(String fileName) { diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/webserver/response/errors/ErrorResponse.java b/Plan/common/src/main/java/com/djrapitops/plan/system/webserver/response/errors/ErrorResponse.java index 4f8ae47d8..72d12ad5b 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/webserver/response/errors/ErrorResponse.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/webserver/response/errors/ErrorResponse.java @@ -40,7 +40,7 @@ public class ErrorResponse extends PageResponse { public ErrorResponse(VersionCheckSystem versionCheckSystem, PlanFiles files) throws IOException { this.versionCheckSystem = versionCheckSystem; - setContent(files.readCustomizableResourceFlat("web/error.html")); + setContent(files.getCustomizableResourceOrDefault("web/error.html").asString()); } public ErrorResponse(String message) { diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/file/FileUtil.java b/Plan/common/src/main/java/com/djrapitops/plan/utilities/file/FileUtil.java deleted file mode 100644 index dfc96c3ed..000000000 --- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/file/FileUtil.java +++ /dev/null @@ -1,134 +0,0 @@ -/* - * This file is part of Player Analytics (Plan). - * - * Plan is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License v3 as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Plan is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Plan. If not, see . - */ -package com.djrapitops.plan.utilities.file; - -import com.djrapitops.plan.PlanPlugin; -import com.djrapitops.plan.utilities.MiscUtils; -import com.djrapitops.plugin.logging.L; - -import java.io.*; -import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.util.*; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -public class FileUtil { - - private FileUtil() { - throw new IllegalStateException("Utility class"); - } - - public static List lines(PlanPlugin plugin, File savedFile, String defaults) throws IOException { - if (savedFile.exists()) { - return lines(savedFile); - } else { - String fileName = savedFile.getName(); - File found = attemptToFind(fileName, new File(plugin.getDataFolder(), "web")); - if (found != null) { - return lines(found); - } - } - return lines(plugin, defaults); - } - - public static InputStream stream(PlanPlugin plugin, File savedFile, String defaults) { - try { - if (savedFile.exists()) { - return stream(savedFile); - } else { - String fileName = savedFile.getName(); - File found = attemptToFind(fileName, new File(plugin.getDataFolder(), "web")); - if (found != null) { - return stream(found); - } - } - } catch (FileNotFoundException ignore) { - // File was not found, use jar version - } - return stream(plugin, defaults); - } - - private static InputStream stream(PlanPlugin plugin, String resource) { - return plugin.getResource(resource); - } - - private static InputStream stream(File savedFile) throws FileNotFoundException { - return new FileInputStream(savedFile); - } - - /** - * Breadth-First search through the file tree to find the file. - * - * @param fileName Name of the searched file - * @param dataFolder Folder to look from - * @return File if found or null - */ - private static File attemptToFind(String fileName, File dataFolder) { - if (dataFolder.exists() && dataFolder.isDirectory()) { - ArrayDeque que = new ArrayDeque<>(); - que.add(dataFolder); - - while (!que.isEmpty()) { - File file = que.pop(); - if (file.isFile() && fileName.equals(file.getName())) { - return file; - } - if (file.isDirectory()) { - File[] files = file.listFiles(); - if (files != null) { - que.addAll(Arrays.asList(files)); - } - } - } - } - return null; - } - - public static List lines(PlanPlugin plugin, String resource) throws IOException { - List lines = new ArrayList<>(); - Scanner scanner = null; - try (InputStream inputStream = plugin.getResource(resource)) { - scanner = new Scanner(inputStream, "UTF-8"); - while (scanner.hasNextLine()) { - lines.add(scanner.nextLine()); - } - } catch (NullPointerException e) { - plugin.getPluginLogger().log(L.INFO_COLOR, "§ea Resource was not found inside the jar (" + resource + "), Plan does not support /reload or updates using " + - "Plugin Managers, restart the server and see if the error persists."); - throw new FileNotFoundException("File not found inside jar: " + resource); - } finally { - MiscUtils.close(scanner); - } - return lines; - } - - public static List lines(File file) throws IOException { - return lines(file, StandardCharsets.UTF_8); - } - - public static List lines(File file, Charset charset) throws IOException { - List lines = new ArrayList<>(); - if (file != null && file.exists()) { - try (Stream linesStream = Files.lines(file.toPath(), charset)) { - lines = linesStream.collect(Collectors.toList()); - } - } - return lines; - } -} \ No newline at end of file diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/AnalysisPage.java b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/AnalysisPage.java index 95c8c4110..5a4834606 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/AnalysisPage.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/AnalysisPage.java @@ -95,7 +95,7 @@ public class AnalysisPage implements Page { performanceNumbers(placeholderReplacer); try { - return placeholderReplacer.apply(files.readCustomizableResourceFlat("web/server.html")); + return placeholderReplacer.apply(files.getCustomizableResourceOrDefault("web/server.html").asString()); } catch (IOException e) { throw new ParseException(e); } finally { diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/DebugPage.java b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/DebugPage.java index b7c2b2d68..f17a95543 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/DebugPage.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/DebugPage.java @@ -21,13 +21,13 @@ import com.djrapitops.plan.data.store.keys.SessionKeys; import com.djrapitops.plan.data.store.objects.DateHolder; import com.djrapitops.plan.db.Database; import com.djrapitops.plan.system.cache.SessionCache; +import com.djrapitops.plan.system.file.FileResource; import com.djrapitops.plan.system.info.connection.ConnectionLog; import com.djrapitops.plan.system.info.connection.ConnectionSystem; import com.djrapitops.plan.system.info.server.Server; import com.djrapitops.plan.system.info.server.ServerInfo; import com.djrapitops.plan.system.info.server.properties.ServerProperties; import com.djrapitops.plan.system.webserver.cache.ResponseCache; -import com.djrapitops.plan.utilities.file.FileUtil; import com.djrapitops.plan.utilities.formatting.Formatter; import com.djrapitops.plan.utilities.formatting.Formatters; import com.djrapitops.plan.utilities.html.Html; @@ -282,7 +282,7 @@ public class DebugPage implements Page { .flatMap(FolderTimeStampFileLogger::getCurrentFile) .map(file -> { try { - return FileUtil.lines(file); + return FileResource.lines(file); } catch (IOException e) { errorHandler.log(L.WARN, this.getClass(), e); return new ArrayList(); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/InspectPage.java b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/InspectPage.java index a8e9eb6bd..9248d88b8 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/InspectPage.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/InspectPage.java @@ -271,7 +271,7 @@ public class InspectPage implements Page { InspectPagePluginsContent pluginsTab = (InspectPagePluginsContent) ResponseCache.loadResponse(PageId.PLAYER_PLUGINS_TAB.of(playerUUID), InspectPagePluginsContent::new); pluginsTab.addTab(new InspectPagePluginsContent(pluginTabs.getNav(), pluginTabs.getTab())); - return replacer.apply(files.readCustomizableResourceFlat("web/player.html")); + return replacer.apply(files.getCustomizableResourceOrDefault("web/player.html").asString()); } private void sessionsAndPlaytime(PlaceholderReplacer replacer, SessionsMutator sessionsMutator, SessionsMutator daySessionsMutator, SessionsMutator weekSessionsMutator, SessionsMutator monthSessionsMutator) { diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/NetworkPage.java b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/NetworkPage.java index a11851404..d4f557598 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/NetworkPage.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/NetworkPage.java @@ -92,7 +92,7 @@ public class NetworkPage implements Page { placeholderReplacer.put("navPluginsTabs", nav); placeholderReplacer.put("tabsPlugins", tabs); - return placeholderReplacer.apply(files.readCustomizableResourceFlat("web/network.html")); + return placeholderReplacer.apply(files.getCustomizableResourceOrDefault("web/network.html").asString()); } catch (Exception e) { throw new ParseException(e); } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/PlayersPage.java b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/PlayersPage.java index 753619e99..2fdacd054 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/PlayersPage.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/PlayersPage.java @@ -86,7 +86,7 @@ public class PlayersPage implements Page { placeholderReplacer.put("playersTable", tables.playerTableForPlayersPage(playerContainers).parseHtml()); timings.end("Pages", "Players page players table parsing"); - return placeholderReplacer.apply(files.readCustomizableResourceFlat("web/players.html")); + return placeholderReplacer.apply(files.getCustomizableResourceOrDefault("web/players.html").asString()); } catch (Exception e) { throw new ParseException(e); } diff --git a/Plan/common/src/main/resources/DefaultServerInfoFile.yml b/Plan/common/src/main/resources/assets/DefaultServerInfoFile.yml similarity index 100% rename from Plan/common/src/main/resources/DefaultServerInfoFile.yml rename to Plan/common/src/main/resources/assets/DefaultServerInfoFile.yml diff --git a/Plan/common/src/main/resources/bungeeconfig.yml b/Plan/common/src/main/resources/assets/bungeeconfig.yml similarity index 100% rename from Plan/common/src/main/resources/bungeeconfig.yml rename to Plan/common/src/main/resources/assets/bungeeconfig.yml diff --git a/Plan/common/src/main/resources/config.yml b/Plan/common/src/main/resources/assets/config.yml similarity index 100% rename from Plan/common/src/main/resources/config.yml rename to Plan/common/src/main/resources/assets/config.yml diff --git a/Plan/common/src/main/resources/locale/locale_CN.txt b/Plan/common/src/main/resources/assets/locale/locale_CN.txt similarity index 100% rename from Plan/common/src/main/resources/locale/locale_CN.txt rename to Plan/common/src/main/resources/assets/locale/locale_CN.txt diff --git a/Plan/common/src/main/resources/locale/locale_CZ.txt b/Plan/common/src/main/resources/assets/locale/locale_CZ.txt similarity index 100% rename from Plan/common/src/main/resources/locale/locale_CZ.txt rename to Plan/common/src/main/resources/assets/locale/locale_CZ.txt diff --git a/Plan/common/src/main/resources/locale/locale_DE.txt b/Plan/common/src/main/resources/assets/locale/locale_DE.txt similarity index 100% rename from Plan/common/src/main/resources/locale/locale_DE.txt rename to Plan/common/src/main/resources/assets/locale/locale_DE.txt diff --git a/Plan/common/src/main/resources/locale/locale_EN.txt b/Plan/common/src/main/resources/assets/locale/locale_EN.txt similarity index 100% rename from Plan/common/src/main/resources/locale/locale_EN.txt rename to Plan/common/src/main/resources/assets/locale/locale_EN.txt diff --git a/Plan/common/src/main/resources/locale/locale_FI.txt b/Plan/common/src/main/resources/assets/locale/locale_FI.txt similarity index 100% rename from Plan/common/src/main/resources/locale/locale_FI.txt rename to Plan/common/src/main/resources/assets/locale/locale_FI.txt diff --git a/Plan/common/src/main/resources/locale/locale_FR.txt b/Plan/common/src/main/resources/assets/locale/locale_FR.txt similarity index 100% rename from Plan/common/src/main/resources/locale/locale_FR.txt rename to Plan/common/src/main/resources/assets/locale/locale_FR.txt diff --git a/Plan/common/src/main/resources/locale/locale_FR_old.txt b/Plan/common/src/main/resources/assets/locale/locale_FR_old.txt similarity index 100% rename from Plan/common/src/main/resources/locale/locale_FR_old.txt rename to Plan/common/src/main/resources/assets/locale/locale_FR_old.txt diff --git a/Plan/common/src/main/resources/locale/locale_GA.txt b/Plan/common/src/main/resources/assets/locale/locale_GA.txt similarity index 100% rename from Plan/common/src/main/resources/locale/locale_GA.txt rename to Plan/common/src/main/resources/assets/locale/locale_GA.txt diff --git a/Plan/common/src/main/resources/locale/locale_IT.txt b/Plan/common/src/main/resources/assets/locale/locale_IT.txt similarity index 100% rename from Plan/common/src/main/resources/locale/locale_IT.txt rename to Plan/common/src/main/resources/assets/locale/locale_IT.txt diff --git a/Plan/common/src/main/resources/locale/locale_IT_old.txt b/Plan/common/src/main/resources/assets/locale/locale_IT_old.txt similarity index 100% rename from Plan/common/src/main/resources/locale/locale_IT_old.txt rename to Plan/common/src/main/resources/assets/locale/locale_IT_old.txt diff --git a/Plan/common/src/main/resources/locale/locale_NL.txt b/Plan/common/src/main/resources/assets/locale/locale_NL.txt similarity index 100% rename from Plan/common/src/main/resources/locale/locale_NL.txt rename to Plan/common/src/main/resources/assets/locale/locale_NL.txt diff --git a/Plan/common/src/main/resources/locale/locale_NO.txt b/Plan/common/src/main/resources/assets/locale/locale_NO.txt similarity index 100% rename from Plan/common/src/main/resources/locale/locale_NO.txt rename to Plan/common/src/main/resources/assets/locale/locale_NO.txt diff --git a/Plan/common/src/main/resources/locale/locale_PL.txt b/Plan/common/src/main/resources/assets/locale/locale_PL.txt similarity index 100% rename from Plan/common/src/main/resources/locale/locale_PL.txt rename to Plan/common/src/main/resources/assets/locale/locale_PL.txt diff --git a/Plan/common/src/main/resources/locale/locale_PT.txt b/Plan/common/src/main/resources/assets/locale/locale_PT.txt similarity index 100% rename from Plan/common/src/main/resources/locale/locale_PT.txt rename to Plan/common/src/main/resources/assets/locale/locale_PT.txt diff --git a/Plan/common/src/main/resources/themes/greyscale.yml b/Plan/common/src/main/resources/assets/themes/greyscale.yml similarity index 100% rename from Plan/common/src/main/resources/themes/greyscale.yml rename to Plan/common/src/main/resources/assets/themes/greyscale.yml diff --git a/Plan/common/src/main/resources/themes/mute.yml b/Plan/common/src/main/resources/assets/themes/mute.yml similarity index 100% rename from Plan/common/src/main/resources/themes/mute.yml rename to Plan/common/src/main/resources/assets/themes/mute.yml diff --git a/Plan/common/src/main/resources/themes/pastel.yml b/Plan/common/src/main/resources/assets/themes/pastel.yml similarity index 100% rename from Plan/common/src/main/resources/themes/pastel.yml rename to Plan/common/src/main/resources/assets/themes/pastel.yml diff --git a/Plan/common/src/main/resources/themes/sepia.yml b/Plan/common/src/main/resources/assets/themes/sepia.yml similarity index 100% rename from Plan/common/src/main/resources/themes/sepia.yml rename to Plan/common/src/main/resources/assets/themes/sepia.yml diff --git a/Plan/common/src/main/resources/themes/soft.yml b/Plan/common/src/main/resources/assets/themes/soft.yml similarity index 100% rename from Plan/common/src/main/resources/themes/soft.yml rename to Plan/common/src/main/resources/assets/themes/soft.yml diff --git a/Plan/common/src/main/resources/themes/theme.yml b/Plan/common/src/main/resources/assets/themes/theme.yml similarity index 100% rename from Plan/common/src/main/resources/themes/theme.yml rename to Plan/common/src/main/resources/assets/themes/theme.yml diff --git a/Plan/common/src/main/resources/web/css/main.css b/Plan/common/src/main/resources/assets/web/css/main.css similarity index 100% rename from Plan/common/src/main/resources/web/css/main.css rename to Plan/common/src/main/resources/assets/web/css/main.css diff --git a/Plan/common/src/main/resources/web/css/materialize.css b/Plan/common/src/main/resources/assets/web/css/materialize.css similarity index 100% rename from Plan/common/src/main/resources/web/css/materialize.css rename to Plan/common/src/main/resources/assets/web/css/materialize.css diff --git a/Plan/common/src/main/resources/web/css/style.css b/Plan/common/src/main/resources/assets/web/css/style.css similarity index 100% rename from Plan/common/src/main/resources/web/css/style.css rename to Plan/common/src/main/resources/assets/web/css/style.css diff --git a/Plan/common/src/main/resources/web/css/style.min.css b/Plan/common/src/main/resources/assets/web/css/style.min.css similarity index 100% rename from Plan/common/src/main/resources/web/css/style.min.css rename to Plan/common/src/main/resources/assets/web/css/style.min.css diff --git a/Plan/common/src/main/resources/web/css/themes/all-themes.css b/Plan/common/src/main/resources/assets/web/css/themes/all-themes.css similarity index 100% rename from Plan/common/src/main/resources/web/css/themes/all-themes.css rename to Plan/common/src/main/resources/assets/web/css/themes/all-themes.css diff --git a/Plan/common/src/main/resources/web/css/themes/all-themes.min.css b/Plan/common/src/main/resources/assets/web/css/themes/all-themes.min.css similarity index 100% rename from Plan/common/src/main/resources/web/css/themes/all-themes.min.css rename to Plan/common/src/main/resources/assets/web/css/themes/all-themes.min.css diff --git a/Plan/common/src/main/resources/web/error.html b/Plan/common/src/main/resources/assets/web/error.html similarity index 100% rename from Plan/common/src/main/resources/web/error.html rename to Plan/common/src/main/resources/assets/web/error.html diff --git a/Plan/common/src/main/resources/web/favicon.ico b/Plan/common/src/main/resources/assets/web/favicon.ico similarity index 100% rename from Plan/common/src/main/resources/web/favicon.ico rename to Plan/common/src/main/resources/assets/web/favicon.ico diff --git a/Plan/common/src/main/resources/web/js/admin.js b/Plan/common/src/main/resources/assets/web/js/admin.js similarity index 100% rename from Plan/common/src/main/resources/web/js/admin.js rename to Plan/common/src/main/resources/assets/web/js/admin.js diff --git a/Plan/common/src/main/resources/web/js/charts/activityPie.js b/Plan/common/src/main/resources/assets/web/js/charts/activityPie.js similarity index 100% rename from Plan/common/src/main/resources/web/js/charts/activityPie.js rename to Plan/common/src/main/resources/assets/web/js/charts/activityPie.js diff --git a/Plan/common/src/main/resources/web/js/charts/diskGraph.js b/Plan/common/src/main/resources/assets/web/js/charts/diskGraph.js similarity index 100% rename from Plan/common/src/main/resources/web/js/charts/diskGraph.js rename to Plan/common/src/main/resources/assets/web/js/charts/diskGraph.js diff --git a/Plan/common/src/main/resources/web/js/charts/healthGauge.js b/Plan/common/src/main/resources/assets/web/js/charts/healthGauge.js similarity index 100% rename from Plan/common/src/main/resources/web/js/charts/healthGauge.js rename to Plan/common/src/main/resources/assets/web/js/charts/healthGauge.js diff --git a/Plan/common/src/main/resources/web/js/charts/horizontalBarGraph.js b/Plan/common/src/main/resources/assets/web/js/charts/horizontalBarGraph.js similarity index 100% rename from Plan/common/src/main/resources/web/js/charts/horizontalBarGraph.js rename to Plan/common/src/main/resources/assets/web/js/charts/horizontalBarGraph.js diff --git a/Plan/common/src/main/resources/web/js/charts/lineGraph.js b/Plan/common/src/main/resources/assets/web/js/charts/lineGraph.js similarity index 100% rename from Plan/common/src/main/resources/web/js/charts/lineGraph.js rename to Plan/common/src/main/resources/assets/web/js/charts/lineGraph.js diff --git a/Plan/common/src/main/resources/web/js/charts/onlineActivityCalendar.js b/Plan/common/src/main/resources/assets/web/js/charts/onlineActivityCalendar.js similarity index 100% rename from Plan/common/src/main/resources/web/js/charts/onlineActivityCalendar.js rename to Plan/common/src/main/resources/assets/web/js/charts/onlineActivityCalendar.js diff --git a/Plan/common/src/main/resources/web/js/charts/performanceGraph.js b/Plan/common/src/main/resources/assets/web/js/charts/performanceGraph.js similarity index 100% rename from Plan/common/src/main/resources/web/js/charts/performanceGraph.js rename to Plan/common/src/main/resources/assets/web/js/charts/performanceGraph.js diff --git a/Plan/common/src/main/resources/web/js/charts/playerGraph.js b/Plan/common/src/main/resources/assets/web/js/charts/playerGraph.js similarity index 100% rename from Plan/common/src/main/resources/web/js/charts/playerGraph.js rename to Plan/common/src/main/resources/assets/web/js/charts/playerGraph.js diff --git a/Plan/common/src/main/resources/web/js/charts/playerGraphNoNav.js b/Plan/common/src/main/resources/assets/web/js/charts/playerGraphNoNav.js similarity index 100% rename from Plan/common/src/main/resources/web/js/charts/playerGraphNoNav.js rename to Plan/common/src/main/resources/assets/web/js/charts/playerGraphNoNav.js diff --git a/Plan/common/src/main/resources/web/js/charts/punchCard.js b/Plan/common/src/main/resources/assets/web/js/charts/punchCard.js similarity index 100% rename from Plan/common/src/main/resources/web/js/charts/punchCard.js rename to Plan/common/src/main/resources/assets/web/js/charts/punchCard.js diff --git a/Plan/common/src/main/resources/web/js/charts/resourceGraph.js b/Plan/common/src/main/resources/assets/web/js/charts/resourceGraph.js similarity index 100% rename from Plan/common/src/main/resources/web/js/charts/resourceGraph.js rename to Plan/common/src/main/resources/assets/web/js/charts/resourceGraph.js diff --git a/Plan/common/src/main/resources/web/js/charts/serverPie.js b/Plan/common/src/main/resources/assets/web/js/charts/serverPie.js similarity index 100% rename from Plan/common/src/main/resources/web/js/charts/serverPie.js rename to Plan/common/src/main/resources/assets/web/js/charts/serverPie.js diff --git a/Plan/common/src/main/resources/web/js/charts/sessionCalendar.js b/Plan/common/src/main/resources/assets/web/js/charts/sessionCalendar.js similarity index 100% rename from Plan/common/src/main/resources/web/js/charts/sessionCalendar.js rename to Plan/common/src/main/resources/assets/web/js/charts/sessionCalendar.js diff --git a/Plan/common/src/main/resources/web/js/charts/stackGraph.js b/Plan/common/src/main/resources/assets/web/js/charts/stackGraph.js similarity index 100% rename from Plan/common/src/main/resources/web/js/charts/stackGraph.js rename to Plan/common/src/main/resources/assets/web/js/charts/stackGraph.js diff --git a/Plan/common/src/main/resources/web/js/charts/tpsGraph.js b/Plan/common/src/main/resources/assets/web/js/charts/tpsGraph.js similarity index 100% rename from Plan/common/src/main/resources/web/js/charts/tpsGraph.js rename to Plan/common/src/main/resources/assets/web/js/charts/tpsGraph.js diff --git a/Plan/common/src/main/resources/web/js/charts/worldGraph.js b/Plan/common/src/main/resources/assets/web/js/charts/worldGraph.js similarity index 100% rename from Plan/common/src/main/resources/web/js/charts/worldGraph.js rename to Plan/common/src/main/resources/assets/web/js/charts/worldGraph.js diff --git a/Plan/common/src/main/resources/web/js/charts/worldMap.js b/Plan/common/src/main/resources/assets/web/js/charts/worldMap.js similarity index 100% rename from Plan/common/src/main/resources/web/js/charts/worldMap.js rename to Plan/common/src/main/resources/assets/web/js/charts/worldMap.js diff --git a/Plan/common/src/main/resources/web/js/charts/worldPie.js b/Plan/common/src/main/resources/assets/web/js/charts/worldPie.js similarity index 100% rename from Plan/common/src/main/resources/web/js/charts/worldPie.js rename to Plan/common/src/main/resources/assets/web/js/charts/worldPie.js diff --git a/Plan/common/src/main/resources/web/js/demo.js b/Plan/common/src/main/resources/assets/web/js/demo.js similarity index 100% rename from Plan/common/src/main/resources/web/js/demo.js rename to Plan/common/src/main/resources/assets/web/js/demo.js diff --git a/Plan/common/src/main/resources/web/js/helpers.js b/Plan/common/src/main/resources/assets/web/js/helpers.js similarity index 100% rename from Plan/common/src/main/resources/web/js/helpers.js rename to Plan/common/src/main/resources/assets/web/js/helpers.js diff --git a/Plan/common/src/main/resources/web/js/script.js b/Plan/common/src/main/resources/assets/web/js/script.js similarity index 100% rename from Plan/common/src/main/resources/web/js/script.js rename to Plan/common/src/main/resources/assets/web/js/script.js diff --git a/Plan/common/src/main/resources/web/network.html b/Plan/common/src/main/resources/assets/web/network.html similarity index 100% rename from Plan/common/src/main/resources/web/network.html rename to Plan/common/src/main/resources/assets/web/network.html diff --git a/Plan/common/src/main/resources/web/player.html b/Plan/common/src/main/resources/assets/web/player.html similarity index 100% rename from Plan/common/src/main/resources/web/player.html rename to Plan/common/src/main/resources/assets/web/player.html diff --git a/Plan/common/src/main/resources/web/players.html b/Plan/common/src/main/resources/assets/web/players.html similarity index 100% rename from Plan/common/src/main/resources/web/players.html rename to Plan/common/src/main/resources/assets/web/players.html diff --git a/Plan/common/src/main/resources/web/plugins/animate-css/animate.css b/Plan/common/src/main/resources/assets/web/plugins/animate-css/animate.css similarity index 100% rename from Plan/common/src/main/resources/web/plugins/animate-css/animate.css rename to Plan/common/src/main/resources/assets/web/plugins/animate-css/animate.css diff --git a/Plan/common/src/main/resources/web/plugins/animate-css/animate.min.css b/Plan/common/src/main/resources/assets/web/plugins/animate-css/animate.min.css similarity index 100% rename from Plan/common/src/main/resources/web/plugins/animate-css/animate.min.css rename to Plan/common/src/main/resources/assets/web/plugins/animate-css/animate.min.css diff --git a/Plan/common/src/main/resources/web/plugins/autosize/autosize.js b/Plan/common/src/main/resources/assets/web/plugins/autosize/autosize.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/autosize/autosize.js rename to Plan/common/src/main/resources/assets/web/plugins/autosize/autosize.js diff --git a/Plan/common/src/main/resources/web/plugins/autosize/autosize.min.js b/Plan/common/src/main/resources/assets/web/plugins/autosize/autosize.min.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/autosize/autosize.min.js rename to Plan/common/src/main/resources/assets/web/plugins/autosize/autosize.min.js diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.css b/Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.css similarity index 100% rename from Plan/common/src/main/resources/web/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.css rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.css diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.css.map b/Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.css.map similarity index 100% rename from Plan/common/src/main/resources/web/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.css.map rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.css.map diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css b/Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css similarity index 100% rename from Plan/common/src/main/resources/web/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css.map b/Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css.map similarity index 100% rename from Plan/common/src/main/resources/web/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css.map rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css.map diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png b/Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png similarity index 100% rename from Plan/common/src/main/resources/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha.png b/Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha.png similarity index 100% rename from Plan/common/src/main/resources/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha.png rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha.png diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png b/Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png similarity index 100% rename from Plan/common/src/main/resources/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/hue.png b/Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/hue.png similarity index 100% rename from Plan/common/src/main/resources/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/hue.png rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/hue.png diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/saturation.png b/Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/saturation.png similarity index 100% rename from Plan/common/src/main/resources/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/saturation.png rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/saturation.png diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap-colorpicker/js/bootstrap-colorpicker.js b/Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/js/bootstrap-colorpicker.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/bootstrap-colorpicker/js/bootstrap-colorpicker.js rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/js/bootstrap-colorpicker.js diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js b/Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap-material-datetimepicker/css/bootstrap-material-datetimepicker.css b/Plan/common/src/main/resources/assets/web/plugins/bootstrap-material-datetimepicker/css/bootstrap-material-datetimepicker.css similarity index 100% rename from Plan/common/src/main/resources/web/plugins/bootstrap-material-datetimepicker/css/bootstrap-material-datetimepicker.css rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap-material-datetimepicker/css/bootstrap-material-datetimepicker.css diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.eot b/Plan/common/src/main/resources/assets/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.eot similarity index 100% rename from Plan/common/src/main/resources/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.eot rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.eot diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.svg b/Plan/common/src/main/resources/assets/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.svg similarity index 100% rename from Plan/common/src/main/resources/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.svg rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.svg diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.ttf b/Plan/common/src/main/resources/assets/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.ttf similarity index 100% rename from Plan/common/src/main/resources/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.ttf rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.ttf diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.woff b/Plan/common/src/main/resources/assets/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.woff similarity index 100% rename from Plan/common/src/main/resources/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.woff rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.woff diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.woff2 b/Plan/common/src/main/resources/assets/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.woff2 similarity index 100% rename from Plan/common/src/main/resources/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.woff2 rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.woff2 diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker.js b/Plan/common/src/main/resources/assets/web/plugins/bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker.js similarity index 99% rename from Plan/common/src/main/resources/web/plugins/bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker.js rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker.js index 465482c04..c5549a9e3 100644 --- a/Plan/common/src/main/resources/web/plugins/bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker.js +++ b/Plan/common/src/main/resources/assets/web/plugins/bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker.js @@ -374,7 +374,7 @@ svgHourText.addEventListener('click', this._onSelectHour.bind(this)); } - svgClockElement.appendChild(svgHourCircle) + svgClockElement.appendChild(svgHourCircle); svgClockElement.appendChild(svgHourText) } @@ -404,7 +404,7 @@ svgHourText.addEventListener('click', this._onSelectHour.bind(this)); } - svgClockElement.appendChild(svgHourCircle) + svgClockElement.appendChild(svgHourCircle); svgClockElement.appendChild(svgHourText) } @@ -505,7 +505,7 @@ var svgClockFace = this.createSVGElement("circle", {r: '192', fill: '#eee', stroke: '#bdbdbd', 'stroke-width': 2}); var svgClockCenter = this.createSVGElement("circle", {r: '15', fill: '#757575'}); - svgGElement.appendChild(svgClockFace) + svgGElement.appendChild(svgClockFace); if (isHour) { @@ -523,9 +523,9 @@ svgGElement.appendChild(svgMinuteHand); } - svgGElement.appendChild(svgClockCenter) + svgGElement.appendChild(svgClockCenter); - svgElement.appendChild(svgGElement) + svgElement.appendChild(svgGElement); this.$dtpElement.find("#dtp-svg-clock").empty(); this.$dtpElement.find("#dtp-svg-clock")[0].appendChild(svgElement); diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap-notify/bootstrap-notify.js b/Plan/common/src/main/resources/assets/web/plugins/bootstrap-notify/bootstrap-notify.js similarity index 99% rename from Plan/common/src/main/resources/web/plugins/bootstrap-notify/bootstrap-notify.js rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap-notify/bootstrap-notify.js index 0c05636aa..91f9b308c 100644 --- a/Plan/common/src/main/resources/web/plugins/bootstrap-notify/bootstrap-notify.js +++ b/Plan/common/src/main/resources/assets/web/plugins/bootstrap-notify/bootstrap-notify.js @@ -77,7 +77,7 @@ this.animations = { start: 'webkitAnimationStart oanimationstart MSAnimationStart animationstart', end: 'webkitAnimationEnd oanimationend MSAnimationEnd animationend' - } + }; if (typeof this.settings.offset == 'number') { this.settings.offset = { @@ -87,9 +87,8 @@ } this.init(); - }; - - $.extend(Notify.prototype, { + } + $.extend(Notify.prototype, { init: function () { var self = this; @@ -145,8 +144,8 @@ break; default: this.$ele.find('[data-notify="' + command +'"]').html(commands[command]); - }; - } + } + } var posX = this.$ele.outerHeight() + parseInt(self.settings.spacing) + parseInt(self.settings.offset.y); self.reposition(posX); }, @@ -264,7 +263,7 @@ this.$ele.find('[data-notify="dismiss"]').on('click', function() { self.close(); - }) + }); this.$ele.mouseover(function(e) { $(this).data('data-hover', "true"); diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap-notify/bootstrap-notify.min.js b/Plan/common/src/main/resources/assets/web/plugins/bootstrap-notify/bootstrap-notify.min.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/bootstrap-notify/bootstrap-notify.min.js rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap-notify/bootstrap-notify.min.js diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap-select/css/bootstrap-select.css b/Plan/common/src/main/resources/assets/web/plugins/bootstrap-select/css/bootstrap-select.css similarity index 100% rename from Plan/common/src/main/resources/web/plugins/bootstrap-select/css/bootstrap-select.css rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap-select/css/bootstrap-select.css diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap-select/css/bootstrap-select.css.map b/Plan/common/src/main/resources/assets/web/plugins/bootstrap-select/css/bootstrap-select.css.map similarity index 100% rename from Plan/common/src/main/resources/web/plugins/bootstrap-select/css/bootstrap-select.css.map rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap-select/css/bootstrap-select.css.map diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap-select/css/bootstrap-select.min.css b/Plan/common/src/main/resources/assets/web/plugins/bootstrap-select/css/bootstrap-select.min.css similarity index 100% rename from Plan/common/src/main/resources/web/plugins/bootstrap-select/css/bootstrap-select.min.css rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap-select/css/bootstrap-select.min.css diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap-select/js/bootstrap-select.js b/Plan/common/src/main/resources/assets/web/plugins/bootstrap-select/js/bootstrap-select.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/bootstrap-select/js/bootstrap-select.js rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap-select/js/bootstrap-select.js diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap-select/js/bootstrap-select.js.map b/Plan/common/src/main/resources/assets/web/plugins/bootstrap-select/js/bootstrap-select.js.map similarity index 100% rename from Plan/common/src/main/resources/web/plugins/bootstrap-select/js/bootstrap-select.js.map rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap-select/js/bootstrap-select.js.map diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap-select/js/bootstrap-select.min.js b/Plan/common/src/main/resources/assets/web/plugins/bootstrap-select/js/bootstrap-select.min.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/bootstrap-select/js/bootstrap-select.min.js rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap-select/js/bootstrap-select.min.js diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput-angular.js b/Plan/common/src/main/resources/assets/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput-angular.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput-angular.js rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput-angular.js diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput-angular.min.js b/Plan/common/src/main/resources/assets/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput-angular.min.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput-angular.min.js rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput-angular.min.js diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput-typeahead.css b/Plan/common/src/main/resources/assets/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput-typeahead.css similarity index 100% rename from Plan/common/src/main/resources/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput-typeahead.css rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput-typeahead.css diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput.css b/Plan/common/src/main/resources/assets/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput.css similarity index 100% rename from Plan/common/src/main/resources/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput.css rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput.css diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput.js b/Plan/common/src/main/resources/assets/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput.js rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput.js diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput.min.js b/Plan/common/src/main/resources/assets/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput.min.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput.min.js rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput.min.js diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap/css/bootstrap-theme.css b/Plan/common/src/main/resources/assets/web/plugins/bootstrap/css/bootstrap-theme.css similarity index 100% rename from Plan/common/src/main/resources/web/plugins/bootstrap/css/bootstrap-theme.css rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap/css/bootstrap-theme.css diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap/css/bootstrap-theme.min.css b/Plan/common/src/main/resources/assets/web/plugins/bootstrap/css/bootstrap-theme.min.css similarity index 100% rename from Plan/common/src/main/resources/web/plugins/bootstrap/css/bootstrap-theme.min.css rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap/css/bootstrap-theme.min.css diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap/css/bootstrap.css b/Plan/common/src/main/resources/assets/web/plugins/bootstrap/css/bootstrap.css similarity index 100% rename from Plan/common/src/main/resources/web/plugins/bootstrap/css/bootstrap.css rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap/css/bootstrap.css diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap/css/bootstrap.min.css b/Plan/common/src/main/resources/assets/web/plugins/bootstrap/css/bootstrap.min.css similarity index 100% rename from Plan/common/src/main/resources/web/plugins/bootstrap/css/bootstrap.min.css rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap/css/bootstrap.min.css diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.eot b/Plan/common/src/main/resources/assets/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from Plan/common/src/main/resources/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.eot rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.eot diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.svg b/Plan/common/src/main/resources/assets/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from Plan/common/src/main/resources/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.svg rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.svg diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.ttf b/Plan/common/src/main/resources/assets/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from Plan/common/src/main/resources/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.ttf rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.ttf diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.woff b/Plan/common/src/main/resources/assets/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from Plan/common/src/main/resources/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.woff rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.woff diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/Plan/common/src/main/resources/assets/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from Plan/common/src/main/resources/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.woff2 rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.woff2 diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap/js/bootstrap.js b/Plan/common/src/main/resources/assets/web/plugins/bootstrap/js/bootstrap.js similarity index 69% rename from Plan/common/src/main/resources/web/plugins/bootstrap/js/bootstrap.js rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap/js/bootstrap.js index 01fbbcbaa..d98bf6955 100644 --- a/Plan/common/src/main/resources/web/plugins/bootstrap/js/bootstrap.js +++ b/Plan/common/src/main/resources/assets/web/plugins/bootstrap/js/bootstrap.js @@ -10,7 +10,7 @@ if (typeof jQuery === 'undefined') { +function ($) { 'use strict'; - var version = $.fn.jquery.split(' ')[0].split('.') + var version = $.fn.jquery.split(' ')[0].split('.'); if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1) || (version[0] > 2)) { throw new Error('Bootstrap\'s JavaScript requires jQuery version 1.9.1 or higher, but lower than version 3') } @@ -32,14 +32,14 @@ if (typeof jQuery === 'undefined') { // ============================================================ function transitionEnd() { - var el = document.createElement('bootstrap') + var el = document.createElement('bootstrap'); var transEndEventNames = { WebkitTransition : 'webkitTransitionEnd', MozTransition : 'transitionend', OTransition : 'oTransitionEnd otransitionend', transition : 'transitionend' - } + }; for (var name in transEndEventNames) { if (el.style[name] !== undefined) { @@ -52,18 +52,18 @@ if (typeof jQuery === 'undefined') { // http://blog.alexmaccaw.com/css-transitions $.fn.emulateTransitionEnd = function (duration) { - var called = false - var $el = this - $(this).one('bsTransitionEnd', function () { called = true }) - var callback = function () { if (!called) $($el).trigger($.support.transition.end) } - setTimeout(callback, duration) + var called = false; + var $el = this; + $(this).one('bsTransitionEnd', function () { called = true }); + var callback = function () { if (!called) $($el).trigger($.support.transition.end) }; + setTimeout(callback, duration); return this - } + }; $(function () { - $.support.transition = transitionEnd() + $.support.transition = transitionEnd(); - if (!$.support.transition) return + if (!$.support.transition) return; $.event.special.bsTransitionEnd = { bindType: $.support.transition.end, @@ -91,37 +91,37 @@ if (typeof jQuery === 'undefined') { // ALERT CLASS DEFINITION // ====================== - var dismiss = '[data-dismiss="alert"]' + var dismiss = '[data-dismiss="alert"]'; var Alert = function (el) { $(el).on('click', dismiss, this.close) - } + }; - Alert.VERSION = '3.3.6' + Alert.VERSION = '3.3.6'; - Alert.TRANSITION_DURATION = 150 + Alert.TRANSITION_DURATION = 150; Alert.prototype.close = function (e) { - var $this = $(this) - var selector = $this.attr('data-target') + var $this = $(this); + var selector = $this.attr('data-target'); if (!selector) { - selector = $this.attr('href') + selector = $this.attr('href'); selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7 } - var $parent = $(selector) + var $parent = $(selector); - if (e) e.preventDefault() + if (e) e.preventDefault(); if (!$parent.length) { $parent = $this.closest('.alert') } - $parent.trigger(e = $.Event('close.bs.alert')) + $parent.trigger(e = $.Event('close.bs.alert')); - if (e.isDefaultPrevented()) return + if (e.isDefaultPrevented()) return; - $parent.removeClass('in') + $parent.removeClass('in'); function removeElement() { // detach from parent, fire event then clean up data @@ -133,7 +133,7 @@ if (typeof jQuery === 'undefined') { .one('bsTransitionEnd', removeElement) .emulateTransitionEnd(Alert.TRANSITION_DURATION) : removeElement() - } + }; // ALERT PLUGIN DEFINITION @@ -141,27 +141,27 @@ if (typeof jQuery === 'undefined') { function Plugin(option) { return this.each(function () { - var $this = $(this) - var data = $this.data('bs.alert') + var $this = $(this); + var data = $this.data('bs.alert'); - if (!data) $this.data('bs.alert', (data = new Alert(this))) + if (!data) $this.data('bs.alert', (data = new Alert(this))); if (typeof option == 'string') data[option].call($this) }) } - var old = $.fn.alert + var old = $.fn.alert; - $.fn.alert = Plugin - $.fn.alert.Constructor = Alert + $.fn.alert = Plugin; + $.fn.alert.Constructor = Alert; // ALERT NO CONFLICT // ================= $.fn.alert.noConflict = function () { - $.fn.alert = old + $.fn.alert = old; return this - } + }; // ALERT DATA-API @@ -187,62 +187,62 @@ if (typeof jQuery === 'undefined') { // ============================== var Button = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, Button.DEFAULTS, options) + this.$element = $(element); + this.options = $.extend({}, Button.DEFAULTS, options); this.isLoading = false - } + }; - Button.VERSION = '3.3.6' + Button.VERSION = '3.3.6'; Button.DEFAULTS = { loadingText: 'loading...' - } + }; Button.prototype.setState = function (state) { - var d = 'disabled' - var $el = this.$element - var val = $el.is('input') ? 'val' : 'html' - var data = $el.data() + var d = 'disabled'; + var $el = this.$element; + var val = $el.is('input') ? 'val' : 'html'; + var data = $el.data(); - state += 'Text' + state += 'Text'; - if (data.resetText == null) $el.data('resetText', $el[val]()) + if (data.resetText == null) $el.data('resetText', $el[val]()); // push to event loop to allow forms to submit setTimeout($.proxy(function () { - $el[val](data[state] == null ? this.options[state] : data[state]) + $el[val](data[state] == null ? this.options[state] : data[state]); if (state == 'loadingText') { - this.isLoading = true + this.isLoading = true; $el.addClass(d).attr(d, d) } else if (this.isLoading) { - this.isLoading = false + this.isLoading = false; $el.removeClass(d).removeAttr(d) } }, this), 0) - } + }; Button.prototype.toggle = function () { - var changed = true - var $parent = this.$element.closest('[data-toggle="buttons"]') + var changed = true; + var $parent = this.$element.closest('[data-toggle="buttons"]'); if ($parent.length) { - var $input = this.$element.find('input') + var $input = this.$element.find('input'); if ($input.prop('type') == 'radio') { - if ($input.prop('checked')) changed = false - $parent.find('.active').removeClass('active') + if ($input.prop('checked')) changed = false; + $parent.find('.active').removeClass('active'); this.$element.addClass('active') } else if ($input.prop('type') == 'checkbox') { - if (($input.prop('checked')) !== this.$element.hasClass('active')) changed = false + if (($input.prop('checked')) !== this.$element.hasClass('active')) changed = false; this.$element.toggleClass('active') } - $input.prop('checked', this.$element.hasClass('active')) + $input.prop('checked', this.$element.hasClass('active')); if (changed) $input.trigger('change') } else { - this.$element.attr('aria-pressed', !this.$element.hasClass('active')) + this.$element.attr('aria-pressed', !this.$element.hasClass('active')); this.$element.toggleClass('active') } - } + }; // BUTTON PLUGIN DEFINITION @@ -250,30 +250,30 @@ if (typeof jQuery === 'undefined') { function Plugin(option) { return this.each(function () { - var $this = $(this) - var data = $this.data('bs.button') - var options = typeof option == 'object' && option + var $this = $(this); + var data = $this.data('bs.button'); + var options = typeof option == 'object' && option; - if (!data) $this.data('bs.button', (data = new Button(this, options))) + if (!data) $this.data('bs.button', (data = new Button(this, options))); - if (option == 'toggle') data.toggle() + if (option == 'toggle') data.toggle(); else if (option) data.setState(option) }) } - var old = $.fn.button + var old = $.fn.button; - $.fn.button = Plugin - $.fn.button.Constructor = Button + $.fn.button = Plugin; + $.fn.button.Constructor = Button; // BUTTON NO CONFLICT // ================== $.fn.button.noConflict = function () { - $.fn.button = old + $.fn.button = old; return this - } + }; // BUTTON DATA-API @@ -281,9 +281,9 @@ if (typeof jQuery === 'undefined') { $(document) .on('click.bs.button.data-api', '[data-toggle^="button"]', function (e) { - var $btn = $(e.target) - if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn') - Plugin.call($btn, 'toggle') + var $btn = $(e.target); + if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn'); + Plugin.call($btn, 'toggle'); if (!($(e.target).is('input[type="radio"]') || $(e.target).is('input[type="checkbox"]'))) e.preventDefault() }) .on('focus.bs.button.data-api blur.bs.button.data-api', '[data-toggle^="button"]', function (e) { @@ -308,160 +308,160 @@ if (typeof jQuery === 'undefined') { // ========================= var Carousel = function (element, options) { - this.$element = $(element) - this.$indicators = this.$element.find('.carousel-indicators') - this.options = options - this.paused = null - this.sliding = null - this.interval = null - this.$active = null - this.$items = null + this.$element = $(element); + this.$indicators = this.$element.find('.carousel-indicators'); + this.options = options; + this.paused = null; + this.sliding = null; + this.interval = null; + this.$active = null; + this.$items = null; - this.options.keyboard && this.$element.on('keydown.bs.carousel', $.proxy(this.keydown, this)) + this.options.keyboard && this.$element.on('keydown.bs.carousel', $.proxy(this.keydown, this)); this.options.pause == 'hover' && !('ontouchstart' in document.documentElement) && this.$element .on('mouseenter.bs.carousel', $.proxy(this.pause, this)) .on('mouseleave.bs.carousel', $.proxy(this.cycle, this)) - } + }; - Carousel.VERSION = '3.3.6' + Carousel.VERSION = '3.3.6'; - Carousel.TRANSITION_DURATION = 600 + Carousel.TRANSITION_DURATION = 600; Carousel.DEFAULTS = { interval: 5000, pause: 'hover', wrap: true, keyboard: true - } + }; Carousel.prototype.keydown = function (e) { - if (/input|textarea/i.test(e.target.tagName)) return + if (/input|textarea/i.test(e.target.tagName)) return; switch (e.which) { - case 37: this.prev(); break - case 39: this.next(); break + case 37: this.prev(); break; + case 39: this.next(); break; default: return } e.preventDefault() - } + }; Carousel.prototype.cycle = function (e) { - e || (this.paused = false) + e || (this.paused = false); - this.interval && clearInterval(this.interval) + this.interval && clearInterval(this.interval); this.options.interval && !this.paused - && (this.interval = setInterval($.proxy(this.next, this), this.options.interval)) + && (this.interval = setInterval($.proxy(this.next, this), this.options.interval)); return this - } + }; Carousel.prototype.getItemIndex = function (item) { - this.$items = item.parent().children('.item') + this.$items = item.parent().children('.item'); return this.$items.index(item || this.$active) - } + }; Carousel.prototype.getItemForDirection = function (direction, active) { - var activeIndex = this.getItemIndex(active) + var activeIndex = this.getItemIndex(active); var willWrap = (direction == 'prev' && activeIndex === 0) - || (direction == 'next' && activeIndex == (this.$items.length - 1)) - if (willWrap && !this.options.wrap) return active - var delta = direction == 'prev' ? -1 : 1 - var itemIndex = (activeIndex + delta) % this.$items.length + || (direction == 'next' && activeIndex == (this.$items.length - 1)); + if (willWrap && !this.options.wrap) return active; + var delta = direction == 'prev' ? -1 : 1; + var itemIndex = (activeIndex + delta) % this.$items.length; return this.$items.eq(itemIndex) - } + }; Carousel.prototype.to = function (pos) { - var that = this - var activeIndex = this.getItemIndex(this.$active = this.$element.find('.item.active')) + var that = this; + var activeIndex = this.getItemIndex(this.$active = this.$element.find('.item.active')); - if (pos > (this.$items.length - 1) || pos < 0) return + if (pos > (this.$items.length - 1) || pos < 0) return; - if (this.sliding) return this.$element.one('slid.bs.carousel', function () { that.to(pos) }) // yes, "slid" - if (activeIndex == pos) return this.pause().cycle() + if (this.sliding) return this.$element.one('slid.bs.carousel', function () { that.to(pos) }); // yes, "slid" + if (activeIndex == pos) return this.pause().cycle(); return this.slide(pos > activeIndex ? 'next' : 'prev', this.$items.eq(pos)) - } + }; Carousel.prototype.pause = function (e) { - e || (this.paused = true) + e || (this.paused = true); if (this.$element.find('.next, .prev').length && $.support.transition) { - this.$element.trigger($.support.transition.end) + this.$element.trigger($.support.transition.end); this.cycle(true) } - this.interval = clearInterval(this.interval) + this.interval = clearInterval(this.interval); return this - } + }; Carousel.prototype.next = function () { - if (this.sliding) return + if (this.sliding) return; return this.slide('next') - } + }; Carousel.prototype.prev = function () { - if (this.sliding) return + if (this.sliding) return; return this.slide('prev') - } + }; Carousel.prototype.slide = function (type, next) { - var $active = this.$element.find('.item.active') - var $next = next || this.getItemForDirection(type, $active) - var isCycling = this.interval - var direction = type == 'next' ? 'left' : 'right' - var that = this + var $active = this.$element.find('.item.active'); + var $next = next || this.getItemForDirection(type, $active); + var isCycling = this.interval; + var direction = type == 'next' ? 'left' : 'right'; + var that = this; - if ($next.hasClass('active')) return (this.sliding = false) + if ($next.hasClass('active')) return (this.sliding = false); - var relatedTarget = $next[0] + var relatedTarget = $next[0]; var slideEvent = $.Event('slide.bs.carousel', { relatedTarget: relatedTarget, direction: direction - }) - this.$element.trigger(slideEvent) - if (slideEvent.isDefaultPrevented()) return + }); + this.$element.trigger(slideEvent); + if (slideEvent.isDefaultPrevented()) return; - this.sliding = true + this.sliding = true; - isCycling && this.pause() + isCycling && this.pause(); if (this.$indicators.length) { - this.$indicators.find('.active').removeClass('active') - var $nextIndicator = $(this.$indicators.children()[this.getItemIndex($next)]) + this.$indicators.find('.active').removeClass('active'); + var $nextIndicator = $(this.$indicators.children()[this.getItemIndex($next)]); $nextIndicator && $nextIndicator.addClass('active') } - var slidEvent = $.Event('slid.bs.carousel', { relatedTarget: relatedTarget, direction: direction }) // yes, "slid" + var slidEvent = $.Event('slid.bs.carousel', { relatedTarget: relatedTarget, direction: direction }); // yes, "slid" if ($.support.transition && this.$element.hasClass('slide')) { - $next.addClass(type) - $next[0].offsetWidth // force reflow - $active.addClass(direction) - $next.addClass(direction) + $next.addClass(type); + $next[0].offsetWidth; // force reflow + $active.addClass(direction); + $next.addClass(direction); $active .one('bsTransitionEnd', function () { - $next.removeClass([type, direction].join(' ')).addClass('active') - $active.removeClass(['active', direction].join(' ')) - that.sliding = false + $next.removeClass([type, direction].join(' ')).addClass('active'); + $active.removeClass(['active', direction].join(' ')); + that.sliding = false; setTimeout(function () { that.$element.trigger(slidEvent) }, 0) }) .emulateTransitionEnd(Carousel.TRANSITION_DURATION) } else { - $active.removeClass('active') - $next.addClass('active') - this.sliding = false + $active.removeClass('active'); + $next.addClass('active'); + this.sliding = false; this.$element.trigger(slidEvent) } - isCycling && this.cycle() + isCycling && this.cycle(); return this - } + }; // CAROUSEL PLUGIN DEFINITION @@ -469,61 +469,61 @@ if (typeof jQuery === 'undefined') { function Plugin(option) { return this.each(function () { - var $this = $(this) - var data = $this.data('bs.carousel') - var options = $.extend({}, Carousel.DEFAULTS, $this.data(), typeof option == 'object' && option) - var action = typeof option == 'string' ? option : options.slide + var $this = $(this); + var data = $this.data('bs.carousel'); + var options = $.extend({}, Carousel.DEFAULTS, $this.data(), typeof option == 'object' && option); + var action = typeof option == 'string' ? option : options.slide; - if (!data) $this.data('bs.carousel', (data = new Carousel(this, options))) - if (typeof option == 'number') data.to(option) - else if (action) data[action]() + if (!data) $this.data('bs.carousel', (data = new Carousel(this, options))); + if (typeof option == 'number') data.to(option); + else if (action) data[action](); else if (options.interval) data.pause().cycle() }) } - var old = $.fn.carousel + var old = $.fn.carousel; - $.fn.carousel = Plugin - $.fn.carousel.Constructor = Carousel + $.fn.carousel = Plugin; + $.fn.carousel.Constructor = Carousel; // CAROUSEL NO CONFLICT // ==================== $.fn.carousel.noConflict = function () { - $.fn.carousel = old + $.fn.carousel = old; return this - } + }; // CAROUSEL DATA-API // ================= var clickHandler = function (e) { - var href - var $this = $(this) - var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) // strip for ie7 - if (!$target.hasClass('carousel')) return - var options = $.extend({}, $target.data(), $this.data()) - var slideIndex = $this.attr('data-slide-to') - if (slideIndex) options.interval = false + var href; + var $this = $(this); + var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')); // strip for ie7 + if (!$target.hasClass('carousel')) return; + var options = $.extend({}, $target.data(), $this.data()); + var slideIndex = $this.attr('data-slide-to'); + if (slideIndex) options.interval = false; - Plugin.call($target, options) + Plugin.call($target, options); if (slideIndex) { $target.data('bs.carousel').to(slideIndex) } e.preventDefault() - } + }; $(document) .on('click.bs.carousel.data-api', '[data-slide]', clickHandler) - .on('click.bs.carousel.data-api', '[data-slide-to]', clickHandler) + .on('click.bs.carousel.data-api', '[data-slide-to]', clickHandler); $(window).on('load', function () { $('[data-ride="carousel"]').each(function () { - var $carousel = $(this) + var $carousel = $(this); Plugin.call($carousel, $carousel.data()) }) }) @@ -546,11 +546,11 @@ if (typeof jQuery === 'undefined') { // ================================ var Collapse = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, Collapse.DEFAULTS, options) + this.$element = $(element); + this.options = $.extend({}, Collapse.DEFAULTS, options); this.$trigger = $('[data-toggle="collapse"][href="#' + element.id + '"],' + - '[data-toggle="collapse"][data-target="#' + element.id + '"]') - this.transitioning = null + '[data-toggle="collapse"][data-target="#' + element.id + '"]'); + this.transitioning = null; if (this.options.parent) { this.$parent = this.getParent() @@ -559,137 +559,137 @@ if (typeof jQuery === 'undefined') { } if (this.options.toggle) this.toggle() - } + }; - Collapse.VERSION = '3.3.6' + Collapse.VERSION = '3.3.6'; - Collapse.TRANSITION_DURATION = 350 + Collapse.TRANSITION_DURATION = 350; Collapse.DEFAULTS = { toggle: true - } + }; Collapse.prototype.dimension = function () { - var hasWidth = this.$element.hasClass('width') + var hasWidth = this.$element.hasClass('width'); return hasWidth ? 'width' : 'height' - } + }; Collapse.prototype.show = function () { - if (this.transitioning || this.$element.hasClass('in')) return + if (this.transitioning || this.$element.hasClass('in')) return; - var activesData - var actives = this.$parent && this.$parent.children('.panel').children('.in, .collapsing') + var activesData; + var actives = this.$parent && this.$parent.children('.panel').children('.in, .collapsing'); if (actives && actives.length) { - activesData = actives.data('bs.collapse') + activesData = actives.data('bs.collapse'); if (activesData && activesData.transitioning) return } - var startEvent = $.Event('show.bs.collapse') - this.$element.trigger(startEvent) - if (startEvent.isDefaultPrevented()) return + var startEvent = $.Event('show.bs.collapse'); + this.$element.trigger(startEvent); + if (startEvent.isDefaultPrevented()) return; if (actives && actives.length) { - Plugin.call(actives, 'hide') + Plugin.call(actives, 'hide'); activesData || actives.data('bs.collapse', null) } - var dimension = this.dimension() + var dimension = this.dimension(); this.$element .removeClass('collapse') .addClass('collapsing')[dimension](0) - .attr('aria-expanded', true) + .attr('aria-expanded', true); this.$trigger .removeClass('collapsed') - .attr('aria-expanded', true) + .attr('aria-expanded', true); - this.transitioning = 1 + this.transitioning = 1; var complete = function () { this.$element .removeClass('collapsing') - .addClass('collapse in')[dimension]('') - this.transitioning = 0 + .addClass('collapse in')[dimension](''); + this.transitioning = 0; this.$element .trigger('shown.bs.collapse') - } + }; - if (!$.support.transition) return complete.call(this) + if (!$.support.transition) return complete.call(this); - var scrollSize = $.camelCase(['scroll', dimension].join('-')) + var scrollSize = $.camelCase(['scroll', dimension].join('-')); this.$element .one('bsTransitionEnd', $.proxy(complete, this)) .emulateTransitionEnd(Collapse.TRANSITION_DURATION)[dimension](this.$element[0][scrollSize]) - } + }; Collapse.prototype.hide = function () { - if (this.transitioning || !this.$element.hasClass('in')) return + if (this.transitioning || !this.$element.hasClass('in')) return; - var startEvent = $.Event('hide.bs.collapse') - this.$element.trigger(startEvent) - if (startEvent.isDefaultPrevented()) return + var startEvent = $.Event('hide.bs.collapse'); + this.$element.trigger(startEvent); + if (startEvent.isDefaultPrevented()) return; - var dimension = this.dimension() + var dimension = this.dimension(); - this.$element[dimension](this.$element[dimension]())[0].offsetHeight + this.$element[dimension](this.$element[dimension]())[0].offsetHeight; this.$element .addClass('collapsing') .removeClass('collapse in') - .attr('aria-expanded', false) + .attr('aria-expanded', false); this.$trigger .addClass('collapsed') - .attr('aria-expanded', false) + .attr('aria-expanded', false); - this.transitioning = 1 + this.transitioning = 1; var complete = function () { - this.transitioning = 0 + this.transitioning = 0; this.$element .removeClass('collapsing') .addClass('collapse') .trigger('hidden.bs.collapse') - } + }; - if (!$.support.transition) return complete.call(this) + if (!$.support.transition) return complete.call(this); this.$element [dimension](0) .one('bsTransitionEnd', $.proxy(complete, this)) .emulateTransitionEnd(Collapse.TRANSITION_DURATION) - } + }; Collapse.prototype.toggle = function () { this[this.$element.hasClass('in') ? 'hide' : 'show']() - } + }; Collapse.prototype.getParent = function () { return $(this.options.parent) .find('[data-toggle="collapse"][data-parent="' + this.options.parent + '"]') .each($.proxy(function (i, element) { - var $element = $(element) + var $element = $(element); this.addAriaAndCollapsedClass(getTargetFromTrigger($element), $element) }, this)) .end() - } + }; Collapse.prototype.addAriaAndCollapsedClass = function ($element, $trigger) { - var isOpen = $element.hasClass('in') + var isOpen = $element.hasClass('in'); - $element.attr('aria-expanded', isOpen) + $element.attr('aria-expanded', isOpen); $trigger .toggleClass('collapsed', !isOpen) .attr('aria-expanded', isOpen) - } + }; function getTargetFromTrigger($trigger) { - var href + var href; var target = $trigger.attr('data-target') - || (href = $trigger.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') // strip for ie7 + || (href = $trigger.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, ''); // strip for ie7 return $(target) } @@ -700,42 +700,42 @@ if (typeof jQuery === 'undefined') { function Plugin(option) { return this.each(function () { - var $this = $(this) - var data = $this.data('bs.collapse') - var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option) + var $this = $(this); + var data = $this.data('bs.collapse'); + var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option); - if (!data && options.toggle && /show|hide/.test(option)) options.toggle = false - if (!data) $this.data('bs.collapse', (data = new Collapse(this, options))) + if (!data && options.toggle && /show|hide/.test(option)) options.toggle = false; + if (!data) $this.data('bs.collapse', (data = new Collapse(this, options))); if (typeof option == 'string') data[option]() }) } - var old = $.fn.collapse + var old = $.fn.collapse; - $.fn.collapse = Plugin - $.fn.collapse.Constructor = Collapse + $.fn.collapse = Plugin; + $.fn.collapse.Constructor = Collapse; // COLLAPSE NO CONFLICT // ==================== $.fn.collapse.noConflict = function () { - $.fn.collapse = old + $.fn.collapse = old; return this - } + }; // COLLAPSE DATA-API // ================= $(document).on('click.bs.collapse.data-api', '[data-toggle="collapse"]', function (e) { - var $this = $(this) + var $this = $(this); - if (!$this.attr('data-target')) e.preventDefault() + if (!$this.attr('data-target')) e.preventDefault(); - var $target = getTargetFromTrigger($this) - var data = $target.data('bs.collapse') - var option = data ? 'toggle' : $this.data() + var $target = getTargetFromTrigger($this); + var data = $target.data('bs.collapse'); + var option = data ? 'toggle' : $this.data(); Plugin.call($target, option) }) @@ -757,57 +757,57 @@ if (typeof jQuery === 'undefined') { // DROPDOWN CLASS DEFINITION // ========================= - var backdrop = '.dropdown-backdrop' - var toggle = '[data-toggle="dropdown"]' + var backdrop = '.dropdown-backdrop'; + var toggle = '[data-toggle="dropdown"]'; var Dropdown = function (element) { $(element).on('click.bs.dropdown', this.toggle) - } + }; - Dropdown.VERSION = '3.3.6' + Dropdown.VERSION = '3.3.6'; function getParent($this) { - var selector = $this.attr('data-target') + var selector = $this.attr('data-target'); if (!selector) { - selector = $this.attr('href') + selector = $this.attr('href'); selector = selector && /#[A-Za-z]/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7 } - var $parent = selector && $(selector) + var $parent = selector && $(selector); return $parent && $parent.length ? $parent : $this.parent() } function clearMenus(e) { - if (e && e.which === 3) return - $(backdrop).remove() + if (e && e.which === 3) return; + $(backdrop).remove(); $(toggle).each(function () { - var $this = $(this) - var $parent = getParent($this) - var relatedTarget = { relatedTarget: this } + var $this = $(this); + var $parent = getParent($this); + var relatedTarget = { relatedTarget: this }; - if (!$parent.hasClass('open')) return + if (!$parent.hasClass('open')) return; - if (e && e.type == 'click' && /input|textarea/i.test(e.target.tagName) && $.contains($parent[0], e.target)) return + if (e && e.type == 'click' && /input|textarea/i.test(e.target.tagName) && $.contains($parent[0], e.target)) return; - $parent.trigger(e = $.Event('hide.bs.dropdown', relatedTarget)) + $parent.trigger(e = $.Event('hide.bs.dropdown', relatedTarget)); - if (e.isDefaultPrevented()) return + if (e.isDefaultPrevented()) return; - $this.attr('aria-expanded', 'false') + $this.attr('aria-expanded', 'false'); $parent.removeClass('open').trigger($.Event('hidden.bs.dropdown', relatedTarget)) }) } Dropdown.prototype.toggle = function (e) { - var $this = $(this) + var $this = $(this); - if ($this.is('.disabled, :disabled')) return + if ($this.is('.disabled, :disabled')) return; - var $parent = getParent($this) - var isActive = $parent.hasClass('open') + var $parent = getParent($this); + var isActive = $parent.hasClass('open'); - clearMenus() + clearMenus(); if (!isActive) { if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) { @@ -818,14 +818,14 @@ if (typeof jQuery === 'undefined') { .on('click', clearMenus) } - var relatedTarget = { relatedTarget: this } - $parent.trigger(e = $.Event('show.bs.dropdown', relatedTarget)) + var relatedTarget = { relatedTarget: this }; + $parent.trigger(e = $.Event('show.bs.dropdown', relatedTarget)); - if (e.isDefaultPrevented()) return + if (e.isDefaultPrevented()) return; $this .trigger('focus') - .attr('aria-expanded', 'true') + .attr('aria-expanded', 'true'); $parent .toggleClass('open') @@ -833,39 +833,39 @@ if (typeof jQuery === 'undefined') { } return false - } + }; Dropdown.prototype.keydown = function (e) { - if (!/(38|40|27|32)/.test(e.which) || /input|textarea/i.test(e.target.tagName)) return + if (!/(38|40|27|32)/.test(e.which) || /input|textarea/i.test(e.target.tagName)) return; - var $this = $(this) + var $this = $(this); - e.preventDefault() - e.stopPropagation() + e.preventDefault(); + e.stopPropagation(); - if ($this.is('.disabled, :disabled')) return + if ($this.is('.disabled, :disabled')) return; - var $parent = getParent($this) - var isActive = $parent.hasClass('open') + var $parent = getParent($this); + var isActive = $parent.hasClass('open'); if (!isActive && e.which != 27 || isActive && e.which == 27) { - if (e.which == 27) $parent.find(toggle).trigger('focus') + if (e.which == 27) $parent.find(toggle).trigger('focus'); return $this.trigger('click') } - var desc = ' li:not(.disabled):visible a' - var $items = $parent.find('.dropdown-menu' + desc) + var desc = ' li:not(.disabled):visible a'; + var $items = $parent.find('.dropdown-menu' + desc); - if (!$items.length) return + if (!$items.length) return; - var index = $items.index(e.target) + var index = $items.index(e.target); - if (e.which == 38 && index > 0) index-- // up - if (e.which == 40 && index < $items.length - 1) index++ // down - if (!~index) index = 0 + if (e.which == 38 && index > 0) index--; // up + if (e.which == 40 && index < $items.length - 1) index++; // down + if (!~index) index = 0; $items.eq(index).trigger('focus') - } + }; // DROPDOWN PLUGIN DEFINITION @@ -873,27 +873,27 @@ if (typeof jQuery === 'undefined') { function Plugin(option) { return this.each(function () { - var $this = $(this) - var data = $this.data('bs.dropdown') + var $this = $(this); + var data = $this.data('bs.dropdown'); - if (!data) $this.data('bs.dropdown', (data = new Dropdown(this))) + if (!data) $this.data('bs.dropdown', (data = new Dropdown(this))); if (typeof option == 'string') data[option].call($this) }) } - var old = $.fn.dropdown + var old = $.fn.dropdown; - $.fn.dropdown = Plugin - $.fn.dropdown.Constructor = Dropdown + $.fn.dropdown = Plugin; + $.fn.dropdown.Constructor = Dropdown; // DROPDOWN NO CONFLICT // ==================== $.fn.dropdown.noConflict = function () { - $.fn.dropdown = old + $.fn.dropdown = old; return this - } + }; // APPLY TO STANDARD DROPDOWN ELEMENTS @@ -924,15 +924,15 @@ if (typeof jQuery === 'undefined') { // ====================== var Modal = function (element, options) { - this.options = options - this.$body = $(document.body) - this.$element = $(element) - this.$dialog = this.$element.find('.modal-dialog') - this.$backdrop = null - this.isShown = null - this.originalBodyPad = null - this.scrollbarWidth = 0 - this.ignoreBackdropClick = false + this.options = options; + this.$body = $(document.body); + this.$element = $(element); + this.$dialog = this.$element.find('.modal-dialog'); + this.$backdrop = null; + this.isShown = null; + this.originalBodyPad = null; + this.scrollbarWidth = 0; + this.ignoreBackdropClick = false; if (this.options.remote) { this.$element @@ -941,50 +941,50 @@ if (typeof jQuery === 'undefined') { this.$element.trigger('loaded.bs.modal') }, this)) } - } + }; - Modal.VERSION = '3.3.6' + Modal.VERSION = '3.3.6'; - Modal.TRANSITION_DURATION = 300 - Modal.BACKDROP_TRANSITION_DURATION = 150 + Modal.TRANSITION_DURATION = 300; + Modal.BACKDROP_TRANSITION_DURATION = 150; Modal.DEFAULTS = { backdrop: true, keyboard: true, show: true - } + }; Modal.prototype.toggle = function (_relatedTarget) { return this.isShown ? this.hide() : this.show(_relatedTarget) - } + }; Modal.prototype.show = function (_relatedTarget) { - var that = this - var e = $.Event('show.bs.modal', { relatedTarget: _relatedTarget }) + var that = this; + var e = $.Event('show.bs.modal', { relatedTarget: _relatedTarget }); - this.$element.trigger(e) + this.$element.trigger(e); - if (this.isShown || e.isDefaultPrevented()) return + if (this.isShown || e.isDefaultPrevented()) return; - this.isShown = true + this.isShown = true; - this.checkScrollbar() - this.setScrollbar() - this.$body.addClass('modal-open') + this.checkScrollbar(); + this.setScrollbar(); + this.$body.addClass('modal-open'); - this.escape() - this.resize() + this.escape(); + this.resize(); - this.$element.on('click.dismiss.bs.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this)) + this.$element.on('click.dismiss.bs.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this)); this.$dialog.on('mousedown.dismiss.bs.modal', function () { that.$element.one('mouseup.dismiss.bs.modal', function (e) { if ($(e.target).is(that.$element)) that.ignoreBackdropClick = true }) - }) + }); this.backdrop(function () { - var transition = $.support.transition && that.$element.hasClass('fade') + var transition = $.support.transition && that.$element.hasClass('fade'); if (!that.$element.parent().length) { that.$element.appendTo(that.$body) // don't move modals dom position @@ -992,19 +992,19 @@ if (typeof jQuery === 'undefined') { that.$element .show() - .scrollTop(0) + .scrollTop(0); - that.adjustDialog() + that.adjustDialog(); if (transition) { that.$element[0].offsetWidth // force reflow } - that.$element.addClass('in') + that.$element.addClass('in'); - that.enforceFocus() + that.enforceFocus(); - var e = $.Event('shown.bs.modal', { relatedTarget: _relatedTarget }) + var e = $.Event('shown.bs.modal', { relatedTarget: _relatedTarget }); transition ? that.$dialog // wait for modal to slide in @@ -1014,37 +1014,37 @@ if (typeof jQuery === 'undefined') { .emulateTransitionEnd(Modal.TRANSITION_DURATION) : that.$element.trigger('focus').trigger(e) }) - } + }; Modal.prototype.hide = function (e) { - if (e) e.preventDefault() + if (e) e.preventDefault(); - e = $.Event('hide.bs.modal') + e = $.Event('hide.bs.modal'); - this.$element.trigger(e) + this.$element.trigger(e); - if (!this.isShown || e.isDefaultPrevented()) return + if (!this.isShown || e.isDefaultPrevented()) return; - this.isShown = false + this.isShown = false; - this.escape() - this.resize() + this.escape(); + this.resize(); - $(document).off('focusin.bs.modal') + $(document).off('focusin.bs.modal'); this.$element .removeClass('in') .off('click.dismiss.bs.modal') - .off('mouseup.dismiss.bs.modal') + .off('mouseup.dismiss.bs.modal'); - this.$dialog.off('mousedown.dismiss.bs.modal') + this.$dialog.off('mousedown.dismiss.bs.modal'); $.support.transition && this.$element.hasClass('fade') ? this.$element .one('bsTransitionEnd', $.proxy(this.hideModal, this)) .emulateTransitionEnd(Modal.TRANSITION_DURATION) : this.hideModal() - } + }; Modal.prototype.enforceFocus = function () { $(document) @@ -1054,7 +1054,7 @@ if (typeof jQuery === 'undefined') { this.$element.trigger('focus') } }, this)) - } + }; Modal.prototype.escape = function () { if (this.isShown && this.options.keyboard) { @@ -1064,7 +1064,7 @@ if (typeof jQuery === 'undefined') { } else if (!this.isShown) { this.$element.off('keydown.dismiss.bs.modal') } - } + }; Modal.prototype.resize = function () { if (this.isShown) { @@ -1072,51 +1072,51 @@ if (typeof jQuery === 'undefined') { } else { $(window).off('resize.bs.modal') } - } + }; Modal.prototype.hideModal = function () { - var that = this - this.$element.hide() + var that = this; + this.$element.hide(); this.backdrop(function () { - that.$body.removeClass('modal-open') - that.resetAdjustments() - that.resetScrollbar() + that.$body.removeClass('modal-open'); + that.resetAdjustments(); + that.resetScrollbar(); that.$element.trigger('hidden.bs.modal') }) - } + }; Modal.prototype.removeBackdrop = function () { - this.$backdrop && this.$backdrop.remove() + this.$backdrop && this.$backdrop.remove(); this.$backdrop = null - } + }; Modal.prototype.backdrop = function (callback) { - var that = this - var animate = this.$element.hasClass('fade') ? 'fade' : '' + var that = this; + var animate = this.$element.hasClass('fade') ? 'fade' : ''; if (this.isShown && this.options.backdrop) { - var doAnimate = $.support.transition && animate + var doAnimate = $.support.transition && animate; this.$backdrop = $(document.createElement('div')) .addClass('modal-backdrop ' + animate) - .appendTo(this.$body) + .appendTo(this.$body); this.$element.on('click.dismiss.bs.modal', $.proxy(function (e) { if (this.ignoreBackdropClick) { - this.ignoreBackdropClick = false + this.ignoreBackdropClick = false; return } - if (e.target !== e.currentTarget) return + if (e.target !== e.currentTarget) return; this.options.backdrop == 'static' ? this.$element[0].focus() : this.hide() - }, this)) + }, this)); - if (doAnimate) this.$backdrop[0].offsetWidth // force reflow + if (doAnimate) this.$backdrop[0].offsetWidth; // force reflow - this.$backdrop.addClass('in') + this.$backdrop.addClass('in'); - if (!callback) return + if (!callback) return; doAnimate ? this.$backdrop @@ -1125,12 +1125,12 @@ if (typeof jQuery === 'undefined') { callback() } else if (!this.isShown && this.$backdrop) { - this.$backdrop.removeClass('in') + this.$backdrop.removeClass('in'); var callbackRemove = function () { - that.removeBackdrop() + that.removeBackdrop(); callback && callback() - } + }; $.support.transition && this.$element.hasClass('fade') ? this.$backdrop .one('bsTransitionEnd', callbackRemove) @@ -1140,58 +1140,58 @@ if (typeof jQuery === 'undefined') { } else if (callback) { callback() } - } + }; // these following methods are used to handle overflowing modals Modal.prototype.handleUpdate = function () { this.adjustDialog() - } + }; Modal.prototype.adjustDialog = function () { - var modalIsOverflowing = this.$element[0].scrollHeight > document.documentElement.clientHeight + var modalIsOverflowing = this.$element[0].scrollHeight > document.documentElement.clientHeight; this.$element.css({ paddingLeft: !this.bodyIsOverflowing && modalIsOverflowing ? this.scrollbarWidth : '', paddingRight: this.bodyIsOverflowing && !modalIsOverflowing ? this.scrollbarWidth : '' }) - } + }; Modal.prototype.resetAdjustments = function () { this.$element.css({ paddingLeft: '', paddingRight: '' }) - } + }; Modal.prototype.checkScrollbar = function () { - var fullWindowWidth = window.innerWidth + var fullWindowWidth = window.innerWidth; if (!fullWindowWidth) { // workaround for missing window.innerWidth in IE8 - var documentElementRect = document.documentElement.getBoundingClientRect() + var documentElementRect = document.documentElement.getBoundingClientRect(); fullWindowWidth = documentElementRect.right - Math.abs(documentElementRect.left) } - this.bodyIsOverflowing = document.body.clientWidth < fullWindowWidth + this.bodyIsOverflowing = document.body.clientWidth < fullWindowWidth; this.scrollbarWidth = this.measureScrollbar() - } + }; Modal.prototype.setScrollbar = function () { - var bodyPad = parseInt((this.$body.css('padding-right') || 0), 10) - this.originalBodyPad = document.body.style.paddingRight || '' + var bodyPad = parseInt((this.$body.css('padding-right') || 0), 10); + this.originalBodyPad = document.body.style.paddingRight || ''; if (this.bodyIsOverflowing) this.$body.css('padding-right', bodyPad + this.scrollbarWidth) - } + }; Modal.prototype.resetScrollbar = function () { this.$body.css('padding-right', this.originalBodyPad) - } + }; Modal.prototype.measureScrollbar = function () { // thx walsh - var scrollDiv = document.createElement('div') - scrollDiv.className = 'modal-scrollbar-measure' - this.$body.append(scrollDiv) - var scrollbarWidth = scrollDiv.offsetWidth - scrollDiv.clientWidth - this.$body[0].removeChild(scrollDiv) + var scrollDiv = document.createElement('div'); + scrollDiv.className = 'modal-scrollbar-measure'; + this.$body.append(scrollDiv); + var scrollbarWidth = scrollDiv.offsetWidth - scrollDiv.clientWidth; + this.$body[0].removeChild(scrollDiv); return scrollbarWidth - } + }; // MODAL PLUGIN DEFINITION @@ -1199,48 +1199,48 @@ if (typeof jQuery === 'undefined') { function Plugin(option, _relatedTarget) { return this.each(function () { - var $this = $(this) - var data = $this.data('bs.modal') - var options = $.extend({}, Modal.DEFAULTS, $this.data(), typeof option == 'object' && option) + var $this = $(this); + var data = $this.data('bs.modal'); + var options = $.extend({}, Modal.DEFAULTS, $this.data(), typeof option == 'object' && option); - if (!data) $this.data('bs.modal', (data = new Modal(this, options))) - if (typeof option == 'string') data[option](_relatedTarget) + if (!data) $this.data('bs.modal', (data = new Modal(this, options))); + if (typeof option == 'string') data[option](_relatedTarget); else if (options.show) data.show(_relatedTarget) }) } - var old = $.fn.modal + var old = $.fn.modal; - $.fn.modal = Plugin - $.fn.modal.Constructor = Modal + $.fn.modal = Plugin; + $.fn.modal.Constructor = Modal; // MODAL NO CONFLICT // ================= $.fn.modal.noConflict = function () { - $.fn.modal = old + $.fn.modal = old; return this - } + }; // MODAL DATA-API // ============== $(document).on('click.bs.modal.data-api', '[data-toggle="modal"]', function (e) { - var $this = $(this) - var href = $this.attr('href') - var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) // strip for ie7 - var option = $target.data('bs.modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data()) + var $this = $(this); + var href = $this.attr('href'); + var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))); // strip for ie7 + var option = $target.data('bs.modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data()); - if ($this.is('a')) e.preventDefault() + if ($this.is('a')) e.preventDefault(); $target.one('show.bs.modal', function (showEvent) { - if (showEvent.isDefaultPrevented()) return // only register focus restorer if modal will actually get shown + if (showEvent.isDefaultPrevented()) return; // only register focus restorer if modal will actually get shown $target.one('hidden.bs.modal', function () { $this.is(':visible') && $this.trigger('focus') }) - }) + }); Plugin.call($target, option, this) }) @@ -1263,20 +1263,20 @@ if (typeof jQuery === 'undefined') { // =============================== var Tooltip = function (element, options) { - this.type = null - this.options = null - this.enabled = null - this.timeout = null - this.hoverState = null - this.$element = null - this.inState = null + this.type = null; + this.options = null; + this.enabled = null; + this.timeout = null; + this.hoverState = null; + this.$element = null; + this.inState = null; this.init('tooltip', element, options) - } + }; - Tooltip.VERSION = '3.3.6' + Tooltip.VERSION = '3.3.6'; - Tooltip.TRANSITION_DURATION = 150 + Tooltip.TRANSITION_DURATION = 150; Tooltip.DEFAULTS = { animation: true, @@ -1292,32 +1292,32 @@ if (typeof jQuery === 'undefined') { selector: 'body', padding: 0 } - } + }; Tooltip.prototype.init = function (type, element, options) { - this.enabled = true - this.type = type - this.$element = $(element) - this.options = this.getOptions(options) - this.$viewport = this.options.viewport && $($.isFunction(this.options.viewport) ? this.options.viewport.call(this, this.$element) : (this.options.viewport.selector || this.options.viewport)) - this.inState = { click: false, hover: false, focus: false } + this.enabled = true; + this.type = type; + this.$element = $(element); + this.options = this.getOptions(options); + this.$viewport = this.options.viewport && $($.isFunction(this.options.viewport) ? this.options.viewport.call(this, this.$element) : (this.options.viewport.selector || this.options.viewport)); + this.inState = { click: false, hover: false, focus: false }; if (this.$element[0] instanceof document.constructor && !this.options.selector) { throw new Error('`selector` option must be specified when initializing ' + this.type + ' on the window.document object!') } - var triggers = this.options.trigger.split(' ') + var triggers = this.options.trigger.split(' '); for (var i = triggers.length; i--;) { - var trigger = triggers[i] + var trigger = triggers[i]; if (trigger == 'click') { this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this)) } else if (trigger != 'manual') { - var eventIn = trigger == 'hover' ? 'mouseenter' : 'focusin' - var eventOut = trigger == 'hover' ? 'mouseleave' : 'focusout' + var eventIn = trigger == 'hover' ? 'mouseenter' : 'focusin'; + var eventOut = trigger == 'hover' ? 'mouseleave' : 'focusout'; - this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this)) + this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this)); this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this)) } } @@ -1325,14 +1325,14 @@ if (typeof jQuery === 'undefined') { this.options.selector ? (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) : this.fixTitle() - } + }; Tooltip.prototype.getDefaults = function () { return Tooltip.DEFAULTS - } + }; Tooltip.prototype.getOptions = function (options) { - options = $.extend({}, this.getDefaults(), this.$element.data(), options) + options = $.extend({}, this.getDefaults(), this.$element.data(), options); if (options.delay && typeof options.delay == 'number') { options.delay = { @@ -1342,25 +1342,25 @@ if (typeof jQuery === 'undefined') { } return options - } + }; Tooltip.prototype.getDelegateOptions = function () { - var options = {} - var defaults = this.getDefaults() + var options = {}; + var defaults = this.getDefaults(); this._options && $.each(this._options, function (key, value) { if (defaults[key] != value) options[key] = value - }) + }); return options - } + }; Tooltip.prototype.enter = function (obj) { var self = obj instanceof this.constructor ? - obj : $(obj.currentTarget).data('bs.' + this.type) + obj : $(obj.currentTarget).data('bs.' + this.type); if (!self) { - self = new this.constructor(obj.currentTarget, this.getDelegateOptions()) + self = new this.constructor(obj.currentTarget, this.getDelegateOptions()); $(obj.currentTarget).data('bs.' + this.type, self) } @@ -1369,20 +1369,20 @@ if (typeof jQuery === 'undefined') { } if (self.tip().hasClass('in') || self.hoverState == 'in') { - self.hoverState = 'in' + self.hoverState = 'in'; return } - clearTimeout(self.timeout) + clearTimeout(self.timeout); - self.hoverState = 'in' + self.hoverState = 'in'; - if (!self.options.delay || !self.options.delay.show) return self.show() + if (!self.options.delay || !self.options.delay.show) return self.show(); self.timeout = setTimeout(function () { if (self.hoverState == 'in') self.show() }, self.options.delay.show) - } + }; Tooltip.prototype.isInStateTrue = function () { for (var key in this.inState) { @@ -1390,14 +1390,14 @@ if (typeof jQuery === 'undefined') { } return false - } + }; Tooltip.prototype.leave = function (obj) { var self = obj instanceof this.constructor ? - obj : $(obj.currentTarget).data('bs.' + this.type) + obj : $(obj.currentTarget).data('bs.' + this.type); if (!self) { - self = new this.constructor(obj.currentTarget, this.getDelegateOptions()) + self = new this.constructor(obj.currentTarget, this.getDelegateOptions()); $(obj.currentTarget).data('bs.' + this.type, self) } @@ -1405,86 +1405,86 @@ if (typeof jQuery === 'undefined') { self.inState[obj.type == 'focusout' ? 'focus' : 'hover'] = false } - if (self.isInStateTrue()) return + if (self.isInStateTrue()) return; - clearTimeout(self.timeout) + clearTimeout(self.timeout); - self.hoverState = 'out' + self.hoverState = 'out'; - if (!self.options.delay || !self.options.delay.hide) return self.hide() + if (!self.options.delay || !self.options.delay.hide) return self.hide(); self.timeout = setTimeout(function () { if (self.hoverState == 'out') self.hide() }, self.options.delay.hide) - } + }; Tooltip.prototype.show = function () { - var e = $.Event('show.bs.' + this.type) + var e = $.Event('show.bs.' + this.type); if (this.hasContent() && this.enabled) { - this.$element.trigger(e) + this.$element.trigger(e); - var inDom = $.contains(this.$element[0].ownerDocument.documentElement, this.$element[0]) - if (e.isDefaultPrevented() || !inDom) return - var that = this + var inDom = $.contains(this.$element[0].ownerDocument.documentElement, this.$element[0]); + if (e.isDefaultPrevented() || !inDom) return; + var that = this; - var $tip = this.tip() + var $tip = this.tip(); - var tipId = this.getUID(this.type) + var tipId = this.getUID(this.type); - this.setContent() - $tip.attr('id', tipId) - this.$element.attr('aria-describedby', tipId) + this.setContent(); + $tip.attr('id', tipId); + this.$element.attr('aria-describedby', tipId); - if (this.options.animation) $tip.addClass('fade') + if (this.options.animation) $tip.addClass('fade'); var placement = typeof this.options.placement == 'function' ? this.options.placement.call(this, $tip[0], this.$element[0]) : - this.options.placement + this.options.placement; - var autoToken = /\s?auto?\s?/i - var autoPlace = autoToken.test(placement) - if (autoPlace) placement = placement.replace(autoToken, '') || 'top' + var autoToken = /\s?auto?\s?/i; + var autoPlace = autoToken.test(placement); + if (autoPlace) placement = placement.replace(autoToken, '') || 'top'; $tip .detach() .css({ top: 0, left: 0, display: 'block' }) .addClass(placement) - .data('bs.' + this.type, this) + .data('bs.' + this.type, this); - this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element) - this.$element.trigger('inserted.bs.' + this.type) + this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element); + this.$element.trigger('inserted.bs.' + this.type); - var pos = this.getPosition() - var actualWidth = $tip[0].offsetWidth - var actualHeight = $tip[0].offsetHeight + var pos = this.getPosition(); + var actualWidth = $tip[0].offsetWidth; + var actualHeight = $tip[0].offsetHeight; if (autoPlace) { - var orgPlacement = placement - var viewportDim = this.getPosition(this.$viewport) + var orgPlacement = placement; + var viewportDim = this.getPosition(this.$viewport); placement = placement == 'bottom' && pos.bottom + actualHeight > viewportDim.bottom ? 'top' : placement == 'top' && pos.top - actualHeight < viewportDim.top ? 'bottom' : placement == 'right' && pos.right + actualWidth > viewportDim.width ? 'left' : placement == 'left' && pos.left - actualWidth < viewportDim.left ? 'right' : - placement + placement; $tip .removeClass(orgPlacement) .addClass(placement) } - var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight) + var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight); - this.applyPlacement(calculatedOffset, placement) + this.applyPlacement(calculatedOffset, placement); var complete = function () { - var prevHoverState = that.hoverState - that.$element.trigger('shown.bs.' + that.type) - that.hoverState = null + var prevHoverState = that.hoverState; + that.$element.trigger('shown.bs.' + that.type); + that.hoverState = null; if (prevHoverState == 'out') that.leave(that) - } + }; $.support.transition && this.$tip.hasClass('fade') ? $tip @@ -1492,23 +1492,23 @@ if (typeof jQuery === 'undefined') { .emulateTransitionEnd(Tooltip.TRANSITION_DURATION) : complete() } - } + }; Tooltip.prototype.applyPlacement = function (offset, placement) { - var $tip = this.tip() - var width = $tip[0].offsetWidth - var height = $tip[0].offsetHeight + var $tip = this.tip(); + var width = $tip[0].offsetWidth; + var height = $tip[0].offsetHeight; // manually read margins because getBoundingClientRect includes difference - var marginTop = parseInt($tip.css('margin-top'), 10) - var marginLeft = parseInt($tip.css('margin-left'), 10) + var marginTop = parseInt($tip.css('margin-top'), 10); + var marginLeft = parseInt($tip.css('margin-left'), 10); // we must check for NaN for ie 8/9 - if (isNaN(marginTop)) marginTop = 0 - if (isNaN(marginLeft)) marginLeft = 0 + if (isNaN(marginTop)) marginTop = 0; + if (isNaN(marginLeft)) marginLeft = 0; - offset.top += marginTop - offset.left += marginLeft + offset.top += marginTop; + offset.left += marginLeft; // $.fn.offset doesn't round pixel values // so we use setOffset directly with our own function B-0 @@ -1519,103 +1519,103 @@ if (typeof jQuery === 'undefined') { left: Math.round(props.left) }) } - }, offset), 0) + }, offset), 0); - $tip.addClass('in') + $tip.addClass('in'); // check to see if placing tip in new offset caused the tip to resize itself - var actualWidth = $tip[0].offsetWidth - var actualHeight = $tip[0].offsetHeight + var actualWidth = $tip[0].offsetWidth; + var actualHeight = $tip[0].offsetHeight; if (placement == 'top' && actualHeight != height) { offset.top = offset.top + height - actualHeight } - var delta = this.getViewportAdjustedDelta(placement, offset, actualWidth, actualHeight) + var delta = this.getViewportAdjustedDelta(placement, offset, actualWidth, actualHeight); - if (delta.left) offset.left += delta.left - else offset.top += delta.top + if (delta.left) offset.left += delta.left; + else offset.top += delta.top; - var isVertical = /top|bottom/.test(placement) - var arrowDelta = isVertical ? delta.left * 2 - width + actualWidth : delta.top * 2 - height + actualHeight - var arrowOffsetPosition = isVertical ? 'offsetWidth' : 'offsetHeight' + var isVertical = /top|bottom/.test(placement); + var arrowDelta = isVertical ? delta.left * 2 - width + actualWidth : delta.top * 2 - height + actualHeight; + var arrowOffsetPosition = isVertical ? 'offsetWidth' : 'offsetHeight'; - $tip.offset(offset) + $tip.offset(offset); this.replaceArrow(arrowDelta, $tip[0][arrowOffsetPosition], isVertical) - } + }; Tooltip.prototype.replaceArrow = function (delta, dimension, isVertical) { this.arrow() .css(isVertical ? 'left' : 'top', 50 * (1 - delta / dimension) + '%') .css(isVertical ? 'top' : 'left', '') - } + }; Tooltip.prototype.setContent = function () { - var $tip = this.tip() - var title = this.getTitle() + var $tip = this.tip(); + var title = this.getTitle(); - $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title) + $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title); $tip.removeClass('fade in top bottom left right') - } + }; Tooltip.prototype.hide = function (callback) { - var that = this - var $tip = $(this.$tip) - var e = $.Event('hide.bs.' + this.type) + var that = this; + var $tip = $(this.$tip); + var e = $.Event('hide.bs.' + this.type); function complete() { - if (that.hoverState != 'in') $tip.detach() + if (that.hoverState != 'in') $tip.detach(); that.$element .removeAttr('aria-describedby') - .trigger('hidden.bs.' + that.type) + .trigger('hidden.bs.' + that.type); callback && callback() } - this.$element.trigger(e) + this.$element.trigger(e); - if (e.isDefaultPrevented()) return + if (e.isDefaultPrevented()) return; - $tip.removeClass('in') + $tip.removeClass('in'); $.support.transition && $tip.hasClass('fade') ? $tip .one('bsTransitionEnd', complete) .emulateTransitionEnd(Tooltip.TRANSITION_DURATION) : - complete() + complete(); - this.hoverState = null + this.hoverState = null; return this - } + }; Tooltip.prototype.fixTitle = function () { - var $e = this.$element + var $e = this.$element; if ($e.attr('title') || typeof $e.attr('data-original-title') != 'string') { $e.attr('data-original-title', $e.attr('title') || '').attr('title', '') } - } + }; Tooltip.prototype.hasContent = function () { return this.getTitle() - } + }; Tooltip.prototype.getPosition = function ($element) { - $element = $element || this.$element + $element = $element || this.$element; - var el = $element[0] - var isBody = el.tagName == 'BODY' + var el = $element[0]; + var isBody = el.tagName == 'BODY'; - var elRect = el.getBoundingClientRect() + var elRect = el.getBoundingClientRect(); if (elRect.width == null) { // width and height are missing in IE8, so compute them manually; see https://github.com/twbs/bootstrap/issues/14093 elRect = $.extend({}, elRect, { width: elRect.right - elRect.left, height: elRect.bottom - elRect.top }) } - var elOffset = isBody ? { top: 0, left: 0 } : $element.offset() - var scroll = { scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop() } - var outerDims = isBody ? { width: $(window).width(), height: $(window).height() } : null + var elOffset = isBody ? { top: 0, left: 0 } : $element.offset(); + var scroll = { scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop() }; + var outerDims = isBody ? { width: $(window).width(), height: $(window).height() } : null; return $.extend({}, elRect, scroll, outerDims, elOffset) - } + }; Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) { return placement == 'bottom' ? { top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2 } : @@ -1623,26 +1623,26 @@ if (typeof jQuery === 'undefined') { placement == 'left' ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } : /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width } - } + }; Tooltip.prototype.getViewportAdjustedDelta = function (placement, pos, actualWidth, actualHeight) { - var delta = { top: 0, left: 0 } - if (!this.$viewport) return delta + var delta = { top: 0, left: 0 }; + if (!this.$viewport) return delta; - var viewportPadding = this.options.viewport && this.options.viewport.padding || 0 - var viewportDimensions = this.getPosition(this.$viewport) + var viewportPadding = this.options.viewport && this.options.viewport.padding || 0; + var viewportDimensions = this.getPosition(this.$viewport); if (/right|left/.test(placement)) { - var topEdgeOffset = pos.top - viewportPadding - viewportDimensions.scroll - var bottomEdgeOffset = pos.top + viewportPadding - viewportDimensions.scroll + actualHeight + var topEdgeOffset = pos.top - viewportPadding - viewportDimensions.scroll; + var bottomEdgeOffset = pos.top + viewportPadding - viewportDimensions.scroll + actualHeight; if (topEdgeOffset < viewportDimensions.top) { // top overflow delta.top = viewportDimensions.top - topEdgeOffset } else if (bottomEdgeOffset > viewportDimensions.top + viewportDimensions.height) { // bottom overflow delta.top = viewportDimensions.top + viewportDimensions.height - bottomEdgeOffset } } else { - var leftEdgeOffset = pos.left - viewportPadding - var rightEdgeOffset = pos.left + viewportPadding + actualWidth + var leftEdgeOffset = pos.left - viewportPadding; + var rightEdgeOffset = pos.left + viewportPadding + actualWidth; if (leftEdgeOffset < viewportDimensions.left) { // left overflow delta.left = viewportDimensions.left - leftEdgeOffset } else if (rightEdgeOffset > viewportDimensions.right) { // right overflow @@ -1651,83 +1651,83 @@ if (typeof jQuery === 'undefined') { } return delta - } + }; Tooltip.prototype.getTitle = function () { - var title - var $e = this.$element - var o = this.options + var title; + var $e = this.$element; + var o = this.options; title = $e.attr('data-original-title') - || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) + || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title); return title - } + }; Tooltip.prototype.getUID = function (prefix) { - do prefix += ~~(Math.random() * 1000000) - while (document.getElementById(prefix)) + do prefix += ~~(Math.random() * 1000000); + while (document.getElementById(prefix)); return prefix - } + }; Tooltip.prototype.tip = function () { if (!this.$tip) { - this.$tip = $(this.options.template) + this.$tip = $(this.options.template); if (this.$tip.length != 1) { throw new Error(this.type + ' `template` option must consist of exactly 1 top-level element!') } } return this.$tip - } + }; Tooltip.prototype.arrow = function () { return (this.$arrow = this.$arrow || this.tip().find('.tooltip-arrow')) - } + }; Tooltip.prototype.enable = function () { this.enabled = true - } + }; Tooltip.prototype.disable = function () { this.enabled = false - } + }; Tooltip.prototype.toggleEnabled = function () { this.enabled = !this.enabled - } + }; Tooltip.prototype.toggle = function (e) { - var self = this + var self = this; if (e) { - self = $(e.currentTarget).data('bs.' + this.type) + self = $(e.currentTarget).data('bs.' + this.type); if (!self) { - self = new this.constructor(e.currentTarget, this.getDelegateOptions()) + self = new this.constructor(e.currentTarget, this.getDelegateOptions()); $(e.currentTarget).data('bs.' + this.type, self) } } if (e) { - self.inState.click = !self.inState.click - if (self.isInStateTrue()) self.enter(self) + self.inState.click = !self.inState.click; + if (self.isInStateTrue()) self.enter(self); else self.leave(self) } else { self.tip().hasClass('in') ? self.leave(self) : self.enter(self) } - } + }; Tooltip.prototype.destroy = function () { - var that = this - clearTimeout(this.timeout) + var that = this; + clearTimeout(this.timeout); this.hide(function () { - that.$element.off('.' + that.type).removeData('bs.' + that.type) + that.$element.off('.' + that.type).removeData('bs.' + that.type); if (that.$tip) { that.$tip.detach() } - that.$tip = null - that.$arrow = null + that.$tip = null; + that.$arrow = null; that.$viewport = null }) - } + }; // TOOLTIP PLUGIN DEFINITION @@ -1735,27 +1735,27 @@ if (typeof jQuery === 'undefined') { function Plugin(option) { return this.each(function () { - var $this = $(this) - var data = $this.data('bs.tooltip') - var options = typeof option == 'object' && option + var $this = $(this); + var data = $this.data('bs.tooltip'); + var options = typeof option == 'object' && option; - if (!data && /destroy|hide/.test(option)) return - if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options))) + if (!data && /destroy|hide/.test(option)) return; + if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options))); if (typeof option == 'string') data[option]() }) } - var old = $.fn.tooltip + var old = $.fn.tooltip; - $.fn.tooltip = Plugin - $.fn.tooltip.Constructor = Tooltip + $.fn.tooltip = Plugin; + $.fn.tooltip.Constructor = Tooltip; // TOOLTIP NO CONFLICT // =================== $.fn.tooltip.noConflict = function () { - $.fn.tooltip = old + $.fn.tooltip = old; return this } @@ -1778,65 +1778,65 @@ if (typeof jQuery === 'undefined') { var Popover = function (element, options) { this.init('popover', element, options) - } + }; - if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js') + if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js'); - Popover.VERSION = '3.3.6' + Popover.VERSION = '3.3.6'; Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, { placement: 'right', trigger: 'click', content: '', template: '' - }) + }); // NOTE: POPOVER EXTENDS tooltip.js // ================================ - Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype) + Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype); - Popover.prototype.constructor = Popover + Popover.prototype.constructor = Popover; Popover.prototype.getDefaults = function () { return Popover.DEFAULTS - } + }; Popover.prototype.setContent = function () { - var $tip = this.tip() - var title = this.getTitle() - var content = this.getContent() + var $tip = this.tip(); + var title = this.getTitle(); + var content = this.getContent(); - $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title) + $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title); $tip.find('.popover-content').children().detach().end()[ // we use append for html objects to maintain js events this.options.html ? (typeof content == 'string' ? 'html' : 'append') : 'text' - ](content) + ](content); - $tip.removeClass('fade top bottom left right in') + $tip.removeClass('fade top bottom left right in'); // IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do // this manually by checking the contents. if (!$tip.find('.popover-title').html()) $tip.find('.popover-title').hide() - } + }; Popover.prototype.hasContent = function () { return this.getTitle() || this.getContent() - } + }; Popover.prototype.getContent = function () { - var $e = this.$element - var o = this.options + var $e = this.$element; + var o = this.options; return $e.attr('data-content') || (typeof o.content == 'function' ? o.content.call($e[0]) : o.content) - } + }; Popover.prototype.arrow = function () { return (this.$arrow = this.$arrow || this.tip().find('.arrow')) - } + }; // POPOVER PLUGIN DEFINITION @@ -1844,27 +1844,27 @@ if (typeof jQuery === 'undefined') { function Plugin(option) { return this.each(function () { - var $this = $(this) - var data = $this.data('bs.popover') - var options = typeof option == 'object' && option + var $this = $(this); + var data = $this.data('bs.popover'); + var options = typeof option == 'object' && option; - if (!data && /destroy|hide/.test(option)) return - if (!data) $this.data('bs.popover', (data = new Popover(this, options))) + if (!data && /destroy|hide/.test(option)) return; + if (!data) $this.data('bs.popover', (data = new Popover(this, options))); if (typeof option == 'string') data[option]() }) } - var old = $.fn.popover + var old = $.fn.popover; - $.fn.popover = Plugin - $.fn.popover.Constructor = Popover + $.fn.popover = Plugin; + $.fn.popover.Constructor = Popover; // POPOVER NO CONFLICT // =================== $.fn.popover.noConflict = function () { - $.fn.popover = old + $.fn.popover = old; return this } @@ -1886,50 +1886,50 @@ if (typeof jQuery === 'undefined') { // ========================== function ScrollSpy(element, options) { - this.$body = $(document.body) - this.$scrollElement = $(element).is(document.body) ? $(window) : $(element) - this.options = $.extend({}, ScrollSpy.DEFAULTS, options) - this.selector = (this.options.target || '') + ' .nav li > a' - this.offsets = [] - this.targets = [] - this.activeTarget = null - this.scrollHeight = 0 + this.$body = $(document.body); + this.$scrollElement = $(element).is(document.body) ? $(window) : $(element); + this.options = $.extend({}, ScrollSpy.DEFAULTS, options); + this.selector = (this.options.target || '') + ' .nav li > a'; + this.offsets = []; + this.targets = []; + this.activeTarget = null; + this.scrollHeight = 0; - this.$scrollElement.on('scroll.bs.scrollspy', $.proxy(this.process, this)) - this.refresh() + this.$scrollElement.on('scroll.bs.scrollspy', $.proxy(this.process, this)); + this.refresh(); this.process() } - ScrollSpy.VERSION = '3.3.6' + ScrollSpy.VERSION = '3.3.6'; ScrollSpy.DEFAULTS = { offset: 10 - } + }; ScrollSpy.prototype.getScrollHeight = function () { return this.$scrollElement[0].scrollHeight || Math.max(this.$body[0].scrollHeight, document.documentElement.scrollHeight) - } + }; ScrollSpy.prototype.refresh = function () { - var that = this - var offsetMethod = 'offset' - var offsetBase = 0 + var that = this; + var offsetMethod = 'offset'; + var offsetBase = 0; - this.offsets = [] - this.targets = [] - this.scrollHeight = this.getScrollHeight() + this.offsets = []; + this.targets = []; + this.scrollHeight = this.getScrollHeight(); if (!$.isWindow(this.$scrollElement[0])) { - offsetMethod = 'position' + offsetMethod = 'position'; offsetBase = this.$scrollElement.scrollTop() } this.$body .find(this.selector) .map(function () { - var $el = $(this) - var href = $el.data('target') || $el.attr('href') - var $href = /^#./.test(href) && $(href) + var $el = $(this); + var href = $el.data('target') || $el.attr('href'); + var $href = /^#./.test(href) && $(href); return ($href && $href.length @@ -1938,19 +1938,19 @@ if (typeof jQuery === 'undefined') { }) .sort(function (a, b) { return a[0] - b[0] }) .each(function () { - that.offsets.push(this[0]) + that.offsets.push(this[0]); that.targets.push(this[1]) }) - } + }; ScrollSpy.prototype.process = function () { - var scrollTop = this.$scrollElement.scrollTop() + this.options.offset - var scrollHeight = this.getScrollHeight() - var maxScroll = this.options.offset + scrollHeight - this.$scrollElement.height() - var offsets = this.offsets - var targets = this.targets - var activeTarget = this.activeTarget - var i + var scrollTop = this.$scrollElement.scrollTop() + this.options.offset; + var scrollHeight = this.getScrollHeight(); + var maxScroll = this.options.offset + scrollHeight - this.$scrollElement.height(); + var offsets = this.offsets; + var targets = this.targets; + var activeTarget = this.activeTarget; + var i; if (this.scrollHeight != scrollHeight) { this.refresh() @@ -1961,7 +1961,7 @@ if (typeof jQuery === 'undefined') { } if (activeTarget && scrollTop < offsets[0]) { - this.activeTarget = null + this.activeTarget = null; return this.clear() } @@ -1971,20 +1971,20 @@ if (typeof jQuery === 'undefined') { && (offsets[i + 1] === undefined || scrollTop < offsets[i + 1]) && this.activate(targets[i]) } - } + }; ScrollSpy.prototype.activate = function (target) { - this.activeTarget = target + this.activeTarget = target; - this.clear() + this.clear(); var selector = this.selector + '[data-target="' + target + '"],' + - this.selector + '[href="' + target + '"]' + this.selector + '[href="' + target + '"]'; var active = $(selector) .parents('li') - .addClass('active') + .addClass('active'); if (active.parent('.dropdown-menu').length) { active = active @@ -1993,13 +1993,13 @@ if (typeof jQuery === 'undefined') { } active.trigger('activate.bs.scrollspy') - } + }; ScrollSpy.prototype.clear = function () { $(this.selector) .parentsUntil(this.options.target, '.active') .removeClass('active') - } + }; // SCROLLSPY PLUGIN DEFINITION @@ -2007,28 +2007,28 @@ if (typeof jQuery === 'undefined') { function Plugin(option) { return this.each(function () { - var $this = $(this) - var data = $this.data('bs.scrollspy') - var options = typeof option == 'object' && option + var $this = $(this); + var data = $this.data('bs.scrollspy'); + var options = typeof option == 'object' && option; - if (!data) $this.data('bs.scrollspy', (data = new ScrollSpy(this, options))) + if (!data) $this.data('bs.scrollspy', (data = new ScrollSpy(this, options))); if (typeof option == 'string') data[option]() }) } - var old = $.fn.scrollspy + var old = $.fn.scrollspy; - $.fn.scrollspy = Plugin - $.fn.scrollspy.Constructor = ScrollSpy + $.fn.scrollspy = Plugin; + $.fn.scrollspy.Constructor = ScrollSpy; // SCROLLSPY NO CONFLICT // ===================== $.fn.scrollspy.noConflict = function () { - $.fn.scrollspy = old + $.fn.scrollspy = old; return this - } + }; // SCROLLSPY DATA-API @@ -2036,7 +2036,7 @@ if (typeof jQuery === 'undefined') { $(window).on('load.bs.scrollspy.data-api', function () { $('[data-spy="scroll"]').each(function () { - var $spy = $(this) + var $spy = $(this); Plugin.call($spy, $spy.data()) }) }) @@ -2062,57 +2062,57 @@ if (typeof jQuery === 'undefined') { // jscs:disable requireDollarBeforejQueryAssignment this.element = $(element) // jscs:enable requireDollarBeforejQueryAssignment - } + }; - Tab.VERSION = '3.3.6' + Tab.VERSION = '3.3.6'; - Tab.TRANSITION_DURATION = 150 + Tab.TRANSITION_DURATION = 150; Tab.prototype.show = function () { - var $this = this.element - var $ul = $this.closest('ul:not(.dropdown-menu)') - var selector = $this.data('target') + var $this = this.element; + var $ul = $this.closest('ul:not(.dropdown-menu)'); + var selector = $this.data('target'); if (!selector) { - selector = $this.attr('href') + selector = $this.attr('href'); selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7 } - if ($this.parent('li').hasClass('active')) return + if ($this.parent('li').hasClass('active')) return; - var $previous = $ul.find('.active:last a') + var $previous = $ul.find('.active:last a'); var hideEvent = $.Event('hide.bs.tab', { relatedTarget: $this[0] - }) + }); var showEvent = $.Event('show.bs.tab', { relatedTarget: $previous[0] - }) + }); - $previous.trigger(hideEvent) - $this.trigger(showEvent) + $previous.trigger(hideEvent); + $this.trigger(showEvent); - if (showEvent.isDefaultPrevented() || hideEvent.isDefaultPrevented()) return + if (showEvent.isDefaultPrevented() || hideEvent.isDefaultPrevented()) return; - var $target = $(selector) + var $target = $(selector); - this.activate($this.closest('li'), $ul) + this.activate($this.closest('li'), $ul); this.activate($target, $target.parent(), function () { $previous.trigger({ type: 'hidden.bs.tab', relatedTarget: $this[0] - }) + }); $this.trigger({ type: 'shown.bs.tab', relatedTarget: $previous[0] }) }) - } + }; Tab.prototype.activate = function (element, container, callback) { - var $active = container.find('> .active') + var $active = container.find('> .active'); var transition = callback && $.support.transition - && ($active.length && $active.hasClass('fade') || !!container.find('> .fade').length) + && ($active.length && $active.hasClass('fade') || !!container.find('> .fade').length); function next() { $active @@ -2121,15 +2121,15 @@ if (typeof jQuery === 'undefined') { .removeClass('active') .end() .find('[data-toggle="tab"]') - .attr('aria-expanded', false) + .attr('aria-expanded', false); element .addClass('active') .find('[data-toggle="tab"]') - .attr('aria-expanded', true) + .attr('aria-expanded', true); if (transition) { - element[0].offsetWidth // reflow for transition + element[0].offsetWidth; // reflow for transition element.addClass('in') } else { element.removeClass('fade') @@ -2151,10 +2151,10 @@ if (typeof jQuery === 'undefined') { $active .one('bsTransitionEnd', next) .emulateTransitionEnd(Tab.TRANSITION_DURATION) : - next() + next(); $active.removeClass('in') - } + }; // TAB PLUGIN DEFINITION @@ -2162,36 +2162,36 @@ if (typeof jQuery === 'undefined') { function Plugin(option) { return this.each(function () { - var $this = $(this) - var data = $this.data('bs.tab') + var $this = $(this); + var data = $this.data('bs.tab'); - if (!data) $this.data('bs.tab', (data = new Tab(this))) + if (!data) $this.data('bs.tab', (data = new Tab(this))); if (typeof option == 'string') data[option]() }) } - var old = $.fn.tab + var old = $.fn.tab; - $.fn.tab = Plugin - $.fn.tab.Constructor = Tab + $.fn.tab = Plugin; + $.fn.tab.Constructor = Tab; // TAB NO CONFLICT // =============== $.fn.tab.noConflict = function () { - $.fn.tab = old + $.fn.tab = old; return this - } + }; // TAB DATA-API // ============ var clickHandler = function (e) { - e.preventDefault() + e.preventDefault(); Plugin.call($(this), 'show') - } + }; $(document) .on('click.bs.tab.data-api', '[data-toggle="tab"]', clickHandler) @@ -2215,90 +2215,90 @@ if (typeof jQuery === 'undefined') { // ====================== var Affix = function (element, options) { - this.options = $.extend({}, Affix.DEFAULTS, options) + this.options = $.extend({}, Affix.DEFAULTS, options); this.$target = $(this.options.target) .on('scroll.bs.affix.data-api', $.proxy(this.checkPosition, this)) - .on('click.bs.affix.data-api', $.proxy(this.checkPositionWithEventLoop, this)) + .on('click.bs.affix.data-api', $.proxy(this.checkPositionWithEventLoop, this)); - this.$element = $(element) - this.affixed = null - this.unpin = null - this.pinnedOffset = null + this.$element = $(element); + this.affixed = null; + this.unpin = null; + this.pinnedOffset = null; this.checkPosition() - } + }; - Affix.VERSION = '3.3.6' + Affix.VERSION = '3.3.6'; - Affix.RESET = 'affix affix-top affix-bottom' + Affix.RESET = 'affix affix-top affix-bottom'; Affix.DEFAULTS = { offset: 0, target: window - } + }; Affix.prototype.getState = function (scrollHeight, height, offsetTop, offsetBottom) { - var scrollTop = this.$target.scrollTop() - var position = this.$element.offset() - var targetHeight = this.$target.height() + var scrollTop = this.$target.scrollTop(); + var position = this.$element.offset(); + var targetHeight = this.$target.height(); - if (offsetTop != null && this.affixed == 'top') return scrollTop < offsetTop ? 'top' : false + if (offsetTop != null && this.affixed == 'top') return scrollTop < offsetTop ? 'top' : false; if (this.affixed == 'bottom') { - if (offsetTop != null) return (scrollTop + this.unpin <= position.top) ? false : 'bottom' + if (offsetTop != null) return (scrollTop + this.unpin <= position.top) ? false : 'bottom'; return (scrollTop + targetHeight <= scrollHeight - offsetBottom) ? false : 'bottom' } - var initializing = this.affixed == null - var colliderTop = initializing ? scrollTop : position.top - var colliderHeight = initializing ? targetHeight : height + var initializing = this.affixed == null; + var colliderTop = initializing ? scrollTop : position.top; + var colliderHeight = initializing ? targetHeight : height; - if (offsetTop != null && scrollTop <= offsetTop) return 'top' - if (offsetBottom != null && (colliderTop + colliderHeight >= scrollHeight - offsetBottom)) return 'bottom' + if (offsetTop != null && scrollTop <= offsetTop) return 'top'; + if (offsetBottom != null && (colliderTop + colliderHeight >= scrollHeight - offsetBottom)) return 'bottom'; return false - } + }; Affix.prototype.getPinnedOffset = function () { - if (this.pinnedOffset) return this.pinnedOffset - this.$element.removeClass(Affix.RESET).addClass('affix') - var scrollTop = this.$target.scrollTop() - var position = this.$element.offset() + if (this.pinnedOffset) return this.pinnedOffset; + this.$element.removeClass(Affix.RESET).addClass('affix'); + var scrollTop = this.$target.scrollTop(); + var position = this.$element.offset(); return (this.pinnedOffset = position.top - scrollTop) - } + }; Affix.prototype.checkPositionWithEventLoop = function () { setTimeout($.proxy(this.checkPosition, this), 1) - } + }; Affix.prototype.checkPosition = function () { - if (!this.$element.is(':visible')) return + if (!this.$element.is(':visible')) return; - var height = this.$element.height() - var offset = this.options.offset - var offsetTop = offset.top - var offsetBottom = offset.bottom - var scrollHeight = Math.max($(document).height(), $(document.body).height()) + var height = this.$element.height(); + var offset = this.options.offset; + var offsetTop = offset.top; + var offsetBottom = offset.bottom; + var scrollHeight = Math.max($(document).height(), $(document.body).height()); - if (typeof offset != 'object') offsetBottom = offsetTop = offset - if (typeof offsetTop == 'function') offsetTop = offset.top(this.$element) - if (typeof offsetBottom == 'function') offsetBottom = offset.bottom(this.$element) + if (typeof offset != 'object') offsetBottom = offsetTop = offset; + if (typeof offsetTop == 'function') offsetTop = offset.top(this.$element); + if (typeof offsetBottom == 'function') offsetBottom = offset.bottom(this.$element); - var affix = this.getState(scrollHeight, height, offsetTop, offsetBottom) + var affix = this.getState(scrollHeight, height, offsetTop, offsetBottom); if (this.affixed != affix) { - if (this.unpin != null) this.$element.css('top', '') + if (this.unpin != null) this.$element.css('top', ''); - var affixType = 'affix' + (affix ? '-' + affix : '') - var e = $.Event(affixType + '.bs.affix') + var affixType = 'affix' + (affix ? '-' + affix : ''); + var e = $.Event(affixType + '.bs.affix'); - this.$element.trigger(e) + this.$element.trigger(e); - if (e.isDefaultPrevented()) return + if (e.isDefaultPrevented()) return; - this.affixed = affix - this.unpin = affix == 'bottom' ? this.getPinnedOffset() : null + this.affixed = affix; + this.unpin = affix == 'bottom' ? this.getPinnedOffset() : null; this.$element .removeClass(Affix.RESET) @@ -2311,7 +2311,7 @@ if (typeof jQuery === 'undefined') { top: scrollHeight - height - offsetBottom }) } - } + }; // AFFIX PLUGIN DEFINITION @@ -2319,28 +2319,28 @@ if (typeof jQuery === 'undefined') { function Plugin(option) { return this.each(function () { - var $this = $(this) - var data = $this.data('bs.affix') - var options = typeof option == 'object' && option + var $this = $(this); + var data = $this.data('bs.affix'); + var options = typeof option == 'object' && option; - if (!data) $this.data('bs.affix', (data = new Affix(this, options))) + if (!data) $this.data('bs.affix', (data = new Affix(this, options))); if (typeof option == 'string') data[option]() }) } - var old = $.fn.affix + var old = $.fn.affix; - $.fn.affix = Plugin - $.fn.affix.Constructor = Affix + $.fn.affix = Plugin; + $.fn.affix.Constructor = Affix; // AFFIX NO CONFLICT // ================= $.fn.affix.noConflict = function () { - $.fn.affix = old + $.fn.affix = old; return this - } + }; // AFFIX DATA-API @@ -2348,13 +2348,13 @@ if (typeof jQuery === 'undefined') { $(window).on('load', function () { $('[data-spy="affix"]').each(function () { - var $spy = $(this) - var data = $spy.data() + var $spy = $(this); + var data = $spy.data(); - data.offset = data.offset || {} + data.offset = data.offset || {}; - if (data.offsetBottom != null) data.offset.bottom = data.offsetBottom - if (data.offsetTop != null) data.offset.top = data.offsetTop + if (data.offsetBottom != null) data.offset.bottom = data.offsetBottom; + if (data.offsetTop != null) data.offset.top = data.offsetTop; Plugin.call($spy, data) }) diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap/js/bootstrap.min.js b/Plan/common/src/main/resources/assets/web/plugins/bootstrap/js/bootstrap.min.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/bootstrap/js/bootstrap.min.js rename to Plan/common/src/main/resources/assets/web/plugins/bootstrap/js/bootstrap.min.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap/js/npm.js b/Plan/common/src/main/resources/assets/web/plugins/bootstrap/js/npm.js new file mode 100644 index 000000000..f5825e753 --- /dev/null +++ b/Plan/common/src/main/resources/assets/web/plugins/bootstrap/js/npm.js @@ -0,0 +1,13 @@ +// This file is autogenerated via the `commonjs` Grunt task. You can require() this file in a CommonJS environment. +require('../../js/transition.js'); +require('../../js/alert.js'); +require('../../js/button.js'); +require('../../js/carousel.js'); +require('../../js/collapse.js'); +require('../../js/dropdown.js'); +require('../../js/modal.js'); +require('../../js/tooltip.js'); +require('../../js/popover.js'); +require('../../js/scrollspy.js'); +require('../../js/tab.js'); +require('../../js/affix.js'); \ No newline at end of file diff --git a/Plan/common/src/main/resources/web/plugins/fullcalendar/fullcalendar.min.css b/Plan/common/src/main/resources/assets/web/plugins/fullcalendar/fullcalendar.min.css similarity index 100% rename from Plan/common/src/main/resources/web/plugins/fullcalendar/fullcalendar.min.css rename to Plan/common/src/main/resources/assets/web/plugins/fullcalendar/fullcalendar.min.css diff --git a/Plan/common/src/main/resources/web/plugins/fullcalendar/fullcalendar.min.js b/Plan/common/src/main/resources/assets/web/plugins/fullcalendar/fullcalendar.min.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/fullcalendar/fullcalendar.min.js rename to Plan/common/src/main/resources/assets/web/plugins/fullcalendar/fullcalendar.min.js diff --git a/Plan/common/src/main/resources/web/plugins/jquery-cookie/jquery.cookie.js b/Plan/common/src/main/resources/assets/web/plugins/jquery-cookie/jquery.cookie.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/jquery-cookie/jquery.cookie.js rename to Plan/common/src/main/resources/assets/web/plugins/jquery-cookie/jquery.cookie.js diff --git a/Plan/common/src/main/resources/web/plugins/jquery-countto/jquery.countTo.js b/Plan/common/src/main/resources/assets/web/plugins/jquery-countto/jquery.countTo.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/jquery-countto/jquery.countTo.js rename to Plan/common/src/main/resources/assets/web/plugins/jquery-countto/jquery.countTo.js diff --git a/Plan/common/src/main/resources/web/plugins/jquery-datatable/jquery.dataTables.js b/Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/jquery.dataTables.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/jquery-datatable/jquery.dataTables.js rename to Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/jquery.dataTables.js diff --git a/Plan/common/src/main/resources/web/plugins/jquery-datatable/skin/bootstrap/css/dataTables.bootstrap.css b/Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/css/dataTables.bootstrap.css similarity index 100% rename from Plan/common/src/main/resources/web/plugins/jquery-datatable/skin/bootstrap/css/dataTables.bootstrap.css rename to Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/css/dataTables.bootstrap.css diff --git a/Plan/common/src/main/resources/web/plugins/jquery-datatable/skin/bootstrap/css/dataTables.bootstrap.min.css b/Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/css/dataTables.bootstrap.min.css similarity index 100% rename from Plan/common/src/main/resources/web/plugins/jquery-datatable/skin/bootstrap/css/dataTables.bootstrap.min.css rename to Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/css/dataTables.bootstrap.min.css diff --git a/Plan/common/src/main/resources/web/plugins/jquery-datatable/skin/bootstrap/images/Sorting icons.psd b/Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/images/Sorting icons.psd similarity index 100% rename from Plan/common/src/main/resources/web/plugins/jquery-datatable/skin/bootstrap/images/Sorting icons.psd rename to Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/images/Sorting icons.psd diff --git a/Plan/common/src/main/resources/web/plugins/jquery-datatable/skin/bootstrap/images/favicon.ico b/Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/images/favicon.ico similarity index 100% rename from Plan/common/src/main/resources/web/plugins/jquery-datatable/skin/bootstrap/images/favicon.ico rename to Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/images/favicon.ico diff --git a/Plan/common/src/main/resources/web/plugins/jquery-datatable/skin/bootstrap/images/sort_asc.png b/Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/images/sort_asc.png similarity index 100% rename from Plan/common/src/main/resources/web/plugins/jquery-datatable/skin/bootstrap/images/sort_asc.png rename to Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/images/sort_asc.png diff --git a/Plan/common/src/main/resources/web/plugins/jquery-datatable/skin/bootstrap/images/sort_asc_disabled.png b/Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/images/sort_asc_disabled.png similarity index 100% rename from Plan/common/src/main/resources/web/plugins/jquery-datatable/skin/bootstrap/images/sort_asc_disabled.png rename to Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/images/sort_asc_disabled.png diff --git a/Plan/common/src/main/resources/web/plugins/jquery-datatable/skin/bootstrap/images/sort_both.png b/Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/images/sort_both.png similarity index 100% rename from Plan/common/src/main/resources/web/plugins/jquery-datatable/skin/bootstrap/images/sort_both.png rename to Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/images/sort_both.png diff --git a/Plan/common/src/main/resources/web/plugins/jquery-datatable/skin/bootstrap/images/sort_desc.png b/Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/images/sort_desc.png similarity index 100% rename from Plan/common/src/main/resources/web/plugins/jquery-datatable/skin/bootstrap/images/sort_desc.png rename to Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/images/sort_desc.png diff --git a/Plan/common/src/main/resources/web/plugins/jquery-datatable/skin/bootstrap/images/sort_desc_disabled.png b/Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/images/sort_desc_disabled.png similarity index 100% rename from Plan/common/src/main/resources/web/plugins/jquery-datatable/skin/bootstrap/images/sort_desc_disabled.png rename to Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/images/sort_desc_disabled.png diff --git a/Plan/common/src/main/resources/web/plugins/jquery-datatable/skin/bootstrap/js/dataTables.bootstrap.js b/Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/js/dataTables.bootstrap.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/jquery-datatable/skin/bootstrap/js/dataTables.bootstrap.js rename to Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/js/dataTables.bootstrap.js diff --git a/Plan/common/src/main/resources/web/plugins/jquery-datatable/skin/bootstrap/js/dataTables.bootstrap.min.js b/Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/js/dataTables.bootstrap.min.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/jquery-datatable/skin/bootstrap/js/dataTables.bootstrap.min.js rename to Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/js/dataTables.bootstrap.min.js diff --git a/Plan/common/src/main/resources/web/plugins/jquery-inputmask/inputmask/inputmask.date.extensions.js b/Plan/common/src/main/resources/assets/web/plugins/jquery-inputmask/inputmask/inputmask.date.extensions.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/jquery-inputmask/inputmask/inputmask.date.extensions.js rename to Plan/common/src/main/resources/assets/web/plugins/jquery-inputmask/inputmask/inputmask.date.extensions.js diff --git a/Plan/common/src/main/resources/web/plugins/jquery-inputmask/inputmask/inputmask.dependencyLib.jquery.js b/Plan/common/src/main/resources/assets/web/plugins/jquery-inputmask/inputmask/inputmask.dependencyLib.jquery.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/jquery-inputmask/inputmask/inputmask.dependencyLib.jquery.js rename to Plan/common/src/main/resources/assets/web/plugins/jquery-inputmask/inputmask/inputmask.dependencyLib.jquery.js diff --git a/Plan/common/src/main/resources/web/plugins/jquery-inputmask/inputmask/inputmask.extensions.js b/Plan/common/src/main/resources/assets/web/plugins/jquery-inputmask/inputmask/inputmask.extensions.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/jquery-inputmask/inputmask/inputmask.extensions.js rename to Plan/common/src/main/resources/assets/web/plugins/jquery-inputmask/inputmask/inputmask.extensions.js diff --git a/Plan/common/src/main/resources/web/plugins/jquery-inputmask/inputmask/inputmask.js b/Plan/common/src/main/resources/assets/web/plugins/jquery-inputmask/inputmask/inputmask.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/jquery-inputmask/inputmask/inputmask.js rename to Plan/common/src/main/resources/assets/web/plugins/jquery-inputmask/inputmask/inputmask.js diff --git a/Plan/common/src/main/resources/web/plugins/jquery-inputmask/inputmask/inputmask.numeric.extensions.js b/Plan/common/src/main/resources/assets/web/plugins/jquery-inputmask/inputmask/inputmask.numeric.extensions.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/jquery-inputmask/inputmask/inputmask.numeric.extensions.js rename to Plan/common/src/main/resources/assets/web/plugins/jquery-inputmask/inputmask/inputmask.numeric.extensions.js diff --git a/Plan/common/src/main/resources/web/plugins/jquery-inputmask/inputmask/inputmask.phone.extensions.js b/Plan/common/src/main/resources/assets/web/plugins/jquery-inputmask/inputmask/inputmask.phone.extensions.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/jquery-inputmask/inputmask/inputmask.phone.extensions.js rename to Plan/common/src/main/resources/assets/web/plugins/jquery-inputmask/inputmask/inputmask.phone.extensions.js diff --git a/Plan/common/src/main/resources/web/plugins/jquery-inputmask/inputmask/inputmask.regex.extensions.js b/Plan/common/src/main/resources/assets/web/plugins/jquery-inputmask/inputmask/inputmask.regex.extensions.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/jquery-inputmask/inputmask/inputmask.regex.extensions.js rename to Plan/common/src/main/resources/assets/web/plugins/jquery-inputmask/inputmask/inputmask.regex.extensions.js diff --git a/Plan/common/src/main/resources/web/plugins/jquery-inputmask/inputmask/jquery.inputmask.js b/Plan/common/src/main/resources/assets/web/plugins/jquery-inputmask/inputmask/jquery.inputmask.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/jquery-inputmask/inputmask/jquery.inputmask.js rename to Plan/common/src/main/resources/assets/web/plugins/jquery-inputmask/inputmask/jquery.inputmask.js diff --git a/Plan/common/src/main/resources/web/plugins/jquery-inputmask/jquery.inputmask.bundle.js b/Plan/common/src/main/resources/assets/web/plugins/jquery-inputmask/jquery.inputmask.bundle.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/jquery-inputmask/jquery.inputmask.bundle.js rename to Plan/common/src/main/resources/assets/web/plugins/jquery-inputmask/jquery.inputmask.bundle.js diff --git a/Plan/common/src/main/resources/web/plugins/jquery-knob/jquery.knob.min.js b/Plan/common/src/main/resources/assets/web/plugins/jquery-knob/jquery.knob.min.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/jquery-knob/jquery.knob.min.js rename to Plan/common/src/main/resources/assets/web/plugins/jquery-knob/jquery.knob.min.js diff --git a/Plan/common/src/main/resources/web/plugins/jquery-slimscroll/jquery.slimscroll.js b/Plan/common/src/main/resources/assets/web/plugins/jquery-slimscroll/jquery.slimscroll.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/jquery-slimscroll/jquery.slimscroll.js rename to Plan/common/src/main/resources/assets/web/plugins/jquery-slimscroll/jquery.slimscroll.js diff --git a/Plan/common/src/main/resources/web/plugins/jquery-spinner/css/bootstrap-spinner.css b/Plan/common/src/main/resources/assets/web/plugins/jquery-spinner/css/bootstrap-spinner.css similarity index 100% rename from Plan/common/src/main/resources/web/plugins/jquery-spinner/css/bootstrap-spinner.css rename to Plan/common/src/main/resources/assets/web/plugins/jquery-spinner/css/bootstrap-spinner.css diff --git a/Plan/common/src/main/resources/web/plugins/jquery-spinner/css/bootstrap-spinner.css.map b/Plan/common/src/main/resources/assets/web/plugins/jquery-spinner/css/bootstrap-spinner.css.map similarity index 100% rename from Plan/common/src/main/resources/web/plugins/jquery-spinner/css/bootstrap-spinner.css.map rename to Plan/common/src/main/resources/assets/web/plugins/jquery-spinner/css/bootstrap-spinner.css.map diff --git a/Plan/common/src/main/resources/web/plugins/jquery-spinner/css/bootstrap-spinner.min.css b/Plan/common/src/main/resources/assets/web/plugins/jquery-spinner/css/bootstrap-spinner.min.css similarity index 100% rename from Plan/common/src/main/resources/web/plugins/jquery-spinner/css/bootstrap-spinner.min.css rename to Plan/common/src/main/resources/assets/web/plugins/jquery-spinner/css/bootstrap-spinner.min.css diff --git a/Plan/common/src/main/resources/web/plugins/jquery-spinner/js/jquery.spinner.js b/Plan/common/src/main/resources/assets/web/plugins/jquery-spinner/js/jquery.spinner.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/jquery-spinner/js/jquery.spinner.js rename to Plan/common/src/main/resources/assets/web/plugins/jquery-spinner/js/jquery.spinner.js diff --git a/Plan/common/src/main/resources/web/plugins/jquery-spinner/js/jquery.spinner.min.js b/Plan/common/src/main/resources/assets/web/plugins/jquery-spinner/js/jquery.spinner.min.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/jquery-spinner/js/jquery.spinner.min.js rename to Plan/common/src/main/resources/assets/web/plugins/jquery-spinner/js/jquery.spinner.min.js diff --git a/Plan/common/src/main/resources/web/plugins/jquery-steps/jquery.steps.css b/Plan/common/src/main/resources/assets/web/plugins/jquery-steps/jquery.steps.css similarity index 100% rename from Plan/common/src/main/resources/web/plugins/jquery-steps/jquery.steps.css rename to Plan/common/src/main/resources/assets/web/plugins/jquery-steps/jquery.steps.css diff --git a/Plan/common/src/main/resources/web/plugins/jquery-steps/jquery.steps.js b/Plan/common/src/main/resources/assets/web/plugins/jquery-steps/jquery.steps.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/jquery-steps/jquery.steps.js rename to Plan/common/src/main/resources/assets/web/plugins/jquery-steps/jquery.steps.js diff --git a/Plan/common/src/main/resources/web/plugins/jquery-steps/jquery.steps.min.js b/Plan/common/src/main/resources/assets/web/plugins/jquery-steps/jquery.steps.min.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/jquery-steps/jquery.steps.min.js rename to Plan/common/src/main/resources/assets/web/plugins/jquery-steps/jquery.steps.min.js diff --git a/Plan/common/src/main/resources/web/plugins/jquery/jquery.js b/Plan/common/src/main/resources/assets/web/plugins/jquery/jquery.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/jquery/jquery.js rename to Plan/common/src/main/resources/assets/web/plugins/jquery/jquery.js diff --git a/Plan/common/src/main/resources/web/plugins/jquery/jquery.min.js b/Plan/common/src/main/resources/assets/web/plugins/jquery/jquery.min.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/jquery/jquery.min.js rename to Plan/common/src/main/resources/assets/web/plugins/jquery/jquery.min.js diff --git a/Plan/common/src/main/resources/web/plugins/jquery/jquery.min.map b/Plan/common/src/main/resources/assets/web/plugins/jquery/jquery.min.map similarity index 100% rename from Plan/common/src/main/resources/web/plugins/jquery/jquery.min.map rename to Plan/common/src/main/resources/assets/web/plugins/jquery/jquery.min.map diff --git a/Plan/common/src/main/resources/web/plugins/material-design-iconic-font/css/material-design-iconic-font.css b/Plan/common/src/main/resources/assets/web/plugins/material-design-iconic-font/css/material-design-iconic-font.css similarity index 100% rename from Plan/common/src/main/resources/web/plugins/material-design-iconic-font/css/material-design-iconic-font.css rename to Plan/common/src/main/resources/assets/web/plugins/material-design-iconic-font/css/material-design-iconic-font.css diff --git a/Plan/common/src/main/resources/web/plugins/material-design-iconic-font/css/material-design-iconic-font.min.css b/Plan/common/src/main/resources/assets/web/plugins/material-design-iconic-font/css/material-design-iconic-font.min.css similarity index 100% rename from Plan/common/src/main/resources/web/plugins/material-design-iconic-font/css/material-design-iconic-font.min.css rename to Plan/common/src/main/resources/assets/web/plugins/material-design-iconic-font/css/material-design-iconic-font.min.css diff --git a/Plan/common/src/main/resources/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.eot b/Plan/common/src/main/resources/assets/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.eot similarity index 100% rename from Plan/common/src/main/resources/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.eot rename to Plan/common/src/main/resources/assets/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.eot diff --git a/Plan/common/src/main/resources/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.svg b/Plan/common/src/main/resources/assets/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.svg similarity index 100% rename from Plan/common/src/main/resources/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.svg rename to Plan/common/src/main/resources/assets/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.svg diff --git a/Plan/common/src/main/resources/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.ttf b/Plan/common/src/main/resources/assets/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.ttf similarity index 100% rename from Plan/common/src/main/resources/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.ttf rename to Plan/common/src/main/resources/assets/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.ttf diff --git a/Plan/common/src/main/resources/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.woff b/Plan/common/src/main/resources/assets/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.woff similarity index 100% rename from Plan/common/src/main/resources/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.woff rename to Plan/common/src/main/resources/assets/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.woff diff --git a/Plan/common/src/main/resources/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.woff2 b/Plan/common/src/main/resources/assets/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.woff2 similarity index 100% rename from Plan/common/src/main/resources/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.woff2 rename to Plan/common/src/main/resources/assets/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.woff2 diff --git a/Plan/common/src/main/resources/web/plugins/materialize-css/css/materialize.css b/Plan/common/src/main/resources/assets/web/plugins/materialize-css/css/materialize.css similarity index 100% rename from Plan/common/src/main/resources/web/plugins/materialize-css/css/materialize.css rename to Plan/common/src/main/resources/assets/web/plugins/materialize-css/css/materialize.css diff --git a/Plan/common/src/main/resources/web/plugins/materialize-css/css/materialize.min.css b/Plan/common/src/main/resources/assets/web/plugins/materialize-css/css/materialize.min.css similarity index 100% rename from Plan/common/src/main/resources/web/plugins/materialize-css/css/materialize.min.css rename to Plan/common/src/main/resources/assets/web/plugins/materialize-css/css/materialize.min.css diff --git a/Plan/common/src/main/resources/web/plugins/materialize-css/js/materialize.js b/Plan/common/src/main/resources/assets/web/plugins/materialize-css/js/materialize.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/materialize-css/js/materialize.js rename to Plan/common/src/main/resources/assets/web/plugins/materialize-css/js/materialize.js diff --git a/Plan/common/src/main/resources/web/plugins/materialize-css/js/materialize.min.js b/Plan/common/src/main/resources/assets/web/plugins/materialize-css/js/materialize.min.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/materialize-css/js/materialize.min.js rename to Plan/common/src/main/resources/assets/web/plugins/materialize-css/js/materialize.min.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/momentjs/ender.js b/Plan/common/src/main/resources/assets/web/plugins/momentjs/ender.js new file mode 100644 index 000000000..923b842e6 --- /dev/null +++ b/Plan/common/src/main/resources/assets/web/plugins/momentjs/ender.js @@ -0,0 +1 @@ +$.ender({ moment: require('moment') }); diff --git a/Plan/common/src/main/resources/web/plugins/momentjs/moment.js b/Plan/common/src/main/resources/assets/web/plugins/momentjs/moment.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/momentjs/moment.js rename to Plan/common/src/main/resources/assets/web/plugins/momentjs/moment.js diff --git a/Plan/common/src/main/resources/web/plugins/momentjs/package.js b/Plan/common/src/main/resources/assets/web/plugins/momentjs/package.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/momentjs/package.js rename to Plan/common/src/main/resources/assets/web/plugins/momentjs/package.js diff --git a/Plan/common/src/main/resources/web/plugins/multi-select/css/multi-select.css b/Plan/common/src/main/resources/assets/web/plugins/multi-select/css/multi-select.css similarity index 100% rename from Plan/common/src/main/resources/web/plugins/multi-select/css/multi-select.css rename to Plan/common/src/main/resources/assets/web/plugins/multi-select/css/multi-select.css diff --git a/Plan/common/src/main/resources/web/plugins/multi-select/img/switch.png b/Plan/common/src/main/resources/assets/web/plugins/multi-select/img/switch.png similarity index 100% rename from Plan/common/src/main/resources/web/plugins/multi-select/img/switch.png rename to Plan/common/src/main/resources/assets/web/plugins/multi-select/img/switch.png diff --git a/Plan/common/src/main/resources/web/plugins/multi-select/js/jquery.multi-select.js b/Plan/common/src/main/resources/assets/web/plugins/multi-select/js/jquery.multi-select.js similarity index 99% rename from Plan/common/src/main/resources/web/plugins/multi-select/js/jquery.multi-select.js rename to Plan/common/src/main/resources/assets/web/plugins/multi-select/js/jquery.multi-select.js index fb478f58f..98eb6aedd 100644 --- a/Plan/common/src/main/resources/web/plugins/multi-select/js/jquery.multi-select.js +++ b/Plan/common/src/main/resources/assets/web/plugins/multi-select/js/jquery.multi-select.js @@ -234,7 +234,7 @@ e.preventDefault(); e.stopPropagation(); that.selectHighlighted($list); - return; + } }); }, diff --git a/Plan/common/src/main/resources/web/plugins/nestable/jquery-nestable.css b/Plan/common/src/main/resources/assets/web/plugins/nestable/jquery-nestable.css similarity index 100% rename from Plan/common/src/main/resources/web/plugins/nestable/jquery-nestable.css rename to Plan/common/src/main/resources/assets/web/plugins/nestable/jquery-nestable.css diff --git a/Plan/common/src/main/resources/web/plugins/nestable/jquery.nestable.js b/Plan/common/src/main/resources/assets/web/plugins/nestable/jquery.nestable.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/nestable/jquery.nestable.js rename to Plan/common/src/main/resources/assets/web/plugins/nestable/jquery.nestable.js diff --git a/Plan/common/src/main/resources/web/plugins/node-waves/waves.css b/Plan/common/src/main/resources/assets/web/plugins/node-waves/waves.css similarity index 100% rename from Plan/common/src/main/resources/web/plugins/node-waves/waves.css rename to Plan/common/src/main/resources/assets/web/plugins/node-waves/waves.css diff --git a/Plan/common/src/main/resources/web/plugins/node-waves/waves.js b/Plan/common/src/main/resources/assets/web/plugins/node-waves/waves.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/node-waves/waves.js rename to Plan/common/src/main/resources/assets/web/plugins/node-waves/waves.js diff --git a/Plan/common/src/main/resources/web/plugins/node-waves/waves.min.css b/Plan/common/src/main/resources/assets/web/plugins/node-waves/waves.min.css similarity index 100% rename from Plan/common/src/main/resources/web/plugins/node-waves/waves.min.css rename to Plan/common/src/main/resources/assets/web/plugins/node-waves/waves.min.css diff --git a/Plan/common/src/main/resources/web/plugins/node-waves/waves.min.js b/Plan/common/src/main/resources/assets/web/plugins/node-waves/waves.min.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/node-waves/waves.min.js rename to Plan/common/src/main/resources/assets/web/plugins/node-waves/waves.min.js diff --git a/Plan/common/src/main/resources/web/plugins/node-waves/waves.min.js.map b/Plan/common/src/main/resources/assets/web/plugins/node-waves/waves.min.js.map similarity index 100% rename from Plan/common/src/main/resources/web/plugins/node-waves/waves.min.js.map rename to Plan/common/src/main/resources/assets/web/plugins/node-waves/waves.min.js.map diff --git a/Plan/common/src/main/resources/web/plugins/nouislider/nouislider.js b/Plan/common/src/main/resources/assets/web/plugins/nouislider/nouislider.js similarity index 99% rename from Plan/common/src/main/resources/web/plugins/nouislider/nouislider.js rename to Plan/common/src/main/resources/assets/web/plugins/nouislider/nouislider.js index 4b6f6e27c..a89c56fbd 100644 --- a/Plan/common/src/main/resources/web/plugins/nouislider/nouislider.js +++ b/Plan/common/src/main/resources/assets/web/plugins/nouislider/nouislider.js @@ -626,7 +626,7 @@ var i; if ( entry === false ) { - return; + } else if ( entry === true ) { parsed.tooltips = []; diff --git a/Plan/common/src/main/resources/web/plugins/nouislider/nouislider.min.css b/Plan/common/src/main/resources/assets/web/plugins/nouislider/nouislider.min.css similarity index 100% rename from Plan/common/src/main/resources/web/plugins/nouislider/nouislider.min.css rename to Plan/common/src/main/resources/assets/web/plugins/nouislider/nouislider.min.css diff --git a/Plan/common/src/main/resources/web/plugins/nouislider/nouislider.min.js b/Plan/common/src/main/resources/assets/web/plugins/nouislider/nouislider.min.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/nouislider/nouislider.min.js rename to Plan/common/src/main/resources/assets/web/plugins/nouislider/nouislider.min.js diff --git a/Plan/common/src/main/resources/web/plugins/waitme/img.svg b/Plan/common/src/main/resources/assets/web/plugins/waitme/img.svg similarity index 100% rename from Plan/common/src/main/resources/web/plugins/waitme/img.svg rename to Plan/common/src/main/resources/assets/web/plugins/waitme/img.svg diff --git a/Plan/common/src/main/resources/web/plugins/waitme/waitMe.css b/Plan/common/src/main/resources/assets/web/plugins/waitme/waitMe.css similarity index 100% rename from Plan/common/src/main/resources/web/plugins/waitme/waitMe.css rename to Plan/common/src/main/resources/assets/web/plugins/waitme/waitMe.css diff --git a/Plan/common/src/main/resources/web/plugins/waitme/waitMe.js b/Plan/common/src/main/resources/assets/web/plugins/waitme/waitMe.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/waitme/waitMe.js rename to Plan/common/src/main/resources/assets/web/plugins/waitme/waitMe.js diff --git a/Plan/common/src/main/resources/web/plugins/waitme/waitMe.min.css b/Plan/common/src/main/resources/assets/web/plugins/waitme/waitMe.min.css similarity index 100% rename from Plan/common/src/main/resources/web/plugins/waitme/waitMe.min.css rename to Plan/common/src/main/resources/assets/web/plugins/waitme/waitMe.min.css diff --git a/Plan/common/src/main/resources/web/plugins/waitme/waitMe.min.js b/Plan/common/src/main/resources/assets/web/plugins/waitme/waitMe.min.js similarity index 100% rename from Plan/common/src/main/resources/web/plugins/waitme/waitMe.min.js rename to Plan/common/src/main/resources/assets/web/plugins/waitme/waitMe.min.js diff --git a/Plan/common/src/main/resources/web/server.html b/Plan/common/src/main/resources/assets/web/server.html similarity index 100% rename from Plan/common/src/main/resources/web/server.html rename to Plan/common/src/main/resources/assets/web/server.html diff --git a/Plan/common/src/main/resources/web/plugins/bootstrap/js/npm.js b/Plan/common/src/main/resources/web/plugins/bootstrap/js/npm.js deleted file mode 100644 index bf6aa8060..000000000 --- a/Plan/common/src/main/resources/web/plugins/bootstrap/js/npm.js +++ /dev/null @@ -1,13 +0,0 @@ -// This file is autogenerated via the `commonjs` Grunt task. You can require() this file in a CommonJS environment. -require('../../js/transition.js') -require('../../js/alert.js') -require('../../js/button.js') -require('../../js/carousel.js') -require('../../js/collapse.js') -require('../../js/dropdown.js') -require('../../js/modal.js') -require('../../js/tooltip.js') -require('../../js/popover.js') -require('../../js/scrollspy.js') -require('../../js/tab.js') -require('../../js/affix.js') \ No newline at end of file diff --git a/Plan/common/src/main/resources/web/plugins/momentjs/ender.js b/Plan/common/src/main/resources/web/plugins/momentjs/ender.js deleted file mode 100644 index 71462a770..000000000 --- a/Plan/common/src/main/resources/web/plugins/momentjs/ender.js +++ /dev/null @@ -1 +0,0 @@ -$.ender({ moment: require('moment') }) diff --git a/Plan/common/src/test/java/com/djrapitops/plan/system/locale/LocaleFileWriterTest.java b/Plan/common/src/test/java/com/djrapitops/plan/system/locale/LocaleFileWriterTest.java index 3045df517..475f37bec 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/system/locale/LocaleFileWriterTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/system/locale/LocaleFileWriterTest.java @@ -16,14 +16,13 @@ */ package com.djrapitops.plan.system.locale; -import com.djrapitops.plan.utilities.file.FileUtil; +import com.djrapitops.plan.system.file.FileResource; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; import java.io.File; import java.io.IOException; -import java.nio.charset.StandardCharsets; import static org.junit.Assert.assertEquals; @@ -43,7 +42,7 @@ public class LocaleFileWriterTest { new LocaleFileWriter(new Locale()).writeToFile(file); long expected = LocaleSystem.getIdentifiers().size(); - int result = FileUtil.lines(file, StandardCharsets.UTF_8).size(); + int result = FileResource.lines(file).size(); assertEquals(expected, result); } diff --git a/Plan/common/src/test/java/com/djrapitops/plan/system/settings/ConfigSettingKeyTest.java b/Plan/common/src/test/java/com/djrapitops/plan/system/settings/ConfigSettingKeyTest.java index e5e5b2e74..f234a6110 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/system/settings/ConfigSettingKeyTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/system/settings/ConfigSettingKeyTest.java @@ -130,7 +130,7 @@ public class ConfigSettingKeyTest { private PlanConfig createConfig(String copyDefaultSettingsFrom) throws IOException { File configFile = temporaryFolder.newFile(); - TestResources.copyResourceIntoFile(configFile, "/" + copyDefaultSettingsFrom); + TestResources.copyResourceIntoFile(configFile, "/assets/" + copyDefaultSettingsFrom); return createConfig(configFile); } diff --git a/Plan/common/src/test/java/com/djrapitops/plan/system/settings/changes/ConfigUpdaterTest.java b/Plan/common/src/test/java/com/djrapitops/plan/system/settings/changes/ConfigUpdaterTest.java index 1f5ae27ae..9e5e69152 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/system/settings/changes/ConfigUpdaterTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/system/settings/changes/ConfigUpdaterTest.java @@ -70,10 +70,10 @@ class ConfigUpdaterTest { Files.copy(bungeeConfigResource.toPath(), oldBungeeConfig.toPath(), StandardCopyOption.REPLACE_EXISTING); newConfig = tempDir.resolve("newconfig.yml"); - TestResources.copyResourceIntoFile(newConfig.toFile(), "/config.yml"); + TestResources.copyResourceIntoFile(newConfig.toFile(), "/assets/config.yml"); newBungeeConfig = tempDir.resolve("newbungeeconfig.yml"); - TestResources.copyResourceIntoFile(newBungeeConfig.toFile(), "/bungeeconfig.yml"); + TestResources.copyResourceIntoFile(newBungeeConfig.toFile(), "/assets/bungeeconfig.yml"); PluginLogger testLogger = new TestPluginLogger(); UNDER_TEST = new ConfigUpdater(testLogger, new ConsoleErrorLogger(testLogger)); diff --git a/Plan/common/src/test/java/com/djrapitops/plan/system/settings/config/ConfigWriterTest.java b/Plan/common/src/test/java/com/djrapitops/plan/system/settings/config/ConfigWriterTest.java index d75c7ad4d..6017e205d 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/system/settings/config/ConfigWriterTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/system/settings/config/ConfigWriterTest.java @@ -16,7 +16,7 @@ */ package com.djrapitops.plan.system.settings.config; -import com.djrapitops.plan.utilities.file.FileUtil; +import com.djrapitops.plan.system.file.FileResource; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; @@ -54,14 +54,14 @@ class ConfigWriterTest { File original = tempFolder.resolve("loaded.yml").toFile(); File written = tempFolder.resolve("written.yml").toFile(); - TestResources.copyResourceIntoFile(original, "/config.yml"); + TestResources.copyResourceIntoFile(original, "/assets/config.yml"); try (ConfigReader reader = new ConfigReader(Files.newInputStream(original.toPath()))) { new ConfigWriter(written.toPath()).write(reader.read()); } - List originalLines = FileUtil.lines(original); - List writtenLines = FileUtil.lines(written); + List originalLines = FileResource.lines(original); + List writtenLines = FileResource.lines(written); assertFalse(originalLines.isEmpty()); assertFalse(writtenLines.isEmpty()); @@ -84,7 +84,7 @@ class ConfigWriterTest { File indented = tempFolder.resolve("indented.yml").toFile(); File written = tempFolder.resolve("written.yml").toFile(); - TestResources.copyResourceIntoFile(original, "/config.yml"); + TestResources.copyResourceIntoFile(original, "/assets/config.yml"); try (ConfigReader reader = new ConfigReader(Files.newInputStream(original.toPath()))) { new ConfigWriter(indented.toPath()).write(reader.read()); @@ -93,8 +93,8 @@ class ConfigWriterTest { new ConfigWriter(written.toPath()).write(reader.read()); } - List originalLines = FileUtil.lines(indented); - List writtenLines = FileUtil.lines(written); + List originalLines = FileResource.lines(indented); + List writtenLines = FileResource.lines(written); assertFalse(originalLines.isEmpty()); assertFalse(writtenLines.isEmpty()); @@ -119,7 +119,7 @@ class ConfigWriterTest { Path out = tempFolder.resolve("listIndent.yml"); new ConfigWriter(out).write(root); - List writtenLines = FileUtil.lines(out.toFile()); + List writtenLines = FileResource.lines(out.toFile()); List expected = Arrays.asList( "Test:", " - First", @@ -137,7 +137,7 @@ class ConfigWriterTest { Path out = tempFolder.resolve("listIndent.yml"); new ConfigWriter(out).write(root); - List writtenLines = FileUtil.lines(out.toFile()); + List writtenLines = FileResource.lines(out.toFile()); List expected = Arrays.asList( "Test:", " List:", @@ -159,7 +159,7 @@ class ConfigWriterTest { Path out = tempFolder.resolve("listIndent.yml"); new ConfigWriter(out).write(root); - List writtenLines = FileUtil.lines(out.toFile()); + List writtenLines = FileResource.lines(out.toFile()); List expected = Arrays.asList( "Test:", " List:", diff --git a/Plan/common/src/test/java/utilities/mocks/Mocker.java b/Plan/common/src/test/java/utilities/mocks/Mocker.java index b5bb39d9c..ba089a206 100644 --- a/Plan/common/src/test/java/utilities/mocks/Mocker.java +++ b/Plan/common/src/test/java/utilities/mocks/Mocker.java @@ -46,8 +46,8 @@ abstract class Mocker { throw new IllegalStateException("withDataFolder needs to be called before setting files"); } try { - File file = getFile("/" + fileName); - doReturn(Files.newInputStream(file.toPath())).when(planMock).getResource(fileName); + File file = getFile("/assets/" + fileName); + doReturn(Files.newInputStream(file.toPath())).when(planMock).getResource("assets/" + fileName); } catch (NullPointerException e) { System.out.println("File is missing! " + fileName); } diff --git a/Plan/sponge/src/main/java/com/djrapitops/plan/modules/sponge/SpongeSuperClassBindingModule.java b/Plan/sponge/src/main/java/com/djrapitops/plan/modules/sponge/SpongeSuperClassBindingModule.java index 01d61688d..27b9cc505 100644 --- a/Plan/sponge/src/main/java/com/djrapitops/plan/modules/sponge/SpongeSuperClassBindingModule.java +++ b/Plan/sponge/src/main/java/com/djrapitops/plan/modules/sponge/SpongeSuperClassBindingModule.java @@ -20,6 +20,8 @@ import com.djrapitops.plan.ServerShutdownSave; import com.djrapitops.plan.SpongeServerShutdownSave; import com.djrapitops.plan.system.database.DBSystem; import com.djrapitops.plan.system.database.SpongeDBSystem; +import com.djrapitops.plan.system.file.PlanFiles; +import com.djrapitops.plan.system.file.SpongePlanFiles; import com.djrapitops.plan.system.importing.EmptyImportSystem; import com.djrapitops.plan.system.importing.ImportSystem; import com.djrapitops.plan.system.info.server.ServerInfo; @@ -41,6 +43,9 @@ import dagger.Module; @Module public interface SpongeSuperClassBindingModule { + @Binds + PlanFiles bindSpongePlanFiles(SpongePlanFiles files); + @Binds ServerInfo bindSpongeServerInfo(ServerServerInfo serverServerInfo); diff --git a/Plan/sponge/src/main/java/com/djrapitops/plan/system/file/SpongeAssetResource.java b/Plan/sponge/src/main/java/com/djrapitops/plan/system/file/SpongeAssetResource.java new file mode 100644 index 000000000..a465de59e --- /dev/null +++ b/Plan/sponge/src/main/java/com/djrapitops/plan/system/file/SpongeAssetResource.java @@ -0,0 +1,71 @@ +/* + * This file is part of Player Analytics (Plan). + * + * Plan is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License v3 as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Plan is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Plan. If not, see . + */ +package com.djrapitops.plan.system.file; + +import org.spongepowered.api.asset.Asset; + +import java.io.ByteArrayInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.List; + +/** + * {@link Resource} implementation for Sponge Asset API. + * + * @author Rsl1122 + */ +public class SpongeAssetResource implements Resource { + + private final String resourceName; + private final Asset asset; + + public SpongeAssetResource(String resourceName, Asset asset) { + this.resourceName = resourceName; + this.asset = asset; + } + + @Override + public String getResourceName() { + return resourceName; + } + + private void nullCheck() throws FileNotFoundException { + if (asset == null) { + throw new FileNotFoundException("a Resource was not found inside the jar (" + resourceName + "), " + + "Plan does not support /reload or updates using " + + "Plugin Managers, restart the server and see if the error persists."); + } + } + + @Override + public InputStream asInputStream() throws IOException { + nullCheck(); + return new ByteArrayInputStream(asset.readBytes()); + } + + @Override + public List asLines() throws IOException { + return asset.readLines(StandardCharsets.UTF_8); + } + + @Override + public String asString() throws IOException { + return asset.readString(StandardCharsets.UTF_8); + } +} \ No newline at end of file diff --git a/Plan/sponge/src/main/java/com/djrapitops/plan/system/file/SpongePlanFiles.java b/Plan/sponge/src/main/java/com/djrapitops/plan/system/file/SpongePlanFiles.java new file mode 100644 index 000000000..71afe05d1 --- /dev/null +++ b/Plan/sponge/src/main/java/com/djrapitops/plan/system/file/SpongePlanFiles.java @@ -0,0 +1,30 @@ +package com.djrapitops.plan.system.file; + +import com.djrapitops.plan.PlanPlugin; +import org.spongepowered.api.Sponge; + +import javax.inject.Inject; +import javax.inject.Singleton; + +/** + * Implements jar resource fetching with Sponge Asset API. + * + * @author Rsl1122 + */ +@Singleton +public class SpongePlanFiles extends PlanFiles { + + @Inject + public SpongePlanFiles(PlanPlugin plugin) { + super(plugin); + } + + @Override + public Resource getResourceFromJar(String resourceName) { + try { + return new SpongeAssetResource(resourceName, Sponge.getAssetManager().getAsset(plugin, resourceName).orElse(null)); + } catch (IllegalStateException spongeNotEnabled) { + return super.getResourceFromJar(resourceName); + } + } +} \ No newline at end of file