From 14963671d8d41a42ee6c5017e5ca69de2906fbce Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 18 Aug 2020 14:32:30 +0200 Subject: [PATCH] Internal: Update libs, disabling jquery.scrollbar, chosen libs --- assets/css/app.scss | 2 +- assets/css/scss/_base.scss | 86 --------------------------- assets/css/themes/chamilo/default.css | 7 --- assets/js/app.js | 26 ++++---- assets/js/vendor.js | 18 ++---- package.json | 2 - webpack.config.js | 16 ++--- yarn.lock | 5 -- 8 files changed, 27 insertions(+), 135 deletions(-) diff --git a/assets/css/app.scss b/assets/css/app.scss index 68458e2828..7bbfe58522 100644 --- a/assets/css/app.scss +++ b/assets/css/app.scss @@ -13,7 +13,7 @@ @import "~bootstrap/scss/bootstrap"; //@import "~@coreui/coreui/scss/coreui"; @import "~@fortawesome/fontawesome-free/css/all.css"; -@import '~chosen-js/chosen.css'; +//@import '~chosen-js/chosen.css'; @import '~cropper/dist/cropper.css'; @import '~flag-icon-css/sass/flag-icon.scss'; @import "~fullcalendar/dist/fullcalendar.css"; diff --git a/assets/css/scss/_base.scss b/assets/css/scss/_base.scss index 946216b19d..5fb4d0d70b 100755 --- a/assets/css/scss/_base.scss +++ b/assets/css/scss/_base.scss @@ -3111,92 +3111,6 @@ hr { } } -/****** SIMPLE INNER SCROLLBAR ******/ - -.scrollbar-inner > .scroll-element, -.scrollbar-inner > .scroll-element div { - border: none; - margin: 0; - padding: 0; - position: absolute; - z-index: 10; -} - -.scrollbar-inner > .scroll-element div { - display: block; - height: 100%; - left: 0; - top: 0; - width: 100%; -} - -.scrollbar-inner > .scroll-element.scroll-x { - bottom: 2px; - height: 8px; - left: 0; - width: 100%; -} - -.scrollbar-inner > .scroll-element.scroll-y { - height: 100%; - right: 2px; - top: 0; - width: 8px; -} - -.scrollbar-inner > .scroll-element .scroll-element_outer { - overflow: hidden; -} - -.scrollbar-inner > .scroll-element .scroll-element_outer, -.scrollbar-inner > .scroll-element .scroll-element_track, -.scrollbar-inner > .scroll-element .scroll-bar { - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - border-radius: 8px; -} - -.scrollbar-inner > .scroll-element .scroll-element_track, -.scrollbar-inner > .scroll-element .scroll-bar { - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=40)"; - filter: alpha(opacity=40); - opacity: 0.4; -} - -.scrollbar-inner > .scroll-element .scroll-element_track { - background-color: #e0e0e0; -} - -.scrollbar-inner > .scroll-element .scroll-bar { - background-color: #c2c2c2; -} - -.scrollbar-inner > .scroll-element:hover .scroll-bar { - background-color: #919191; -} - -.scrollbar-inner > .scroll-element.scroll-draggable .scroll-bar { - background-color: #919191; -} - -/* update scrollbar offset if both scrolls are visible */ - -.scrollbar-inner > .scroll-element.scroll-x.scroll-scrolly_visible .scroll-element_track { - left: -12px; -} - -.scrollbar-inner > .scroll-element.scroll-y.scroll-scrollx_visible .scroll-element_track { - top: -12px; -} - -.scrollbar-inner > .scroll-element.scroll-x.scroll-scrolly_visible .scroll-element_size { - left: -12px; -} - -.scrollbar-inner > .scroll-element.scroll-y.scroll-scrollx_visible .scroll-element_size { - top: -12px; -} - /****** SCROLL WRAPPER ******/ .scroll-wrapper { diff --git a/assets/css/themes/chamilo/default.css b/assets/css/themes/chamilo/default.css index 35c319342e..54234aad7e 100644 --- a/assets/css/themes/chamilo/default.css +++ b/assets/css/themes/chamilo/default.css @@ -1,10 +1,3 @@ -/*! - * Chamilo LMS stylesheet - Default v.2.0 - * Homepage: https://chamilo.org - * Author: Alex Aragón - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - * Based on Bootstrap v3 -*/ body { } diff --git a/assets/js/app.js b/assets/js/app.js index bf88a94262..f21ee9f9b1 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -12,8 +12,12 @@ Routing.setRoutingData(routes); const locale = document.querySelector('html').lang; -require('./vendor'); -require('./main'); +import('bootstrap'); +import('webpack-jquery-ui'); +import('webpack-jquery-ui/css'); + +import('./vendor'); +import('./main'); require('webpack-jquery-ui'); require('webpack-jquery-ui/css'); @@ -221,10 +225,8 @@ $(function () { }); }); - $('.scrollbar-inner').scrollbar(); - // Date time settings. - moment.locale(locale); + //moment.locale(locale); $.datepicker.setDefaults($.datepicker.regional[locale]); $.datepicker.regional["local"] = $.datepicker.regional[locale]; @@ -243,13 +245,13 @@ $(function () { }); // Chosen select - $(".chzn-select").chosen({ - disable_search_threshold: 10, - /*no_results_text: '{{ 'SearchNoResultsFound' | get_lang | escape('js') }}', - placeholder_text_multiple: '{{ 'SelectSomeOptions' | get_lang | escape('js') }}', - placeholder_text_single: '{{ 'SelectAnOption' | get_lang | escape('js') }}',*/ - width: "100%" - }); + // $(".chzn-select").chosen({ + // disable_search_threshold: 10, + // /*no_results_text: '{{ 'SearchNoResultsFound' | get_lang | escape('js') }}', + // placeholder_text_multiple: '{{ 'SelectSomeOptions' | get_lang | escape('js') }}', + // placeholder_text_single: '{{ 'SelectAnOption' | get_lang | escape('js') }}',*/ + // width: "100%" + // }); // Bootstrap tabs. $('.tab_wrapper .nav a').on('click', function (e) { diff --git a/assets/js/vendor.js b/assets/js/vendor.js index edbec660d6..17297138ed 100644 --- a/assets/js/vendor.js +++ b/assets/js/vendor.js @@ -1,15 +1,11 @@ -var moment = require('moment'); -require('moment/min/locales.min'); +const moment = import('moment'); global.moment = moment; -require('webpack-jquery-ui'); -require('webpack-jquery-ui/css'); - // JS is equivalent to the normal 'bootstrap' package // no need to set this to a variable, just require it -import 'bootstrap'; -require('@coreui/coreui/dist/js/coreui.min.js'); -import 'chosen-js'; + +//require('@coreui/coreui/dist/js/coreui.min.js'); +//require('chosen-js'); require('mediaelement'); // require('pace-js-amd-fix'); require('multiselect-two-sides'); @@ -19,13 +15,11 @@ require('qtip2'); require('image-map-resizer/js/imageMapResizer.js'); require('cropper'); require('jquery-ui-timepicker-addon/dist/jquery-ui-timepicker-addon'); -require('jquery.scrollbar'); require('blueimp-file-upload'); require('select2'); require('timeago'); require('sweetalert2'); - -import 'bootstrap-select'; +require('bootstrap-select'); require('bootstrap-daterangepicker'); require('fullcalendar/dist/fullcalendar.js'); require('fullcalendar/dist/gcal.js'); @@ -43,8 +37,8 @@ var textcomplete = require('textcomplete'); global.textcomplete = textcomplete; require('chart.js'); - require('./annotation.js'); + // require('video.js'); // doesn't work with webpack added directly in /public/libs folder diff --git a/package.json b/package.json index d71bf05618..0ada290364 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,6 @@ "bootstrap-daterangepicker": "^3.0", "bootstrap-select": "^1.13.17", "chart.js": "^2.9.3", - "chosen-js": "^1.8.7", "ckeditor": "^4.0.0", "core-js": "^3.0", "cropper": "^4.0", @@ -39,7 +38,6 @@ "jquery-ui": "^1.12.1", "jquery-ui-timepicker-addon": "^1.6.3", "jquery-ui-touch-punch": "^0.2.3", - "jquery.scrollbar": "^0.2.11", "js-cookie": "^2.2.0", "jsplumb": "^2.12", "linkifyjs": "^2.1", diff --git a/webpack.config.js b/webpack.config.js index e9287b04f6..bada1afaec 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -44,16 +44,7 @@ Encore }) .enableSassLoader() - .enableVueLoader(function(options) { - options.pluginOptions = { - quasar: { - importStrategy: 'manual', - rtlSupport: false - } - } - - options.transpileDependencies = ['quasar']; - }) + .enableVueLoader(function (options) {}, {runtimeCompilerBuild: false}) .autoProvidejQuery() .copyFiles([ { @@ -128,6 +119,11 @@ Encore.addPlugin(new CopyPlugin({ from: './node_modules/tinymce/skins', to: 'libs/tinymce/skins' }, + { + context: 'node_modules/moment/locale', + from: '**/*', + to: 'libs/locale/' + }, ] } )); diff --git a/yarn.lock b/yarn.lock index bd1d057578..8d90e74183 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9018,11 +9018,6 @@ jquery-ui@^1.12.1: resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.12.1.tgz#bcb4045c8dd0539c134bc1488cdd3e768a7a9e51" integrity sha1-vLQEXI3QU5wTS8FIjN0+dop6nlE= -jquery.scrollbar@^0.2.11: - version "0.2.11" - resolved "https://registry.yarnpkg.com/jquery.scrollbar/-/jquery.scrollbar-0.2.11.tgz#e91bd4a97d83859463024d26e730dc36676ab59d" - integrity sha1-6RvUqX2DhZRjAk0m5zDcNmdqtZ0= - jquery@>2.1.4, jquery@>=1.10, "jquery@>=1.5.0 <4.0", jquery@>=1.6.0, jquery@>=1.7, "jquery@^1.8.3 || ^2.0 || ^3.0", jquery@^3.3.1, jquery@^3.5, jquery@^3.5.0: version "3.5.1" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"