From 6865f7ebe9cc16a75c57ef877350b98f18359444 Mon Sep 17 00:00:00 2001 From: Mark Friedrich Date: Fri, 20 Mar 2020 11:30:35 +0100 Subject: [PATCH] =?UTF-8?q?-=20Changed=20upcoming=20PF=20version=20`v2.0.0?= =?UTF-8?q?`=20=E2=86=92=20`v2.0.0-rc.1`=20-=20Fixed=20some=20bugs=20("inf?= =?UTF-8?q?inite=20scroll"=20in=20select=20options)=20in=20"=5FSelect2=5F"?= =?UTF-8?q?=20js=20plugin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/pathfinder.ini | 2 +- js/app/map/scrollbar.js | 4 +- js/app/ui/dialog/map_settings.js | 4 +- js/app/ui/form_element.js | 10 +- js/app/util.js | 18 ++- .../{v2.0.0 => v2.0.0-rc.1}/pathfinder.css | 4 +- public/css/v2.0.0-rc.1/pathfinder.css.map | 1 + public/css/v2.0.0/pathfinder.css.map | 1 - public/js/{v2.0.0 => v2.0.0-rc.1}/app.js | 0 .../js/{v2.0.0 => v2.0.0-rc.1}/app/admin.js | 0 .../app/conf/signature_type.js | 0 .../app/conf/system_effect.js | 0 .../js/{v2.0.0 => v2.0.0-rc.1}/app/counter.js | 0 .../app/datatables.loader.js | 0 public/js/{v2.0.0 => v2.0.0-rc.1}/app/init.js | 0 public/js/{v2.0.0 => v2.0.0-rc.1}/app/key.js | 0 .../{v2.0.0 => v2.0.0-rc.1}/app/lib/cache.js | 0 .../app/lib/console.js | 0 .../{v2.0.0 => v2.0.0-rc.1}/app/lib/cron.js | 0 .../app/lib/dataStore.js | 0 .../app/lib/dragSelect.js | 0 .../app/lib/eventHandler.js | 0 .../app/lib/localStore.js | 0 .../app/lib/prototypes.js | 0 .../{v2.0.0 => v2.0.0-rc.1}/app/lib/resize.js | 0 .../js/{v2.0.0 => v2.0.0-rc.1}/app/logging.js | 0 .../js/{v2.0.0 => v2.0.0-rc.1}/app/login.js | 0 .../app/map/contextmenu.js | 0 .../{v2.0.0 => v2.0.0-rc.1}/app/map/layout.js | 0 .../{v2.0.0 => v2.0.0-rc.1}/app/map/local.js | 0 .../app/map/magnetizing.js | 0 .../js/{v2.0.0 => v2.0.0-rc.1}/app/map/map.js | 0 .../app/map/overlay/overlay.js | 0 .../app/map/overlay/util.js | 0 .../app/map/scrollbar.js | 4 +- .../{v2.0.0 => v2.0.0-rc.1}/app/map/system.js | 0 .../{v2.0.0 => v2.0.0-rc.1}/app/map/util.js | 0 .../{v2.0.0 => v2.0.0-rc.1}/app/map/worker.js | 0 .../js/{v2.0.0 => v2.0.0-rc.1}/app/mappage.js | 0 .../{v2.0.0 => v2.0.0-rc.1}/app/module_map.js | 0 public/js/{v2.0.0 => v2.0.0-rc.1}/app/page.js | 0 .../app/pnotify.loader.js | 0 .../app/promises/promise.deferred.js | 0 .../app/promises/promise.queue.js | 0 .../app/promises/promise.timeout.js | 0 .../js/{v2.0.0 => v2.0.0-rc.1}/app/render.js | 0 .../js/{v2.0.0 => v2.0.0-rc.1}/app/setup.js | 0 .../app/summernote.loader.js | 0 .../app/ui/dialog/account_settings.js | 0 .../app/ui/dialog/api_status.js | 0 .../app/ui/dialog/changelog.js | 0 .../app/ui/dialog/credit.js | 0 .../app/ui/dialog/delete_account.js | 0 .../app/ui/dialog/jump_info.js | 0 .../app/ui/dialog/manual.js | 0 .../app/ui/dialog/map_info.js | 0 .../app/ui/dialog/map_settings.js | 4 +- .../app/ui/dialog/notification.js | 0 .../app/ui/dialog/shortcuts.js | 0 .../app/ui/dialog/stats.js | 0 .../app/ui/dialog/system_effects.js | 0 .../app/ui/form_element.js | 10 +- .../app/ui/layout/demo_map.js | 0 .../app/ui/layout/header_login.js | 0 .../app/ui/layout/logo.js | 0 .../app/ui/module/base.js | 0 .../app/ui/module/connection_info.js | 0 .../app/ui/module/demo.js | 0 .../app/ui/module/empty.js | 0 .../app/ui/module/global_thera.js | 0 .../app/ui/module/system_graph.js | 0 .../app/ui/module/system_info.js | 0 .../app/ui/module/system_intel.js | 0 .../app/ui/module/system_killboard.js | 0 .../app/ui/module/system_route.js | 0 .../app/ui/module/system_signature.js | 0 public/js/{v2.0.0 => v2.0.0-rc.1}/app/util.js | 18 ++- .../{v2.0.0 => v2.0.0-rc.1}/app/worker/map.js | 0 .../app/worker/message.js | 0 .../lib/EasePack.min.js | 0 .../lib/TweenLite.min.js | 0 .../lib/blueimp-gallery.js | 0 .../lib/blueimp-helper.js | 0 .../lib/bootbox.min.js | 0 .../lib/bootstrap-confirmation.min.js | 0 .../lib/bootstrap-editable.min.js | 0 .../lib/bootstrap-image-gallery.js | 0 .../lib/bootstrap-toggle.min.js | 0 .../lib/bootstrap.min.js | 0 .../Buttons-1.5.6/js/buttons.html5.min.js | 0 .../js/dataTables.buttons.min.js | 0 .../js/jquery.dataTables.min.js | 0 .../js/dataTables.responsive.min.js | 0 .../js/dataTables.rowGroup.min.js | 0 .../Select-1.3.0/js/dataTables.select.min.js | 0 .../lib/easytimer.min.js | 0 .../js/{v2.0.0 => v2.0.0-rc.1}/lib/farahey.js | 0 .../lib/jquery-3.4.1.min.js | 0 .../lib/jquery.easypiechart.min.js | 0 .../lib/jquery.hoverIntent.min.js | 0 .../lib/jquery.lazylinepainter-1.5.1.min.js | 0 .../lib/jquery.lazyload.min.js | 0 .../lib/jquery.mCustomScrollbar.min.js | 0 .../lib/jquery.mousewheel.min.js | 0 .../lib/jquery.peity.min.js | 0 .../js/{v2.0.0 => v2.0.0-rc.1}/lib/jsplumb.js | 0 .../lib/localforage.min.js | 0 .../{v2.0.0 => v2.0.0-rc.1}/lib/morris.min.js | 0 .../lib/mustache.min.js | 0 .../lib/pnotify/NonBlock.js | 0 .../lib/pnotify/PNotify.js | 0 .../lib/pnotify/PNotifyButtons.js | 0 .../lib/pnotify/PNotifyCallbacks.js | 0 .../lib/pnotify/PNotifyDesktop.js | 0 .../lib/raphael.min.js | 0 .../js/{v2.0.0 => v2.0.0-rc.1}/lib/require.js | 0 .../lib/requirejs/text.js | 0 .../lib/select2.min.js | 0 .../{v2.0.0 => v2.0.0-rc.1}/lib/slidebars.js | 0 .../lib/sortable.min.js | 0 .../lib/summernote/summernote.min.js | 0 .../lib/validator.min.js | 0 .../lib/velocity.min.js | 0 .../lib/velocity.ui.min.js | 0 public/templates/dialog/map.html | 2 +- sass/layout/_forms.scss | 19 +-- sass/layout/_main.scss | 34 ++-- sass/library/select2/_core.scss | 3 +- sass/library/select2/_dropdown.scss | 4 +- .../select2/theme/default/_layout.scss | 97 +++++++++++ .../select2/theme/default/_multiple.scss | 96 +++++++++++ .../select2/theme/default/_single.scss | 83 ++++++++++ .../select2/theme/pathfinder/_defaults.scss | 35 ---- .../select2/theme/pathfinder/_layout.scss | 153 +++++++++++------- .../select2/theme/pathfinder/_multiple.scss | 85 +++++----- .../select2/theme/pathfinder/_single.scss | 71 +++----- 136 files changed, 520 insertions(+), 242 deletions(-) rename public/css/{v2.0.0 => v2.0.0-rc.1}/pathfinder.css (72%) create mode 100644 public/css/v2.0.0-rc.1/pathfinder.css.map delete mode 100644 public/css/v2.0.0/pathfinder.css.map rename public/js/{v2.0.0 => v2.0.0-rc.1}/app.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/admin.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/conf/signature_type.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/conf/system_effect.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/counter.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/datatables.loader.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/init.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/key.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/lib/cache.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/lib/console.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/lib/cron.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/lib/dataStore.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/lib/dragSelect.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/lib/eventHandler.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/lib/localStore.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/lib/prototypes.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/lib/resize.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/logging.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/login.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/map/contextmenu.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/map/layout.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/map/local.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/map/magnetizing.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/map/map.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/map/overlay/overlay.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/map/overlay/util.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/map/scrollbar.js (99%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/map/system.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/map/util.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/map/worker.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/mappage.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/module_map.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/page.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/pnotify.loader.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/promises/promise.deferred.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/promises/promise.queue.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/promises/promise.timeout.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/render.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/setup.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/summernote.loader.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/ui/dialog/account_settings.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/ui/dialog/api_status.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/ui/dialog/changelog.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/ui/dialog/credit.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/ui/dialog/delete_account.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/ui/dialog/jump_info.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/ui/dialog/manual.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/ui/dialog/map_info.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/ui/dialog/map_settings.js (99%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/ui/dialog/notification.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/ui/dialog/shortcuts.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/ui/dialog/stats.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/ui/dialog/system_effects.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/ui/form_element.js (99%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/ui/layout/demo_map.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/ui/layout/header_login.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/ui/layout/logo.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/ui/module/base.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/ui/module/connection_info.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/ui/module/demo.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/ui/module/empty.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/ui/module/global_thera.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/ui/module/system_graph.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/ui/module/system_info.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/ui/module/system_intel.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/ui/module/system_killboard.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/ui/module/system_route.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/ui/module/system_signature.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/util.js (99%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/worker/map.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/app/worker/message.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/EasePack.min.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/TweenLite.min.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/blueimp-gallery.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/blueimp-helper.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/bootbox.min.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/bootstrap-confirmation.min.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/bootstrap-editable.min.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/bootstrap-image-gallery.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/bootstrap-toggle.min.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/bootstrap.min.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/datatables/Buttons-1.5.6/js/buttons.html5.min.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/datatables/Buttons-1.5.6/js/dataTables.buttons.min.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/datatables/DataTables-1.10.18/js/jquery.dataTables.min.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/datatables/Responsive-2.2.2/js/dataTables.responsive.min.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/datatables/RowGroup-1.1.1/js/dataTables.rowGroup.min.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/datatables/Select-1.3.0/js/dataTables.select.min.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/easytimer.min.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/farahey.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/jquery-3.4.1.min.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/jquery.easypiechart.min.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/jquery.hoverIntent.min.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/jquery.lazylinepainter-1.5.1.min.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/jquery.lazyload.min.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/jquery.mCustomScrollbar.min.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/jquery.mousewheel.min.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/jquery.peity.min.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/jsplumb.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/localforage.min.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/morris.min.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/mustache.min.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/pnotify/NonBlock.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/pnotify/PNotify.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/pnotify/PNotifyButtons.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/pnotify/PNotifyCallbacks.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/pnotify/PNotifyDesktop.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/raphael.min.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/require.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/requirejs/text.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/select2.min.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/slidebars.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/sortable.min.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/summernote/summernote.min.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/validator.min.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/velocity.min.js (100%) rename public/js/{v2.0.0 => v2.0.0-rc.1}/lib/velocity.ui.min.js (100%) create mode 100644 sass/library/select2/theme/default/_layout.scss create mode 100644 sass/library/select2/theme/default/_multiple.scss create mode 100644 sass/library/select2/theme/default/_single.scss delete mode 100644 sass/library/select2/theme/pathfinder/_defaults.scss diff --git a/app/pathfinder.ini b/app/pathfinder.ini index 63b5868d..fdef6b40 100644 --- a/app/pathfinder.ini +++ b/app/pathfinder.ini @@ -14,7 +14,7 @@ NAME = Pathfinder ; e.g. public/js/vX.X.X/app.js ; Syntax: String (current version) ; Default: v2.0.0 -VERSION = v2.0.0 +VERSION = v2.0.0-rc.1 ; Contact information [optional] ; Shown on 'licence', 'contact' page. diff --git a/js/app/map/scrollbar.js b/js/app/map/scrollbar.js index b19e4d36..4b5d452c 100644 --- a/js/app/map/scrollbar.js +++ b/js/app/map/scrollbar.js @@ -15,10 +15,10 @@ define([ let defaultConfig = { axis: 'yx', - theme: 'light-3' , + theme: 'light-3', scrollInertia: 200, autoExpandScrollbar: false, - scrollButtons:{ + scrollButtons: { enable: true, scrollAmount: 30, scrollType: 'stepless' diff --git a/js/app/ui/dialog/map_settings.js b/js/app/ui/dialog/map_settings.js index 78d495ee..a4e653e9 100644 --- a/js/app/ui/dialog/map_settings.js +++ b/js/app/ui/dialog/map_settings.js @@ -130,6 +130,7 @@ define([ id: config.newMapDialogId, mapData: mapData, type: mapTypesCreate, + select2Class: Util.config.select2Class, hasRightMapUpdate, hasRightMapExport, @@ -419,7 +420,8 @@ define([ // make s to Select2 fields mapInfoDialog.find( '#' + config.dialogMapNewContainerId + ' .' + Util.config.select2Class + ', ' + - '#' + config.dialogMapEditContainerId + ' .' + Util.config.select2Class + '#' + config.dialogMapEditContainerId + ' .' + Util.config.select2Class + ', ' + + '#' + config.dialogMapDownloadContainerId + ' .' + Util.config.select2Class ).select2({ minimumResultsForSearch: -1, width: '100%' diff --git a/public/js/v2.0.0/app/ui/dialog/notification.js b/public/js/v2.0.0-rc.1/app/ui/dialog/notification.js similarity index 100% rename from public/js/v2.0.0/app/ui/dialog/notification.js rename to public/js/v2.0.0-rc.1/app/ui/dialog/notification.js diff --git a/public/js/v2.0.0/app/ui/dialog/shortcuts.js b/public/js/v2.0.0-rc.1/app/ui/dialog/shortcuts.js similarity index 100% rename from public/js/v2.0.0/app/ui/dialog/shortcuts.js rename to public/js/v2.0.0-rc.1/app/ui/dialog/shortcuts.js diff --git a/public/js/v2.0.0/app/ui/dialog/stats.js b/public/js/v2.0.0-rc.1/app/ui/dialog/stats.js similarity index 100% rename from public/js/v2.0.0/app/ui/dialog/stats.js rename to public/js/v2.0.0-rc.1/app/ui/dialog/stats.js diff --git a/public/js/v2.0.0/app/ui/dialog/system_effects.js b/public/js/v2.0.0-rc.1/app/ui/dialog/system_effects.js similarity index 100% rename from public/js/v2.0.0/app/ui/dialog/system_effects.js rename to public/js/v2.0.0-rc.1/app/ui/dialog/system_effects.js diff --git a/public/js/v2.0.0/app/ui/form_element.js b/public/js/v2.0.0-rc.1/app/ui/form_element.js similarity index 99% rename from public/js/v2.0.0/app/ui/form_element.js rename to public/js/v2.0.0-rc.1/app/ui/form_element.js index adb2a253..4efbe74a 100644 --- a/public/js/v2.0.0/app/ui/form_element.js +++ b/public/js/v2.0.0-rc.1/app/ui/form_element.js @@ -149,7 +149,7 @@ define([ markup += '
' + parts[0] + '
'; - markup += '
'; + markup += '
'; markup += '
' + label + '
'; markup += '
' + suffix + '
'; break; @@ -247,7 +247,7 @@ define([ let defaultConfig = { dropdownParent: selectElement.parents('.modal-body'), - minimumResultsForSearch: -1, + minimumResultsForSearch: Infinity, width: '100%', maxSelectionLength: 1 }; @@ -293,7 +293,7 @@ define([ $.fn.initStatusSelect = function(options){ let defaultConfig = { - minimumResultsForSearch: -1, + minimumResultsForSearch: Infinity, width: '100%', iconClass: 'fa-circle' }; @@ -784,7 +784,7 @@ define([ */ $.fn.initSignatureGroupSelect = function(options){ let defaultConfig = { - minimumResultsForSearch: -1, + minimumResultsForSearch: Infinity, width: '110px', dropdownParent: this.parents('.popover-content') }; @@ -880,7 +880,7 @@ define([ */ $.fn.initSignatureConnectionSelect = function(options){ let defaultConfig = { - minimumResultsForSearch: -1, + minimumResultsForSearch: Infinity, width: '140px', dropdownParent: this.parents('.popover-content') }; diff --git a/public/js/v2.0.0/app/ui/layout/demo_map.js b/public/js/v2.0.0-rc.1/app/ui/layout/demo_map.js similarity index 100% rename from public/js/v2.0.0/app/ui/layout/demo_map.js rename to public/js/v2.0.0-rc.1/app/ui/layout/demo_map.js diff --git a/public/js/v2.0.0/app/ui/layout/header_login.js b/public/js/v2.0.0-rc.1/app/ui/layout/header_login.js similarity index 100% rename from public/js/v2.0.0/app/ui/layout/header_login.js rename to public/js/v2.0.0-rc.1/app/ui/layout/header_login.js diff --git a/public/js/v2.0.0/app/ui/layout/logo.js b/public/js/v2.0.0-rc.1/app/ui/layout/logo.js similarity index 100% rename from public/js/v2.0.0/app/ui/layout/logo.js rename to public/js/v2.0.0-rc.1/app/ui/layout/logo.js diff --git a/public/js/v2.0.0/app/ui/module/base.js b/public/js/v2.0.0-rc.1/app/ui/module/base.js similarity index 100% rename from public/js/v2.0.0/app/ui/module/base.js rename to public/js/v2.0.0-rc.1/app/ui/module/base.js diff --git a/public/js/v2.0.0/app/ui/module/connection_info.js b/public/js/v2.0.0-rc.1/app/ui/module/connection_info.js similarity index 100% rename from public/js/v2.0.0/app/ui/module/connection_info.js rename to public/js/v2.0.0-rc.1/app/ui/module/connection_info.js diff --git a/public/js/v2.0.0/app/ui/module/demo.js b/public/js/v2.0.0-rc.1/app/ui/module/demo.js similarity index 100% rename from public/js/v2.0.0/app/ui/module/demo.js rename to public/js/v2.0.0-rc.1/app/ui/module/demo.js diff --git a/public/js/v2.0.0/app/ui/module/empty.js b/public/js/v2.0.0-rc.1/app/ui/module/empty.js similarity index 100% rename from public/js/v2.0.0/app/ui/module/empty.js rename to public/js/v2.0.0-rc.1/app/ui/module/empty.js diff --git a/public/js/v2.0.0/app/ui/module/global_thera.js b/public/js/v2.0.0-rc.1/app/ui/module/global_thera.js similarity index 100% rename from public/js/v2.0.0/app/ui/module/global_thera.js rename to public/js/v2.0.0-rc.1/app/ui/module/global_thera.js diff --git a/public/js/v2.0.0/app/ui/module/system_graph.js b/public/js/v2.0.0-rc.1/app/ui/module/system_graph.js similarity index 100% rename from public/js/v2.0.0/app/ui/module/system_graph.js rename to public/js/v2.0.0-rc.1/app/ui/module/system_graph.js diff --git a/public/js/v2.0.0/app/ui/module/system_info.js b/public/js/v2.0.0-rc.1/app/ui/module/system_info.js similarity index 100% rename from public/js/v2.0.0/app/ui/module/system_info.js rename to public/js/v2.0.0-rc.1/app/ui/module/system_info.js diff --git a/public/js/v2.0.0/app/ui/module/system_intel.js b/public/js/v2.0.0-rc.1/app/ui/module/system_intel.js similarity index 100% rename from public/js/v2.0.0/app/ui/module/system_intel.js rename to public/js/v2.0.0-rc.1/app/ui/module/system_intel.js diff --git a/public/js/v2.0.0/app/ui/module/system_killboard.js b/public/js/v2.0.0-rc.1/app/ui/module/system_killboard.js similarity index 100% rename from public/js/v2.0.0/app/ui/module/system_killboard.js rename to public/js/v2.0.0-rc.1/app/ui/module/system_killboard.js diff --git a/public/js/v2.0.0/app/ui/module/system_route.js b/public/js/v2.0.0-rc.1/app/ui/module/system_route.js similarity index 100% rename from public/js/v2.0.0/app/ui/module/system_route.js rename to public/js/v2.0.0-rc.1/app/ui/module/system_route.js diff --git a/public/js/v2.0.0/app/ui/module/system_signature.js b/public/js/v2.0.0-rc.1/app/ui/module/system_signature.js similarity index 100% rename from public/js/v2.0.0/app/ui/module/system_signature.js rename to public/js/v2.0.0-rc.1/app/ui/module/system_signature.js diff --git a/public/js/v2.0.0/app/util.js b/public/js/v2.0.0-rc.1/app/util.js similarity index 99% rename from public/js/v2.0.0/app/util.js rename to public/js/v2.0.0-rc.1/app/util.js index a445606d..84c3b1dc 100644 --- a/public/js/v2.0.0/app/util.js +++ b/public/js/v2.0.0-rc.1/app/util.js @@ -1389,6 +1389,8 @@ define([ }); let initScrollbar = (resultsWrapper) => { + resultsWrapper.css('maxHeight', '300px'); + // default 'mousewheel' event set by select2 needs to be disabled // in order to make mCustomScrollbar mouseWheel enable works correctly $(resultsWrapper).find('ul.select2-results__options').off('mousewheel'); @@ -1397,6 +1399,8 @@ define([ let lazyLoadImagesOffset = 240; resultsWrapper.mCustomScrollbar({ + //setHeight: 400, + scrollInertia: 200, mouseWheel: { enable: true, scrollAmount: 'auto', @@ -1411,12 +1415,14 @@ define([ scrollbarPosition: 'inside', autoDraggerLength: true, autoHideScrollbar: false, + alwaysShowScrollbar: 0, // 0, 1, 2 advanced: { updateOnContentResize: true }, + //live: true, // could not get this to work callbacks: { alwaysTriggerOffsets: false, // only trigger callback.onTotalScroll() once - onTotalScrollOffset: 300, // trigger callback.onTotalScroll() 100px before end + onTotalScrollOffset: 100, // trigger callback.onTotalScroll() 100px before end onInit: function(){ // disable page scroll -> otherwise page AND customScrollbars will scroll // -> this is because the initPassiveEvents() delegates the mouseWheel events @@ -1433,10 +1439,14 @@ define([ onTotalScroll: function(){ // we want to "trigger" Select2´s 'scroll' event // in order to make its "infinite scrolling" function working - this.mcs.content.find(':first-child').trigger('scroll'); + // -> look for "--load-more" anker (last list item) + // add "no-margin" class in order to reduce offset to the list + let loadMoreLi = this.mcs.content.find('.select2-results__option--load-more'); + loadMoreLi.addClass('no-margin'); + this.mcs.content.find('> :first-child').trigger('scroll'); + setTimeout(() => loadMoreLi.removeClass('no-margin'), 20); }, whileScrolling: function(){ - // lazy load for images -> reduce number of calculations by % 10 if(0 === this.mcs.top % 10){ let scroller = $(this).find('.mCSB_container'); @@ -1461,7 +1471,7 @@ define([ if($(selectElement).data('select2')){ let resultsOptions = $(selectElement).data('select2').$results; if(resultsOptions.length){ - let resultsWrapper = resultsOptions.parents('.select2-results'); + let resultsWrapper = resultsOptions.closest('.select2-results'); if(resultsWrapper.length){ wrapper = resultsWrapper; } diff --git a/public/js/v2.0.0/app/worker/map.js b/public/js/v2.0.0-rc.1/app/worker/map.js similarity index 100% rename from public/js/v2.0.0/app/worker/map.js rename to public/js/v2.0.0-rc.1/app/worker/map.js diff --git a/public/js/v2.0.0/app/worker/message.js b/public/js/v2.0.0-rc.1/app/worker/message.js similarity index 100% rename from public/js/v2.0.0/app/worker/message.js rename to public/js/v2.0.0-rc.1/app/worker/message.js diff --git a/public/js/v2.0.0/lib/EasePack.min.js b/public/js/v2.0.0-rc.1/lib/EasePack.min.js similarity index 100% rename from public/js/v2.0.0/lib/EasePack.min.js rename to public/js/v2.0.0-rc.1/lib/EasePack.min.js diff --git a/public/js/v2.0.0/lib/TweenLite.min.js b/public/js/v2.0.0-rc.1/lib/TweenLite.min.js similarity index 100% rename from public/js/v2.0.0/lib/TweenLite.min.js rename to public/js/v2.0.0-rc.1/lib/TweenLite.min.js diff --git a/public/js/v2.0.0/lib/blueimp-gallery.js b/public/js/v2.0.0-rc.1/lib/blueimp-gallery.js similarity index 100% rename from public/js/v2.0.0/lib/blueimp-gallery.js rename to public/js/v2.0.0-rc.1/lib/blueimp-gallery.js diff --git a/public/js/v2.0.0/lib/blueimp-helper.js b/public/js/v2.0.0-rc.1/lib/blueimp-helper.js similarity index 100% rename from public/js/v2.0.0/lib/blueimp-helper.js rename to public/js/v2.0.0-rc.1/lib/blueimp-helper.js diff --git a/public/js/v2.0.0/lib/bootbox.min.js b/public/js/v2.0.0-rc.1/lib/bootbox.min.js similarity index 100% rename from public/js/v2.0.0/lib/bootbox.min.js rename to public/js/v2.0.0-rc.1/lib/bootbox.min.js diff --git a/public/js/v2.0.0/lib/bootstrap-confirmation.min.js b/public/js/v2.0.0-rc.1/lib/bootstrap-confirmation.min.js similarity index 100% rename from public/js/v2.0.0/lib/bootstrap-confirmation.min.js rename to public/js/v2.0.0-rc.1/lib/bootstrap-confirmation.min.js diff --git a/public/js/v2.0.0/lib/bootstrap-editable.min.js b/public/js/v2.0.0-rc.1/lib/bootstrap-editable.min.js similarity index 100% rename from public/js/v2.0.0/lib/bootstrap-editable.min.js rename to public/js/v2.0.0-rc.1/lib/bootstrap-editable.min.js diff --git a/public/js/v2.0.0/lib/bootstrap-image-gallery.js b/public/js/v2.0.0-rc.1/lib/bootstrap-image-gallery.js similarity index 100% rename from public/js/v2.0.0/lib/bootstrap-image-gallery.js rename to public/js/v2.0.0-rc.1/lib/bootstrap-image-gallery.js diff --git a/public/js/v2.0.0/lib/bootstrap-toggle.min.js b/public/js/v2.0.0-rc.1/lib/bootstrap-toggle.min.js similarity index 100% rename from public/js/v2.0.0/lib/bootstrap-toggle.min.js rename to public/js/v2.0.0-rc.1/lib/bootstrap-toggle.min.js diff --git a/public/js/v2.0.0/lib/bootstrap.min.js b/public/js/v2.0.0-rc.1/lib/bootstrap.min.js similarity index 100% rename from public/js/v2.0.0/lib/bootstrap.min.js rename to public/js/v2.0.0-rc.1/lib/bootstrap.min.js diff --git a/public/js/v2.0.0/lib/datatables/Buttons-1.5.6/js/buttons.html5.min.js b/public/js/v2.0.0-rc.1/lib/datatables/Buttons-1.5.6/js/buttons.html5.min.js similarity index 100% rename from public/js/v2.0.0/lib/datatables/Buttons-1.5.6/js/buttons.html5.min.js rename to public/js/v2.0.0-rc.1/lib/datatables/Buttons-1.5.6/js/buttons.html5.min.js diff --git a/public/js/v2.0.0/lib/datatables/Buttons-1.5.6/js/dataTables.buttons.min.js b/public/js/v2.0.0-rc.1/lib/datatables/Buttons-1.5.6/js/dataTables.buttons.min.js similarity index 100% rename from public/js/v2.0.0/lib/datatables/Buttons-1.5.6/js/dataTables.buttons.min.js rename to public/js/v2.0.0-rc.1/lib/datatables/Buttons-1.5.6/js/dataTables.buttons.min.js diff --git a/public/js/v2.0.0/lib/datatables/DataTables-1.10.18/js/jquery.dataTables.min.js b/public/js/v2.0.0-rc.1/lib/datatables/DataTables-1.10.18/js/jquery.dataTables.min.js similarity index 100% rename from public/js/v2.0.0/lib/datatables/DataTables-1.10.18/js/jquery.dataTables.min.js rename to public/js/v2.0.0-rc.1/lib/datatables/DataTables-1.10.18/js/jquery.dataTables.min.js diff --git a/public/js/v2.0.0/lib/datatables/Responsive-2.2.2/js/dataTables.responsive.min.js b/public/js/v2.0.0-rc.1/lib/datatables/Responsive-2.2.2/js/dataTables.responsive.min.js similarity index 100% rename from public/js/v2.0.0/lib/datatables/Responsive-2.2.2/js/dataTables.responsive.min.js rename to public/js/v2.0.0-rc.1/lib/datatables/Responsive-2.2.2/js/dataTables.responsive.min.js diff --git a/public/js/v2.0.0/lib/datatables/RowGroup-1.1.1/js/dataTables.rowGroup.min.js b/public/js/v2.0.0-rc.1/lib/datatables/RowGroup-1.1.1/js/dataTables.rowGroup.min.js similarity index 100% rename from public/js/v2.0.0/lib/datatables/RowGroup-1.1.1/js/dataTables.rowGroup.min.js rename to public/js/v2.0.0-rc.1/lib/datatables/RowGroup-1.1.1/js/dataTables.rowGroup.min.js diff --git a/public/js/v2.0.0/lib/datatables/Select-1.3.0/js/dataTables.select.min.js b/public/js/v2.0.0-rc.1/lib/datatables/Select-1.3.0/js/dataTables.select.min.js similarity index 100% rename from public/js/v2.0.0/lib/datatables/Select-1.3.0/js/dataTables.select.min.js rename to public/js/v2.0.0-rc.1/lib/datatables/Select-1.3.0/js/dataTables.select.min.js diff --git a/public/js/v2.0.0/lib/easytimer.min.js b/public/js/v2.0.0-rc.1/lib/easytimer.min.js similarity index 100% rename from public/js/v2.0.0/lib/easytimer.min.js rename to public/js/v2.0.0-rc.1/lib/easytimer.min.js diff --git a/public/js/v2.0.0/lib/farahey.js b/public/js/v2.0.0-rc.1/lib/farahey.js similarity index 100% rename from public/js/v2.0.0/lib/farahey.js rename to public/js/v2.0.0-rc.1/lib/farahey.js diff --git a/public/js/v2.0.0/lib/jquery-3.4.1.min.js b/public/js/v2.0.0-rc.1/lib/jquery-3.4.1.min.js similarity index 100% rename from public/js/v2.0.0/lib/jquery-3.4.1.min.js rename to public/js/v2.0.0-rc.1/lib/jquery-3.4.1.min.js diff --git a/public/js/v2.0.0/lib/jquery.easypiechart.min.js b/public/js/v2.0.0-rc.1/lib/jquery.easypiechart.min.js similarity index 100% rename from public/js/v2.0.0/lib/jquery.easypiechart.min.js rename to public/js/v2.0.0-rc.1/lib/jquery.easypiechart.min.js diff --git a/public/js/v2.0.0/lib/jquery.hoverIntent.min.js b/public/js/v2.0.0-rc.1/lib/jquery.hoverIntent.min.js similarity index 100% rename from public/js/v2.0.0/lib/jquery.hoverIntent.min.js rename to public/js/v2.0.0-rc.1/lib/jquery.hoverIntent.min.js diff --git a/public/js/v2.0.0/lib/jquery.lazylinepainter-1.5.1.min.js b/public/js/v2.0.0-rc.1/lib/jquery.lazylinepainter-1.5.1.min.js similarity index 100% rename from public/js/v2.0.0/lib/jquery.lazylinepainter-1.5.1.min.js rename to public/js/v2.0.0-rc.1/lib/jquery.lazylinepainter-1.5.1.min.js diff --git a/public/js/v2.0.0/lib/jquery.lazyload.min.js b/public/js/v2.0.0-rc.1/lib/jquery.lazyload.min.js similarity index 100% rename from public/js/v2.0.0/lib/jquery.lazyload.min.js rename to public/js/v2.0.0-rc.1/lib/jquery.lazyload.min.js diff --git a/public/js/v2.0.0/lib/jquery.mCustomScrollbar.min.js b/public/js/v2.0.0-rc.1/lib/jquery.mCustomScrollbar.min.js similarity index 100% rename from public/js/v2.0.0/lib/jquery.mCustomScrollbar.min.js rename to public/js/v2.0.0-rc.1/lib/jquery.mCustomScrollbar.min.js diff --git a/public/js/v2.0.0/lib/jquery.mousewheel.min.js b/public/js/v2.0.0-rc.1/lib/jquery.mousewheel.min.js similarity index 100% rename from public/js/v2.0.0/lib/jquery.mousewheel.min.js rename to public/js/v2.0.0-rc.1/lib/jquery.mousewheel.min.js diff --git a/public/js/v2.0.0/lib/jquery.peity.min.js b/public/js/v2.0.0-rc.1/lib/jquery.peity.min.js similarity index 100% rename from public/js/v2.0.0/lib/jquery.peity.min.js rename to public/js/v2.0.0-rc.1/lib/jquery.peity.min.js diff --git a/public/js/v2.0.0/lib/jsplumb.js b/public/js/v2.0.0-rc.1/lib/jsplumb.js similarity index 100% rename from public/js/v2.0.0/lib/jsplumb.js rename to public/js/v2.0.0-rc.1/lib/jsplumb.js diff --git a/public/js/v2.0.0/lib/localforage.min.js b/public/js/v2.0.0-rc.1/lib/localforage.min.js similarity index 100% rename from public/js/v2.0.0/lib/localforage.min.js rename to public/js/v2.0.0-rc.1/lib/localforage.min.js diff --git a/public/js/v2.0.0/lib/morris.min.js b/public/js/v2.0.0-rc.1/lib/morris.min.js similarity index 100% rename from public/js/v2.0.0/lib/morris.min.js rename to public/js/v2.0.0-rc.1/lib/morris.min.js diff --git a/public/js/v2.0.0/lib/mustache.min.js b/public/js/v2.0.0-rc.1/lib/mustache.min.js similarity index 100% rename from public/js/v2.0.0/lib/mustache.min.js rename to public/js/v2.0.0-rc.1/lib/mustache.min.js diff --git a/public/js/v2.0.0/lib/pnotify/NonBlock.js b/public/js/v2.0.0-rc.1/lib/pnotify/NonBlock.js similarity index 100% rename from public/js/v2.0.0/lib/pnotify/NonBlock.js rename to public/js/v2.0.0-rc.1/lib/pnotify/NonBlock.js diff --git a/public/js/v2.0.0/lib/pnotify/PNotify.js b/public/js/v2.0.0-rc.1/lib/pnotify/PNotify.js similarity index 100% rename from public/js/v2.0.0/lib/pnotify/PNotify.js rename to public/js/v2.0.0-rc.1/lib/pnotify/PNotify.js diff --git a/public/js/v2.0.0/lib/pnotify/PNotifyButtons.js b/public/js/v2.0.0-rc.1/lib/pnotify/PNotifyButtons.js similarity index 100% rename from public/js/v2.0.0/lib/pnotify/PNotifyButtons.js rename to public/js/v2.0.0-rc.1/lib/pnotify/PNotifyButtons.js diff --git a/public/js/v2.0.0/lib/pnotify/PNotifyCallbacks.js b/public/js/v2.0.0-rc.1/lib/pnotify/PNotifyCallbacks.js similarity index 100% rename from public/js/v2.0.0/lib/pnotify/PNotifyCallbacks.js rename to public/js/v2.0.0-rc.1/lib/pnotify/PNotifyCallbacks.js diff --git a/public/js/v2.0.0/lib/pnotify/PNotifyDesktop.js b/public/js/v2.0.0-rc.1/lib/pnotify/PNotifyDesktop.js similarity index 100% rename from public/js/v2.0.0/lib/pnotify/PNotifyDesktop.js rename to public/js/v2.0.0-rc.1/lib/pnotify/PNotifyDesktop.js diff --git a/public/js/v2.0.0/lib/raphael.min.js b/public/js/v2.0.0-rc.1/lib/raphael.min.js similarity index 100% rename from public/js/v2.0.0/lib/raphael.min.js rename to public/js/v2.0.0-rc.1/lib/raphael.min.js diff --git a/public/js/v2.0.0/lib/require.js b/public/js/v2.0.0-rc.1/lib/require.js similarity index 100% rename from public/js/v2.0.0/lib/require.js rename to public/js/v2.0.0-rc.1/lib/require.js diff --git a/public/js/v2.0.0/lib/requirejs/text.js b/public/js/v2.0.0-rc.1/lib/requirejs/text.js similarity index 100% rename from public/js/v2.0.0/lib/requirejs/text.js rename to public/js/v2.0.0-rc.1/lib/requirejs/text.js diff --git a/public/js/v2.0.0/lib/select2.min.js b/public/js/v2.0.0-rc.1/lib/select2.min.js similarity index 100% rename from public/js/v2.0.0/lib/select2.min.js rename to public/js/v2.0.0-rc.1/lib/select2.min.js diff --git a/public/js/v2.0.0/lib/slidebars.js b/public/js/v2.0.0-rc.1/lib/slidebars.js similarity index 100% rename from public/js/v2.0.0/lib/slidebars.js rename to public/js/v2.0.0-rc.1/lib/slidebars.js diff --git a/public/js/v2.0.0/lib/sortable.min.js b/public/js/v2.0.0-rc.1/lib/sortable.min.js similarity index 100% rename from public/js/v2.0.0/lib/sortable.min.js rename to public/js/v2.0.0-rc.1/lib/sortable.min.js diff --git a/public/js/v2.0.0/lib/summernote/summernote.min.js b/public/js/v2.0.0-rc.1/lib/summernote/summernote.min.js similarity index 100% rename from public/js/v2.0.0/lib/summernote/summernote.min.js rename to public/js/v2.0.0-rc.1/lib/summernote/summernote.min.js diff --git a/public/js/v2.0.0/lib/validator.min.js b/public/js/v2.0.0-rc.1/lib/validator.min.js similarity index 100% rename from public/js/v2.0.0/lib/validator.min.js rename to public/js/v2.0.0-rc.1/lib/validator.min.js diff --git a/public/js/v2.0.0/lib/velocity.min.js b/public/js/v2.0.0-rc.1/lib/velocity.min.js similarity index 100% rename from public/js/v2.0.0/lib/velocity.min.js rename to public/js/v2.0.0-rc.1/lib/velocity.min.js diff --git a/public/js/v2.0.0/lib/velocity.ui.min.js b/public/js/v2.0.0-rc.1/lib/velocity.ui.min.js similarity index 100% rename from public/js/v2.0.0/lib/velocity.ui.min.js rename to public/js/v2.0.0-rc.1/lib/velocity.ui.min.js diff --git a/public/templates/dialog/map.html b/public/templates/dialog/map.html index f15f4170..9fa60d32 100644 --- a/public/templates/dialog/map.html +++ b/public/templates/dialog/map.html @@ -445,7 +445,7 @@
- {{#type}} {{/type}} diff --git a/sass/layout/_forms.scss b/sass/layout/_forms.scss index 6c3d3412..4dca16b8 100644 --- a/sass/layout/_forms.scss +++ b/sass/layout/_forms.scss @@ -8,15 +8,17 @@ input, select{ border-color: $teal-lighter; } - &:-webkit-autofill { - background-color: $gray-dark !important; + // Change Autocomplete styles in Chrome + &:-webkit-autofill, + &:-webkit-autofill:hover, + &:-webkit-autofill:focus, { + border: 1px solid $input-border; + -webkit-text-fill-color: $input-color; + transition: background-color 5000s ease-in-out 0s; + font-family: "Oxygen Bold", Arial, sans-serif; + font-weight: bold; + font-size: 12px; @include box-shadow(0 0 0 50px $gray-dark inset !important); - -webkit-text-fill-color: $gray-lighter; - } - - &:-webkit-autofill:focus { - @include box-shadow(0 0 0 50px $gray-dark inset !important); - -webkit-text-fill-color: $gray-lighter; } &[disabled]{ @@ -25,7 +27,6 @@ input, select{ &.pf-select2{ height: 32px; // supposed to be select2 field (before initialization) - padding: 6px 12px; } } diff --git a/sass/layout/_main.scss b/sass/layout/_main.scss index b47dd816..45790d77 100644 --- a/sass/layout/_main.scss +++ b/sass/layout/_main.scss @@ -86,7 +86,7 @@ em, } .no-margin{ - margin: 0; + margin: 0 !important; } // show/hide by [data-attr] value ================================================================= @@ -413,14 +413,8 @@ select:active, select:hover { } // select2 custom template ======================================================================== -.select2-results{ - // options - .select2-results__options--nested{ - .select2-results__option{ - padding-left: 10px; // more padding for nested options - } - } - +.select2-results, +.select2-container--pathfinder { [class*="col-"]{ // smaller and less padding padding-left: 3px; @@ -434,28 +428,22 @@ select:active, select:hover { padding-right: 0; } } - - .clearfix.pf-result-image [class*="col-"]{ - line-height: 22px; // options with images need more height - } } .select2{ ::-webkit-search-cancel-button{ -webkit-appearance: none !important; } - - .select2-selection__choice__remove{ - float: left; - } - - .select2-selection--multiple{ - input{ - box-shadow: none !important; - } - } } +.select2-results.mCustomScrollbar{ + overflow-y: scroll; + + .select2-results__option--load-more{ + position: absolute; + margin-top: 50px; // margin gets removed on totalScroll -> enables ajax select options to load next page + } +} // global dataTable styles ======================================================================== .dataTables_wrapper{ diff --git a/sass/library/select2/_core.scss b/sass/library/select2/_core.scss index 05078513..417145ac 100644 --- a/sass/library/select2/_core.scss +++ b/sass/library/select2/_core.scss @@ -46,4 +46,5 @@ white-space: nowrap !important; } -@import "theme/pathfinder/_layout"; +//@import "theme/default/_layout"; +@import "theme/pathfinder/layout"; diff --git a/sass/library/select2/_dropdown.scss b/sass/library/select2/_dropdown.scss index fbd36e05..dc99ce7d 100644 --- a/sass/library/select2/_dropdown.scss +++ b/sass/library/select2/_dropdown.scss @@ -1,7 +1,7 @@ .select2-dropdown { - background-color: white; + background-color: $gray-dark; - border: 1px solid #aaa; + border: 1px solid $gray-light; border-radius: 4px; box-sizing: border-box; diff --git a/sass/library/select2/theme/default/_layout.scss b/sass/library/select2/theme/default/_layout.scss new file mode 100644 index 00000000..ea3d9399 --- /dev/null +++ b/sass/library/select2/theme/default/_layout.scss @@ -0,0 +1,97 @@ +.select2-container--default { + @import "single"; + @import "multiple"; + + &.select2-container--open.select2-container--above { + .select2-selection--single, .select2-selection--multiple { + border-top-left-radius: 0; + border-top-right-radius: 0; + } + } + + &.select2-container--open.select2-container--below { + .select2-selection--single, .select2-selection--multiple { + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; + } + } + + .select2-search--dropdown { + .select2-search__field { + border: 1px solid #aaa; + } + } + + .select2-search--inline { + .select2-search__field { + background: transparent; + border: none; + outline: 0; + box-shadow: none; + -webkit-appearance: textfield; + } + } + + .select2-results > .select2-results__options { + max-height: 200px; + overflow-y: auto; + } + + .select2-results__option { + &[role=group] { + padding: 0; + } + + &[aria-disabled=true] { + color: #999; + } + + &[aria-selected=true] { + background-color: #ddd; + } + + .select2-results__option { + padding-left: 1em; + + .select2-results__group { + padding-left: 0; + } + + .select2-results__option { + margin-left: -1em; + padding-left: 2em; + + .select2-results__option { + margin-left: -2em; + padding-left: 3em; + + .select2-results__option { + margin-left: -3em; + padding-left: 4em; + + .select2-results__option { + margin-left: -4em; + padding-left: 5em; + + .select2-results__option { + margin-left: -5em; + padding-left: 6em; + } + } + } + } + } + } + } + + .select2-results__option--highlighted[aria-selected] { + background-color: #5897fb; + color: white; + } + + .select2-results__group { + cursor: default; + display: block; + padding: 6px; + } +} diff --git a/sass/library/select2/theme/default/_multiple.scss b/sass/library/select2/theme/default/_multiple.scss new file mode 100644 index 00000000..55852002 --- /dev/null +++ b/sass/library/select2/theme/default/_multiple.scss @@ -0,0 +1,96 @@ +.select2-selection--multiple { + background-color: white; + border: 1px solid #aaa; + border-radius: 4px; + cursor: text; + + .select2-selection__rendered { + box-sizing: border-box; + list-style: none; + margin: 0; + padding: 0 5px; + width: 100%; + + li { + list-style: none; + } + } + + .select2-selection__clear { + cursor: pointer; + float: right; + font-weight: bold; + margin-top: 5px; + margin-right: 10px; + + // This padding is to account for the bottom border for the first + // selection row and the top border of the second selection row. + // Without it, selections on the first row may be offset incorrectly + // and appear in their own row instead of going to the second row + padding: 1px; + } + + .select2-selection__choice { + background-color: #e4e4e4; + + border: 1px solid #aaa; + border-radius: 4px; + cursor: default; + + float: left; + + margin-right: 5px; + margin-top: 5px; + padding: 0 5px; + } + + .select2-selection__choice__remove { + color: #999; + cursor: pointer; + + display: inline-block; + font-weight: bold; + + margin-right: 2px; + + &:hover { + color: #333; + } + } +} + +&[dir="rtl"] { + .select2-selection--multiple { + .select2-selection__choice, .select2-search--inline { + float: right; + } + + .select2-selection__choice { + margin-left: 5px; + margin-right: auto; + } + + .select2-selection__choice__remove { + margin-left: 2px; + margin-right: auto; + } + } +} + +&.select2-container--focus { + .select2-selection--multiple { + border: solid black 1px; + outline: 0; + } +} + +&.select2-container--disabled { + .select2-selection--multiple { + background-color: #eee; + cursor: default; + } + + .select2-selection__choice__remove { + display: none; + } +} diff --git a/sass/library/select2/theme/default/_single.scss b/sass/library/select2/theme/default/_single.scss new file mode 100644 index 00000000..1387af00 --- /dev/null +++ b/sass/library/select2/theme/default/_single.scss @@ -0,0 +1,83 @@ +.select2-selection--single { + background-color: #fff; + border: 1px solid #aaa; + border-radius: 4px; + + .select2-selection__rendered { + color: #444; + line-height: 28px; + } + + .select2-selection__clear { + cursor: pointer; + float: right; + font-weight: bold; + } + + .select2-selection__placeholder { + color: #999; + } + + .select2-selection__arrow { + height: 26px; + + position: absolute; + + top: 1px; + right: 1px; + + width: 20px; + + b { + border-color: #888 transparent transparent transparent; + border-style: solid; + border-width: 5px 4px 0 4px; + + height: 0; + left: 50%; + + margin-left: -4px; + margin-top: -2px; + + position: absolute; + + top: 50%; + width: 0; + } + } +} + +&[dir="rtl"] { + .select2-selection--single { + .select2-selection__clear { + float: left; + } + + .select2-selection__arrow { + left: 1px; + right: auto; + } + } +} + +&.select2-container--disabled { + .select2-selection--single { + background-color: #eee; + cursor: default; + + .select2-selection__clear { + display: none; + } + } +} + +&.select2-container--open { + .select2-selection--single { + .select2-selection__arrow { + b { + border-color: transparent transparent #888 transparent; + border-width: 0 4px 5px 4px; + } + } + } +} diff --git a/sass/library/select2/theme/pathfinder/_defaults.scss b/sass/library/select2/theme/pathfinder/_defaults.scss deleted file mode 100644 index 28209f46..00000000 --- a/sass/library/select2/theme/pathfinder/_defaults.scss +++ /dev/null @@ -1,35 +0,0 @@ -$remove-color: $red-dark !default; -$remove-hover-color: $red-darker !default; -$remove-width: 20px !default; - -$selection-color: #444 !default; - -$border-color: $gray-light !default; -$border-radius: 0px !default; - -$focus-border-color: $teal-lighter !default; - -$container-height: 28px !default; - -$selection-bg-top-color: $gray-dark !default; -$selection-bg-bottom-color: #eeeeee !default; - -$container-placeholder-color: #999 !default; - -$container-focus-border-color: blue !default; - -$selection-opened-bg-top-color: $selection-bg-bottom-color !default; -$selection-opened-bg-bottom-color: $selection-bg-top-color !default; - -$dropdown-z-index: 1 !default; - -$dropdown-bg-color: $selection-bg-top-color !default; - -$results-max-height: 200px !default; -$results-nested-padding: 20px !default; - -$results-choice-bg-hover-color: $gray-lighter !default; -$results-choice-fg-hover-color: $gray-dark !default; - -$results-choice-fg-unselectable-color: $gray-light !default; -$results-choice-bg-unselectable-color: $gray !default; diff --git a/sass/library/select2/theme/pathfinder/_layout.scss b/sass/library/select2/theme/pathfinder/_layout.scss index 1ccf008f..6eb82063 100644 --- a/sass/library/select2/theme/pathfinder/_layout.scss +++ b/sass/library/select2/theme/pathfinder/_layout.scss @@ -1,61 +1,76 @@ -@import "defaults"; -@import "../../mixins/gradients"; - .select2-container--pathfinder { - @import "single"; - @import "multiple"; + @import "sass/library/select2/theme/pathfinder/single"; + @import "sass/library/select2/theme/pathfinder/multiple"; + + &.select2-container--open.select2-container--above { + .select2-selection--single, .select2-selection--multiple { + border-top-left-radius: 0; + border-top-right-radius: 0; + border-top: 0; // color: transparent leaves 1px gap + } + } + + &.select2-container--open.select2-container--below { + .select2-selection--single, .select2-selection--multiple { + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; + border-bottom: 0; // color: transparent leaves 1px gap + } + } .select2-search--dropdown { .select2-search__field { - border: 1px solid $border-color; - outline: 0; + border: 1px solid $gray-light; + + &:focus { + border: 1px solid $teal-lighter; + } } } .select2-search--inline { .select2-search__field { + background: transparent; + border: none; outline: 0; - @include placeholder(); + -webkit-appearance: textfield; + box-shadow: none !important; } } - .select2-dropdown { - background-color: $dropdown-bg-color; - border: 1px solid transparent; - overflow: hidden; - @include box-shadow(0 6px 12px rgba(0,0,0, 0.3)); - - img{ - image-rendering: -webkit-optimize-contrast; - width: 21px; - } - } - - .select2-dropdown--above { - border-bottom: none; - } - - .select2-dropdown--below { - border-top: none; - } - - .select2-results { - max-height: $results-max-height; + //.select2-results > .select2-results__options { + // max-height: 200px; + // overflow-y: auto; + //} + .select2-results > .select2-results__options { + max-height: 200px; overflow-y: auto; } + .select2-results .select2-results__options { + //height: 200px; + //overflow-y: auto; + } + .select2-results__option { padding: 3px 6px; min-height: 24px; // options with empty string '' should not collapse + > .clearfix.pf-result-image [class*="col-"]{ + line-height: 22px; // options with images need more height + + img { + height: 22px; + } + } + &[role=group] { padding: 0; } - &[aria-disabled=true], - &[aria-selected=true]{ - color: $results-choice-fg-unselectable-color; - background-color: $results-choice-bg-unselectable-color; + &[aria-disabled=true] { + color: $gray-light; + background-color: $gray; // add a icon to all "disabled" options .pf-select-item-anchor { @@ -73,42 +88,68 @@ } } } + + &[aria-selected=true] { + color: $gray-light; + background-color: $gray; + } + + .select2-results__option { + padding-left: 1em; + + .select2-results__group { + padding-left: 0; + } + + .select2-results__option { + margin-left: -1em; + padding-left: 2em; + + .select2-results__option { + margin-left: -2em; + padding-left: 3em; + + .select2-results__option { + margin-left: -3em; + padding-left: 4em; + + .select2-results__option { + margin-left: -4em; + padding-left: 5em; + + .select2-results__option { + margin-left: -5em; + padding-left: 6em; + } + } + } + } + } + } } .select2-results__option--highlighted[aria-selected] { - background-color: $results-choice-bg-hover-color; - color: $results-choice-fg-hover-color; + background-color: $gray-lighter; + color: $gray-dark; } .select2-results__group { cursor: default; display: block; - padding: 3px 6px; - background-color: $gray; - text-transform: capitalize; + padding: 6px; + background-color: $gray-darker; + color: #777; // like .navbar-default } + // custom PF styles ------------------------------- &.select2-container--open .select2-dropdown { - border-color: $focus-border-color; + border-color: $teal-lighter; + @include box-shadow(0 6px 12px rgba(0,0,0, 0.3)); } - &.select2-container--disabled { - .select2-selection { - background-color: $gray; - cursor: not-allowed; - border: 1px solid $gray-light; - - .select2-selection__arrow{ - background-color: $gray; - } - - .select2-selection__clear{ - display: none; - } - } - } } + // hide small "arrow" for hidden select elements select.select2-hidden-accessible { -moz-appearance: none; @@ -132,4 +173,4 @@ select[readonly].select2-hidden-accessible { } } } -} +} \ No newline at end of file diff --git a/sass/library/select2/theme/pathfinder/_multiple.scss b/sass/library/select2/theme/pathfinder/_multiple.scss index 02c7f174..4dd4cde1 100644 --- a/sass/library/select2/theme/pathfinder/_multiple.scss +++ b/sass/library/select2/theme/pathfinder/_multiple.scss @@ -1,33 +1,41 @@ .select2-selection--multiple { background-color: $gray-dark; - color: $gray-dark; - border: 1px solid $border-color; - border-radius: $border-radius; - + border: 1px solid $gray-light; + border-radius: 0; cursor: text; - outline: 0; - - &:focus { - border: 1px solid $focus-border-color; - } - .select2-selection__rendered { + box-sizing: border-box; list-style: none; margin: 0; - padding: 0 5px; + padding: 0 12px; width: 100%; + + li { + display: flex; + list-style: none; + } } .select2-selection__clear { - display: none; + cursor: pointer; + float: right; + font-weight: bold; + margin-top: 5px; + margin-right: 0; + + // This padding is to account for the bottom border for the first + // selection row and the top border of the second selection row. + // Without it, selections on the first row may be offset incorrectly + // and appear in their own row instead of going to the second row + padding: 1px; } .select2-selection__choice { - background-color: $gray-lighter; - border: 1px solid $border-color; - border-radius: $border-radius; + background-color: $gray-lighter; + border: 1px solid $gray-lighter; + border-radius: 0; cursor: default; float: left; @@ -35,27 +43,34 @@ margin-right: 5px; margin-top: 5px; padding: 0 5px; + + color: $gray-dark; + font-weight: bold; } .select2-selection__choice__remove { - color: $remove-color; + color: $red-dark; cursor: pointer; display: inline-block; font-weight: bold; - margin-right: 4px; + //margin-right: 2px; + min-width: 10px; &:hover { - color: $remove-hover-color; + opacity: .5; } } } &[dir="rtl"] { .select2-selection--multiple { - .select2-selection__choice { + .select2-selection__choice, .select2-search--inline { float: right; + } + + .select2-selection__choice { margin-left: 5px; margin-right: auto; } @@ -67,24 +82,20 @@ } } -&.select2-container--open { +&.select2-container--focus { .select2-selection--multiple { - border: 1px solid $focus-border-color; - } - - &.select2-container--above { - .select2-selection--multiple { - border-top: none; - border-top-left-radius: 0; - border-top-right-radius: 0; - } - } - - &.select2-container--below { - .select2-selection--multiple { - border-bottom: none; - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; - } + border: solid $teal-lighter 1px; + outline: 0; + } +} + +&.select2-container--disabled { + .select2-selection--multiple { + background-color: #eee; + cursor: default; + } + + .select2-selection__choice__remove { + display: none; } } diff --git a/sass/library/select2/theme/pathfinder/_single.scss b/sass/library/select2/theme/pathfinder/_single.scss index 21954393..ab401aaa 100644 --- a/sass/library/select2/theme/pathfinder/_single.scss +++ b/sass/library/select2/theme/pathfinder/_single.scss @@ -1,27 +1,24 @@ .select2-selection--single { background-color: $gray-dark; - border: 1px solid $border-color; - border-radius: $border-radius; - - outline: 0; + border: 1px solid $gray-light; + border-radius: 0; height: 32px; - padding: 6px 16px; &:focus { - border: 1px solid $focus-border-color; + border: 1px solid $teal-lighter; } .select2-selection__rendered { - font-family: 'Oxygen Bold'; color: $gray-lighter; - line-height: 1.5; - padding: 0 10px 0 0; + line-height: 32px; + font-family: 'Oxygen Bold'; + padding-left: 15px; div[class^='col-']:first-child{ - padding-left: 0; // overwrite default padding for "selected" option(s) in custom Bootstrap col layout + padding-left: 0; // overwrite default padding for "selected" option(s) in custom Bootstrap col layout } - > .fas { + > .fas.fa-long-arrow-alt-right { margin-left: 8px; // arrow icon for e.g. wormhole "selected" option } } @@ -30,11 +27,9 @@ cursor: pointer; float: right; font-weight: bold; - margin-right: 3px; - margin-left: 10px; &:hover { - color: $remove-hover-color; + color: $red-darker; } } @@ -43,13 +38,6 @@ } .select2-selection__arrow { - background-color: $gray-dark; - - border: none; - border-left: 1px solid transparent; - border-top-right-radius: $border-radius; - border-bottom-right-radius: $border-radius; - height: 30px; position: absolute; @@ -59,7 +47,6 @@ width: 20px; - b { border-color: #888 transparent transparent transparent; border-style: solid; @@ -86,48 +73,32 @@ } .select2-selection__arrow { - border: none; - border-right: 1px solid $border-color; - - border-radius: 0; - border-top-left-radius: $border-radius; - border-bottom-left-radius: $border-radius; - left: 1px; right: auto; } } } +&.select2-container--disabled { + .select2-selection--single { + background-color: #eee; + cursor: default; + + .select2-selection__clear { + display: none; + } + } +} + &.select2-container--open { .select2-selection--single { - border: 1px solid $focus-border-color; + border: 1px solid $teal-lighter; .select2-selection__arrow { - background: transparent; - - border: none; - b { border-color: transparent transparent #888 transparent; border-width: 0 4px 5px 4px; } } } - - &.select2-container--above { - .select2-selection--single { - border-top: none; - border-top-left-radius: 0; - border-top-right-radius: 0; - } - } - - &.select2-container--below { - .select2-selection--single { - border-bottom: none; - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; - } - } }