Internal: Update libs, disabling jquery.scrollbar, chosen libs

pull/3466/head
Julio Montoya 5 years ago
parent fa08e8cccb
commit 14963671d8
  1. 2
      assets/css/app.scss
  2. 86
      assets/css/scss/_base.scss
  3. 7
      assets/css/themes/chamilo/default.css
  4. 26
      assets/js/app.js
  5. 18
      assets/js/vendor.js
  6. 2
      package.json
  7. 16
      webpack.config.js
  8. 5
      yarn.lock

@ -13,7 +13,7 @@
@import "~bootstrap/scss/bootstrap"; @import "~bootstrap/scss/bootstrap";
//@import "~@coreui/coreui/scss/coreui"; //@import "~@coreui/coreui/scss/coreui";
@import "~@fortawesome/fontawesome-free/css/all.css"; @import "~@fortawesome/fontawesome-free/css/all.css";
@import '~chosen-js/chosen.css'; //@import '~chosen-js/chosen.css';
@import '~cropper/dist/cropper.css'; @import '~cropper/dist/cropper.css';
@import '~flag-icon-css/sass/flag-icon.scss'; @import '~flag-icon-css/sass/flag-icon.scss';
@import "~fullcalendar/dist/fullcalendar.css"; @import "~fullcalendar/dist/fullcalendar.css";

@ -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 ******/
.scroll-wrapper { .scroll-wrapper {

@ -1,10 +1,3 @@
/*!
* Chamilo LMS stylesheet - Default v.2.0
* Homepage: https://chamilo.org
* Author: Alex Aragón <alex.aragon@beeznest.com>
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* Based on Bootstrap v3
*/
body { body {
} }

@ -12,8 +12,12 @@ Routing.setRoutingData(routes);
const locale = document.querySelector('html').lang; const locale = document.querySelector('html').lang;
require('./vendor'); import('bootstrap');
require('./main'); import('webpack-jquery-ui');
import('webpack-jquery-ui/css');
import('./vendor');
import('./main');
require('webpack-jquery-ui'); require('webpack-jquery-ui');
require('webpack-jquery-ui/css'); require('webpack-jquery-ui/css');
@ -221,10 +225,8 @@ $(function () {
}); });
}); });
$('.scrollbar-inner').scrollbar();
// Date time settings. // Date time settings.
moment.locale(locale); //moment.locale(locale);
$.datepicker.setDefaults($.datepicker.regional[locale]); $.datepicker.setDefaults($.datepicker.regional[locale]);
$.datepicker.regional["local"] = $.datepicker.regional[locale]; $.datepicker.regional["local"] = $.datepicker.regional[locale];
@ -243,13 +245,13 @@ $(function () {
}); });
// Chosen select // Chosen select
$(".chzn-select").chosen({ // $(".chzn-select").chosen({
disable_search_threshold: 10, // disable_search_threshold: 10,
/*no_results_text: '{{ 'SearchNoResultsFound' | get_lang | escape('js') }}', // /*no_results_text: '{{ 'SearchNoResultsFound' | get_lang | escape('js') }}',
placeholder_text_multiple: '{{ 'SelectSomeOptions' | get_lang | escape('js') }}', // placeholder_text_multiple: '{{ 'SelectSomeOptions' | get_lang | escape('js') }}',
placeholder_text_single: '{{ 'SelectAnOption' | get_lang | escape('js') }}',*/ // placeholder_text_single: '{{ 'SelectAnOption' | get_lang | escape('js') }}',*/
width: "100%" // width: "100%"
}); // });
// Bootstrap tabs. // Bootstrap tabs.
$('.tab_wrapper .nav a').on('click', function (e) { $('.tab_wrapper .nav a').on('click', function (e) {

@ -1,15 +1,11 @@
var moment = require('moment'); const moment = import('moment');
require('moment/min/locales.min');
global.moment = moment; global.moment = moment;
require('webpack-jquery-ui');
require('webpack-jquery-ui/css');
// JS is equivalent to the normal 'bootstrap' package // JS is equivalent to the normal 'bootstrap' package
// no need to set this to a variable, just require it // no need to set this to a variable, just require it
import 'bootstrap';
require('@coreui/coreui/dist/js/coreui.min.js'); //require('@coreui/coreui/dist/js/coreui.min.js');
import 'chosen-js'; //require('chosen-js');
require('mediaelement'); require('mediaelement');
// require('pace-js-amd-fix'); // require('pace-js-amd-fix');
require('multiselect-two-sides'); require('multiselect-two-sides');
@ -19,13 +15,11 @@ require('qtip2');
require('image-map-resizer/js/imageMapResizer.js'); require('image-map-resizer/js/imageMapResizer.js');
require('cropper'); require('cropper');
require('jquery-ui-timepicker-addon/dist/jquery-ui-timepicker-addon'); require('jquery-ui-timepicker-addon/dist/jquery-ui-timepicker-addon');
require('jquery.scrollbar');
require('blueimp-file-upload'); require('blueimp-file-upload');
require('select2'); require('select2');
require('timeago'); require('timeago');
require('sweetalert2'); require('sweetalert2');
require('bootstrap-select');
import 'bootstrap-select';
require('bootstrap-daterangepicker'); require('bootstrap-daterangepicker');
require('fullcalendar/dist/fullcalendar.js'); require('fullcalendar/dist/fullcalendar.js');
require('fullcalendar/dist/gcal.js'); require('fullcalendar/dist/gcal.js');
@ -43,8 +37,8 @@ var textcomplete = require('textcomplete');
global.textcomplete = textcomplete; global.textcomplete = textcomplete;
require('chart.js'); require('chart.js');
require('./annotation.js'); require('./annotation.js');
// require('video.js'); // require('video.js');
// doesn't work with webpack added directly in /public/libs folder // doesn't work with webpack added directly in /public/libs folder

@ -19,7 +19,6 @@
"bootstrap-daterangepicker": "^3.0", "bootstrap-daterangepicker": "^3.0",
"bootstrap-select": "^1.13.17", "bootstrap-select": "^1.13.17",
"chart.js": "^2.9.3", "chart.js": "^2.9.3",
"chosen-js": "^1.8.7",
"ckeditor": "^4.0.0", "ckeditor": "^4.0.0",
"core-js": "^3.0", "core-js": "^3.0",
"cropper": "^4.0", "cropper": "^4.0",
@ -39,7 +38,6 @@
"jquery-ui": "^1.12.1", "jquery-ui": "^1.12.1",
"jquery-ui-timepicker-addon": "^1.6.3", "jquery-ui-timepicker-addon": "^1.6.3",
"jquery-ui-touch-punch": "^0.2.3", "jquery-ui-touch-punch": "^0.2.3",
"jquery.scrollbar": "^0.2.11",
"js-cookie": "^2.2.0", "js-cookie": "^2.2.0",
"jsplumb": "^2.12", "jsplumb": "^2.12",
"linkifyjs": "^2.1", "linkifyjs": "^2.1",

@ -44,16 +44,7 @@ Encore
}) })
.enableSassLoader() .enableSassLoader()
.enableVueLoader(function(options) { .enableVueLoader(function (options) {}, {runtimeCompilerBuild: false})
options.pluginOptions = {
quasar: {
importStrategy: 'manual',
rtlSupport: false
}
}
options.transpileDependencies = ['quasar'];
})
.autoProvidejQuery() .autoProvidejQuery()
.copyFiles([ .copyFiles([
{ {
@ -128,6 +119,11 @@ Encore.addPlugin(new CopyPlugin({
from: './node_modules/tinymce/skins', from: './node_modules/tinymce/skins',
to: 'libs/tinymce/skins' to: 'libs/tinymce/skins'
}, },
{
context: 'node_modules/moment/locale',
from: '**/*',
to: 'libs/locale/'
},
] ]
} }
)); ));

@ -9018,11 +9018,6 @@ jquery-ui@^1.12.1:
resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.12.1.tgz#bcb4045c8dd0539c134bc1488cdd3e768a7a9e51" resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.12.1.tgz#bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"
integrity sha1-vLQEXI3QU5wTS8FIjN0+dop6nlE= 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: 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" version "3.5.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"

Loading…
Cancel
Save