Commit 4355ce59 authored by Carsten  Rose's avatar Carsten Rose

Merge branch 'fullCalendarBS3' into 'develop'

Full calendar bs3

See merge request !244
parents fa7b29ab 4772b300
Pipeline #3150 passed with stages
in 2 minutes and 2 seconds
......@@ -268,19 +268,33 @@ module.exports = function (grunt) {
fullCalendar: {
files: [
{
cwd: 'node_modules/@fullcalendar/',
src: '**',
dest: "js/fullCalendar",
cwd: 'node_modules/fullcalendar/dist',
src: '*.min.js',
dest: typo3_js,
expand: true,
flatten: false
},
{
cwd: 'node_modules/@fullcalendar/',
src: '**',
dest: typo3_js + "/fullCalendar",
cwd: 'node_modules/fullcalendar/dist',
src: '*.min.css',
dest: typo3_css,
expand: true,
flatten: false
}
},
{
cwd: 'node_modules/fullcalendar/dist',
src: '*.min.*',
dest: "js/",
expand: true,
flatten: false
},
{
cwd: 'node_modules/moment/min',
src: 'moment.min.js',
dest: typo3_js,
expand: true,
flatten: false
},
]
},
eventEmitter: {
......@@ -501,10 +515,6 @@ module.exports = function (grunt) {
src: ['javascript/src/Plugins/qfq.fabric.js'],
dest: typo3_js + 'qfq.fabric.min.js'
},
fullCalendar: {
src: ['js/fullCalendar.js'],
dest: typo3_js + 'fullCalendar.min.js'
},
qfqValidator: {
src: ['javascript/src/Plugins/validator.js'],
dest: typo3_js + 'validator.min.js'
......@@ -513,16 +523,6 @@ module.exports = function (grunt) {
jshint: {
all: js_sources
},
concat: {
js: {
src: 'node_modules/@fullcalendar/*/main.js',
dest: 'js/fullCalendar.js'
},
css: {
src: 'node_modules/@fullcalendar/*/main.min.css',
dest: typo3_css + 'fullCalendar.min.css'
}
},
concat_in_order: {
debug_standalone: {
options: {
......@@ -632,7 +632,7 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-contrib-jasmine');
// Default task(s).
grunt.registerTask('default', ['jshint', 'concat_in_order', 'concat', 'uglify', 'copy', 'less']);
grunt.registerTask('default', ['jshint', 'concat_in_order', 'uglify', 'copy', 'less']);
grunt.registerTask('only-js', ['jshint', 'concat_in_order', 'uglify', 'copy:qfqPlugins', 'copy:worker']);
......
......@@ -41,7 +41,7 @@ QfqNS.Helper = QfqNS.Helper || {};
function () {
var config = {};
var $this = $(this);
var element = $this.get(0);
//var element = $this.get(0);
var configData = $this.data('config');
if (configData) {
if (configData instanceof Object) {
......@@ -51,8 +51,8 @@ QfqNS.Helper = QfqNS.Helper || {};
QfqNS.Log.warning("'data-config' is invalid: " + configData);
}
}
var calendar = new FullCalendar.Calendar(element, configData);
calendar.render();
$this.fullCalendar(configData);
//calendar.render();
}
);
};
......
......@@ -2,10 +2,6 @@
"name": "qfq",
"version": "1.0.0",
"dependencies": {
"@fullcalendar/core": "^4.3.1",
"@fullcalendar/daygrid": "^4.3.0",
"@fullcalendar/list": "^4.3.0",
"@fullcalendar/timegrid": "^4.3.0",
"bootlint": "^0.14.2",
"bootstrap": "^3.3.6",
"bootstrap-validator": "^0.11.5",
......@@ -14,6 +10,7 @@
"codemirror": "^5.24.0",
"corejs-typeahead": "^1.1.1",
"font-awesome": "^4.7.0",
"fullcalendar": "^3.10.1",
"grunt": "^1.0.4",
"grunt-concat-in-order": "^0.2.6",
"grunt-contrib-concat": "^1.0.1",
......@@ -27,6 +24,7 @@
"jqwidgets-framework": "4.2.1",
"jsdoc": "^3.4.0",
"mocha": "^3.2.0",
"moment": "^2.24.0",
"popper.js": "^1.14.3",
"selenium-webdriver": "^3.3.0",
"should": "^11.2.1",
......@@ -40,4 +38,4 @@
},
"license": "ISC",
"repository": "https://git.math.uzh.ch/typo3/qfq"
}
}
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment