chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Form: Restore daterangepicker input + update js lib

Browse Source
pull/4020/head
Julio 4 years ago
parent 09205ed842
commit 408d6504cc
3 changed files with 46 additions and 98 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 17
      assets/js/app.js
  2. 11
      package.json
  3. 116
      yarn.lock

17
assets/js/app.js
Unescape View File

@ -18,6 +18,7 @@ const { DateTime } = require("luxon");
window.luxon = global.luxon = DateTime;
import 'select2/dist/js/select2.full.min';
import 'select2/dist/css/select2.min.css';
import 'moment';
// Gets HTML content from tinymce
window.getContentFromEditor = function (id) {
@ -53,9 +54,16 @@ require('webpack-jquery-ui/css');
require('./vendor');
import './main';
import('bootstrap-daterangepicker');
// Date time settings.
import moment from 'moment'
global.moment = moment;
moment.locale(locale);
//$.datepicker.setDefaults($.datepicker.regional[locale]);
//$.datepicker.regional["local"] = $.datepicker.regional[locale];
import('qtip2');
//require('bootstrap-daterangepicker/daterangepicker.js');
require('bootstrap-daterangepicker/daterangepicker.js');
require('blueimp-file-upload');
require('blueimp-load-image');
@ -280,11 +288,6 @@ $(function () {
});
});
// Date time settings.
//moment.locale(locale);
//$.datepicker.setDefaults($.datepicker.regional[locale]);
//$.datepicker.regional["local"] = $.datepicker.regional[locale];
/**
* Advanced options
* Usage

11
package.json
Unescape View File

@ -39,7 +39,7 @@
"@vuelidate/core": "^2.0.0-alpha.23",
"@vuelidate/validators": "^2.0.0-alpha.20",
"alpinejs": "^3.4.2",
"autoprefixer": "^10.3.6",
"autoprefixer": "^10.3.7",
"axios": "^0.22.0",
"babel-cli": "6.26.0",
"babel-plugin-transform-builtin-extend": "1.1.2",
@ -63,7 +63,7 @@
"flag-icon-css": "^3.5.0",
"full-icu": "^1.4.0",
"glob-all": "^3.2.1",
"graphql": "^15.5.3",
"graphql": "^15.6.1",
"highlight.js": "^11.2.0",
"hljs": "^6.2.3",
"html2canvas": "^1.3.2",
@ -75,13 +75,14 @@
"js-cookie": "^2.2.1",
"jspdf": "^2.4.0",
"jsplumb": "^2.15.6",
"linkifyjs": "3.0.1",
"linkifyjs": "3.0.2",
"litepicker": "^2.0.11",
"luxon": "^2.0.2",
"mathjax": "^2.7.9",
"mediaelement": "^5.0.1",
"mediaelement-plugins": "https://github.com/chamilo/mediaelement-plugins",
"mini-css-extract-plugin": "^1.6.2",
"moment": "^2.29.1",
"multiselect-two-sides": "^2.5.7",
"mxgraph": "^4.2.2",
"optimize-css-assets-webpack-plugin": "^6.0.1",
@ -96,7 +97,7 @@
"purgecss-webpack-plugin": "4.0.3",
"pwstrength-bootstrap": "3.1.0",
"qtip2": "3.0.3",
"quasar": "2.1.0",
"quasar": "2.1.1",
"readmore-js": "^2.2.1",
"recordrtc": "^5.6.2",
"select2": "^4.1.0-rc.0",
@ -109,7 +110,7 @@
"textcomplete": "^0.18.2",
"timeago": "^1.6.7",
"timepicker": "^1.13.18",
"tinymce": "^5.9.2",
"tinymce": "^5.10.0",
"ts-loader": "^9.2.6",
"video.js": "^7.15.6",
"vue": "3.2.11",

116
yarn.lock
Unescape View File

@ -4832,21 +4832,21 @@ __metadata:
languageName: node
linkType: hard
"autoprefixer@npm:^10.3.6":
version: 10.3.6
resolution: "autoprefixer@npm:10.3.6"
"autoprefixer@npm:^10.3.7":
version: 10.3.7
resolution: "autoprefixer@npm:10.3.7"
dependencies:
browserslist: ^4.17.1
caniuse-lite: ^1.0.30001260
browserslist: ^4.17.3
caniuse-lite: ^1.0.30001264
fraction.js: ^4.1.1
nanocolors: ^0.2.8
normalize-range: ^0.1.2
picocolors: ^0.2.1
postcss-value-parser: ^4.1.0
peerDependencies:
postcss: ^8.1.0
bin:
autoprefixer: bin/autoprefixer
checksum: 2e1b990592a6f982dfc2311a7c58494080b783ab45531277eed14949994c91704c25c596251fc0967dd2749a0cb6459a110781f724805f3c576dde4d3aa886d2
checksum: bbd835343f14de4aaa9246d2196374eaafa59f2f9de3070ac4f9d7c5a92901b8fd6d03b5b0b33ed2b33c971946a010a69dc3703005456774ced5d98bb0e275e0
languageName: node
linkType: hard
@ -6089,21 +6089,6 @@ __metadata:
languageName: node
linkType: hard
"browserslist@npm:^4.17.1":
version: 4.17.1
resolution: "browserslist@npm:4.17.1"
dependencies:
caniuse-lite: ^1.0.30001259
electron-to-chromium: ^1.3.846
escalade: ^3.1.1
nanocolors: ^0.1.5
node-releases: ^1.1.76
bin:
browserslist: cli.js
checksum: 735d4f007dc74f5281d80c7f1677e22d750b78cf9e3c934e8ff4308674fcd4b561c9ec4a8aca7fecd34366077489b29004ca472a480140ccd7674d739c21b7f6
languageName: node
linkType: hard
"browserslist@npm:^4.17.3":
version: 4.17.3
resolution: "browserslist@npm:4.17.3"
@ -6458,20 +6443,6 @@ __metadata:
languageName: node
linkType: hard
"caniuse-lite@npm:^1.0.30001259":
version: 1.0.30001259
resolution: "caniuse-lite@npm:1.0.30001259"
checksum: 2c4e535b0ebf76109437206cc4f327fff25a3d0560ac3a90f053dc53d0ce47f97e9cea18e5edba555e0a3b4b960ce814992c583fbe70ec36e446be2c76ec935e
languageName: node
linkType: hard
"caniuse-lite@npm:^1.0.30001260":
version: 1.0.30001261
resolution: "caniuse-lite@npm:1.0.30001261"
checksum: 7739142d9388560b287e0cedef5c4a9699cc8516afb3d0dc954e15dc6506729f893dc780438d398fb49234f5a2aec9e90e1021a7fbeb33c55368c4a4f5d17b59
languageName: node
linkType: hard
"caniuse-lite@npm:^1.0.30001264":
version: 1.0.30001265
resolution: "caniuse-lite@npm:1.0.30001265"
@ -6607,7 +6578,7 @@ __metadata:
"@vuelidate/core": ^2.0.0-alpha.23
"@vuelidate/validators": ^2.0.0-alpha.20
alpinejs: ^3.4.2
autoprefixer: ^10.3.6
autoprefixer: ^10.3.7
axios: ^0.22.0
babel-cli: 6.26.0
babel-plugin-transform-builtin-extend: 1.1.2
@ -6635,7 +6606,7 @@ __metadata:
free-jqgrid: "https://github.com/chamilo/jqGrid.git#bs4"
full-icu: ^1.4.0
glob-all: ^3.2.1
graphql: ^15.5.3
graphql: ^15.6.1
graphql-tag: ^2.12.5
highlight.js: ^11.2.0
hljs: ^6.2.3
@ -6648,13 +6619,14 @@ __metadata:
js-cookie: ^2.2.1
jspdf: ^2.4.0
jsplumb: ^2.15.6
linkifyjs: 3.0.1
linkifyjs: 3.0.2
litepicker: ^2.0.11
luxon: ^2.0.2
mathjax: ^2.7.9
mediaelement: ^5.0.1
mediaelement-plugins: "https://github.com/chamilo/mediaelement-plugins"
mini-css-extract-plugin: ^1.6.2
moment: ^2.29.1
multiselect-two-sides: ^2.5.7
mxgraph: ^4.2.2
node-sass: 6.0.1
@ -6672,7 +6644,7 @@ __metadata:
purgecss-webpack-plugin: 4.0.3
pwstrength-bootstrap: 3.1.0
qtip2: 3.0.3
quasar: 2.1.0
quasar: 2.1.1
readmore-js: ^2.2.1
recordrtc: ^5.6.2
sass: ^1.42.1
@ -6687,7 +6659,7 @@ __metadata:
textcomplete: ^0.18.2
timeago: ^1.6.7
timepicker: ^1.13.18
tinymce: ^5.9.2
tinymce: ^5.10.0
ts-loader: ^9.2.6
typescript: ^4.3.5
video.js: ^7.15.6
@ -8858,13 +8830,6 @@ __metadata:
languageName: node
linkType: hard
"electron-to-chromium@npm:^1.3.846":
version: 1.3.846
resolution: "electron-to-chromium@npm:1.3.846"
checksum: 2719cab6aa91ab0ad3a5b4dd2dc6100fd441f765cfbe55806d238efb6f908f4577b2607e33e2f8e5794389c377e21507d8747548524093073e11fdda9761e73b
languageName: node
linkType: hard
"electron-to-chromium@npm:^1.3.857":
version: 1.3.862
resolution: "electron-to-chromium@npm:1.3.862"
@ -10858,10 +10823,10 @@ fsevents@~2.3.2:
languageName: node
linkType: hard
"graphql@npm:^15.5.3":
version: 15.5.3
resolution: "graphql@npm:15.5.3"
checksum: 2538efd61b5e1317cfaba796685412aa45f97504002af823a0d0682f8a60f4698343f8ba2793c83c276c76a6b14d8301e58b9f8ad7b61191c380d48e274e6b4d
"graphql@npm:^15.6.1":
version: 15.6.1
resolution: "graphql@npm:15.6.1"
checksum: b6ce4fd769d0df5d4e501014f169f29c5e5520f8f913d94a907e04fe221280a58699e7c76f959a68a2d29932e13bfb6529af537eb99e56e5424304da02ddb808
languageName: node
linkType: hard
@ -13007,10 +12972,10 @@ fsevents@~2.3.2:
languageName: node
linkType: hard
"linkifyjs@npm:3.0.1":
version: 3.0.1
resolution: "linkifyjs@npm:3.0.1"
checksum: 88c271824940313b0a609e729b1dbb78eb4d075c1f609f367f855484ccba46cbb0d6756173e8849019d4936e678d7e277bff9ae2c1520fb42642ba81dae3962e
"linkifyjs@npm:3.0.2":
version: 3.0.2
resolution: "linkifyjs@npm:3.0.2"
checksum: 5c76aee1678e366a25c83325788521b36bd5f358798a48a117e680142e1b6339cd897acee4d25871f9a17713871007e5c92540525f8742f64d85def1d38da8f9
languageName: node
linkType: hard
@ -14009,7 +13974,7 @@ fsevents@~2.3.2:
languageName: node
linkType: hard
"moment@npm:>= 2.9.0, moment@npm:^2.29.0, moment@npm:^2.9.0":
"moment@npm:>= 2.9.0, moment@npm:^2.29.0, moment@npm:^2.29.1, moment@npm:^2.9.0":
version: 2.29.1
resolution: "moment@npm:2.29.1"
checksum: 86729013febf7160de5b93da69273dd304d674b0224f9544b3abd09a87671ddd2cdd57598261ce57588910d63747ffd5590965e83c790d8bf327083c0e0a06e0
@ -14184,20 +14149,6 @@ fsevents@~2.3.2:
languageName: node
linkType: hard
"nanocolors@npm:^0.1.5":
version: 0.1.5
resolution: "nanocolors@npm:0.1.5"
checksum: a0e385518a6381a86d9f5452000494ee65ffbbe2986620acefd557fd665b497804000b8095f16f81ec7a1a55d4d0a864dabd3460f4c2a76f971261aff00f27ca
languageName: node
linkType: hard
"nanocolors@npm:^0.2.8":
version: 0.2.12
resolution: "nanocolors@npm:0.2.12"
checksum: 6f66a8cccb3bf419aacc9ec416dc948d4cea10681f6cf19ecfebdf707b593ea53f6dd6d675128c41e0a4164e734e54497beb20ddd00dacd859c4b5cad2a8c60f
languageName: node
linkType: hard
"nanoid@npm:^2.1.0":
version: 2.1.11
resolution: "nanoid@npm:2.1.11"
@ -14469,13 +14420,6 @@ fsevents@~2.3.2:
languageName: node
linkType: hard
"node-releases@npm:^1.1.76":
version: 1.1.76
resolution: "node-releases@npm:1.1.76"
checksum: 965c5a4f5a3d8953e95388178d9d0df76da443eb8108817dc19e7fc9a6c97e3f4c6f7f7728b99912c41d7f80f468573395b47c9c6bdd3e319a61b4bb173fcac4
languageName: node
linkType: hard
"node-releases@npm:^1.1.77":
version: 1.1.77
resolution: "node-releases@npm:1.1.77"
@ -16871,10 +16815,10 @@ fsevents@~2.3.2:
languageName: node
linkType: hard
"quasar@npm:2.1.0":
version: 2.1.0
resolution: "quasar@npm:2.1.0"
checksum: f3b4405556624a5bdf919e8dffe7e0cdb26106542b84c2882c98c42e18c6219d15a089fca9d5096987be6ac97fa7b30675bdeb722a355556e778e59aae027f13
"quasar@npm:2.1.1":
version: 2.1.1
resolution: "quasar@npm:2.1.1"
checksum: 055d97b6d61254b7123009175e8bd644c9190ab3559ec2c1efa67c8e848a484060a47329a2bbeb18968c20cf686fee93fdef991a734faf2914a78c998de2ef49
languageName: node
linkType: hard
@ -19440,10 +19384,10 @@ fsevents@~2.3.2:
languageName: node
linkType: hard
"tinymce@npm:^5.9.2":
version: 5.9.2
resolution: "tinymce@npm:5.9.2"
checksum: c427cff680d466a70e6c0b99862c8f5e27b634700adf2a7547cf4922c00c91e99cb00a919d97eb461c8b619a3a4d3c91bb98a3219b653a4725e81e6353fc09d8
"tinymce@npm:^5.10.0":
version: 5.10.0
resolution: "tinymce@npm:5.10.0"
checksum: 0bc78b27f04f04aec24ace6c5442b11eec521b901794375f22eb5f98e7430b7c7524ef115b7edb15f70469480787654bbde19b4dd68efc7f149b2ed1398bc9cd
languageName: node
linkType: hard

Write Preview
Loading…
Cancel
Save