From 2870693e2d709671e76de5404294515874cbea4b Mon Sep 17 00:00:00 2001 From: lipanski Date: Sat, 5 Jul 2014 18:21:13 +0200 Subject: [PATCH 1/5] Relative path in bower.json --- bower.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bower.json b/bower.json index 6d98247..8367c57 100644 --- a/bower.json +++ b/bower.json @@ -20,8 +20,8 @@ }, "main": [ - "/dist/fullcalendar.js", - "/dist/fullcalendar.css" + "dist/fullcalendar.js", + "dist/fullcalendar.css" ], "ignore": [ "*", From e18422d0a9934e61182670dd1a0b0c01549498a5 Mon Sep 17 00:00:00 2001 From: Adam Shaw Date: Fri, 15 Aug 2014 18:28:03 -0700 Subject: [PATCH 2/5] upgrade jquery-mockjax and moment-timezone --- bower.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bower.json b/bower.json index 8367c57..970ed69 100644 --- a/bower.json +++ b/bower.json @@ -13,10 +13,10 @@ "devDependencies": { "jquery-ui": "1.8.17 - 1.10.4", "jquery-simulate-ext": "~1.3.0", - "jquery-mockjax": "~1.5.3", + "jquery-mockjax": "~1.5.4", "jasmine-jquery": "~2.0.3", "jasmine-fixture": "~1.2.0", - "moment-timezone": "~0.0.6" + "moment-timezone": "~0.2.1" }, "main": [ From d6e64b9c7d3d8033a8d4b7c29f96b1f0116e1059 Mon Sep 17 00:00:00 2001 From: Adam Shaw Date: Fri, 15 Aug 2014 18:38:48 -0700 Subject: [PATCH 3/5] upgrade jquery-ui --- Gruntfile.js | 12 ++++++------ bower.json | 2 +- build/karma.conf.js | 2 +- build/tasks/generateLanguages.js | 10 +++++----- demos/agenda-views.html | 2 +- demos/basic-views.html | 2 +- demos/default.html | 2 +- demos/external-dragging.html | 2 +- demos/json.html | 2 +- demos/languages.html | 2 +- demos/selectable.html | 2 +- demos/theme.html | 2 +- demos/timezones.html | 2 +- tests/data_as_a_function.html | 2 +- tests/day_render.html | 2 +- tests/dbclick.html | 2 +- tests/droppable.html | 2 +- tests/event_data_transform.html | 2 +- tests/fullheight.html | 2 +- tests/gcal.html | 2 +- tests/hiddenDays.html | 2 +- tests/issue_1035.html | 2 +- tests/issue_2048.html | 2 +- tests/issue_206_parseDate_dst.html | 2 +- tests/issue_2154.html | 2 +- tests/issue_220_buttons_ie6.html | 2 +- tests/issue_221_quick_remove_source.html | 2 +- tests/issue_230_height_json_events.html | 2 +- tests/issue_244_aspectRatio_0.html | 2 +- tests/issue_251_empty_end_date.html | 2 +- tests/issue_333_blinking.html | 2 +- tests/issue_417_refetchEvents.html | 2 +- tests/issue_429_gotoDate.html | 2 +- tests/issue_477_event_width.html | 2 +- tests/issue_517_js_error_ie.html | 2 +- tests/issue_554.html | 2 +- tests/issue_586_refetchEvents.html | 2 +- tests/issue_616.html | 2 +- tests/issue_679.html | 2 +- tests/issue_688_parseInt.html | 2 +- tests/issue_740_event_resizing.html | 2 +- tests/issue_750.html | 2 +- tests/issue_757_removeEvents.html | 2 +- tests/languages-datepicker.html | 2 +- tests/liquidwidth.html | 2 +- tests/locale.html | 2 +- tests/long_event_titles.html | 2 +- tests/many_agenda_events.html | 2 +- tests/many_events.html | 2 +- tests/memory_leak.html | 2 +- tests/method_destroy.html | 2 +- tests/methods.html | 2 +- tests/no_event_titles.html | 2 +- tests/options.html | 2 +- tests/past_future_classNames.html | 2 +- tests/plain.html | 2 +- tests/selectable.html | 2 +- tests/short_agenda.html | 2 +- tests/skip-redraw-test.html | 2 +- tests/slotEventOverlap-demo.html | 2 +- tests/slot_event_overlap.html | 2 +- tests/snap.html | 2 +- tests/sources.html | 2 +- tests/sources_new.html | 2 +- tests/stacking.html | 2 +- tests/tabs.html | 2 +- tests/theming.html | 2 +- tests/triggers.html | 2 +- tests/triggers_view.html | 2 +- tests/week_numbers.html | 2 +- 70 files changed, 79 insertions(+), 79 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 0de3eeb..6a250ee 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -221,11 +221,11 @@ module.exports = function(grunt) { config.concat.archiveJQueryUI = { src: [ - 'lib/jquery-ui/ui/minified/jquery.ui.core.min.js', - 'lib/jquery-ui/ui/minified/jquery.ui.widget.min.js', - 'lib/jquery-ui/ui/minified/jquery.ui.mouse.min.js', - 'lib/jquery-ui/ui/minified/jquery.ui.draggable.min.js', - 'lib/jquery-ui/ui/minified/jquery.ui.resizable.min.js' + 'lib/jquery-ui/ui/minified/core.min.js', + 'lib/jquery-ui/ui/minified/widget.min.js', + 'lib/jquery-ui/ui/minified/mouse.min.js', + 'lib/jquery-ui/ui/minified/draggable.min.js', + 'lib/jquery-ui/ui/minified/resizable.min.js' ], dest: 'build/temp/archive/lib/jquery-ui.custom.min.js' }; @@ -256,7 +256,7 @@ module.exports = function(grunt) { function transformDemoPath(path) { path = path.replace('../lib/moment/moment.js', '../lib/moment.min.js'); path = path.replace('../lib/jquery/dist/jquery.js', '../lib/jquery.min.js'); - path = path.replace('../lib/jquery-ui/ui/jquery-ui.js', '../lib/jquery-ui.custom.min.js'); + path = path.replace('../lib/jquery-ui/jquery-ui.js', '../lib/jquery-ui.custom.min.js'); path = path.replace('../lib/jquery-ui/themes/cupertino/', '../lib/cupertino/'); path = path.replace('../dist/', '../'); path = path.replace('/fullcalendar.js', '/fullcalendar.min.js'); diff --git a/bower.json b/bower.json index 970ed69..88e042d 100644 --- a/bower.json +++ b/bower.json @@ -11,7 +11,7 @@ "moment": ">=2.5.0" }, "devDependencies": { - "jquery-ui": "1.8.17 - 1.10.4", + "jquery-ui": ">=1.11.1", "jquery-simulate-ext": "~1.3.0", "jquery-mockjax": "~1.5.4", "jasmine-jquery": "~2.0.3", diff --git a/build/karma.conf.js b/build/karma.conf.js index 74343d2..fcb90a8 100644 --- a/build/karma.conf.js +++ b/build/karma.conf.js @@ -22,7 +22,7 @@ module.exports = function(config) { '../lib/moment/moment.js', '../lib/jquery/dist/jquery.js', - '../lib/jquery-ui/ui/jquery-ui.js', + '../lib/jquery-ui/jquery-ui.js', // for jquery simulate '../lib/jquery-simulate-ext/libs/bililiteRange.js', diff --git a/build/tasks/generateLanguages.js b/build/tasks/generateLanguages.js index b158cbb..b64a5ce 100644 --- a/build/tasks/generateLanguages.js +++ b/build/tasks/generateLanguages.js @@ -151,7 +151,7 @@ module.exports = function(grunt) { return '-' + m1.toUpperCase(); }); - var path = pathLib.join(config.datepicker, 'jquery.ui.datepicker-' + datepickerLangCode + '.js'); + var path = pathLib.join(config.datepicker, 'datepicker-' + datepickerLangCode + '.js'); var js; try { @@ -161,11 +161,11 @@ module.exports = function(grunt) { return false; } - js = js.replace( - /^jQuery\([\S\s]*?\{([\S\s]*)\}\);?/m, // inside the jQuery(function) wrap, - function(m0, body) { // use only the function body, modified. + js = js.replace( // remove the UMD wrap + /\(\s*function[\S\s]*?function\s*\(\s*datepicker\s*\)\s*\{([\S\s]*)\}\)\);?/m, + function(m0, body) { // use only the function body, modified - var match = body.match(/\$\.datepicker\.regional[\S\s]*?(\{[\S\s]*?\});?/); + var match = body.match(/datepicker\.regional[\S\s]*?(\{[\S\s]*?\});?/); var props = match[1]; // remove 1 level of tab indentation diff --git a/demos/agenda-views.html b/demos/agenda-views.html index 7979b72..5054e21 100644 --- a/demos/agenda-views.html +++ b/demos/agenda-views.html @@ -6,7 +6,7 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/tests/hiddenDays.html b/tests/hiddenDays.html index d3bd45a..4a59199 100644 --- a/tests/hiddenDays.html +++ b/tests/hiddenDays.html @@ -4,7 +4,7 @@ - + - + - + - + - + - + - + diff --git a/tests/issue_230_height_json_events.html b/tests/issue_230_height_json_events.html index 6e1d0b9..bf2bebb 100644 --- a/tests/issue_230_height_json_events.html +++ b/tests/issue_230_height_json_events.html @@ -4,7 +4,7 @@ - + - + - + - + - + diff --git a/tests/issue_429_gotoDate.html b/tests/issue_429_gotoDate.html index afca176..7f8c796 100644 --- a/tests/issue_429_gotoDate.html +++ b/tests/issue_429_gotoDate.html @@ -4,7 +4,7 @@ - + - + - + - + diff --git a/tests/issue_586_refetchEvents.html b/tests/issue_586_refetchEvents.html index 988104b..b02f66b 100644 --- a/tests/issue_586_refetchEvents.html +++ b/tests/issue_586_refetchEvents.html @@ -4,7 +4,7 @@ - + diff --git a/tests/issue_616.html b/tests/issue_616.html index cf9ed88..9dcc107 100644 --- a/tests/issue_616.html +++ b/tests/issue_616.html @@ -4,7 +4,7 @@ - + diff --git a/tests/issue_679.html b/tests/issue_679.html index 9130670..1771e84 100644 --- a/tests/issue_679.html +++ b/tests/issue_679.html @@ -4,7 +4,7 @@ - + diff --git a/tests/issue_688_parseInt.html b/tests/issue_688_parseInt.html index cbced33..7e1cc36 100644 --- a/tests/issue_688_parseInt.html +++ b/tests/issue_688_parseInt.html @@ -4,7 +4,7 @@ - + - + - + - + - + diff --git a/tests/liquidwidth.html b/tests/liquidwidth.html index a6e8fcf..abc7746 100644 --- a/tests/liquidwidth.html +++ b/tests/liquidwidth.html @@ -4,7 +4,7 @@ - + - + - + - + - + - + - + - + diff --git a/tests/no_event_titles.html b/tests/no_event_titles.html index 2edd1e4..e65555e 100644 --- a/tests/no_event_titles.html +++ b/tests/no_event_titles.html @@ -4,7 +4,7 @@ - + - + - + - + - + - + - + - + - + - + - + diff --git a/tests/sources_new.html b/tests/sources_new.html index f53fb2c..7d41445 100644 --- a/tests/sources_new.html +++ b/tests/sources_new.html @@ -4,7 +4,7 @@ - + diff --git a/tests/stacking.html b/tests/stacking.html index 4b99f5a..33bd468 100644 --- a/tests/stacking.html +++ b/tests/stacking.html @@ -4,7 +4,7 @@ - + - + - + diff --git a/tests/triggers.html b/tests/triggers.html index b3116de..6c4e595 100644 --- a/tests/triggers.html +++ b/tests/triggers.html @@ -4,7 +4,7 @@ - + diff --git a/tests/triggers_view.html b/tests/triggers_view.html index 4792621..5037456 100644 --- a/tests/triggers_view.html +++ b/tests/triggers_view.html @@ -4,7 +4,7 @@ - + diff --git a/tests/week_numbers.html b/tests/week_numbers.html index 3cea089..aec98d4 100644 --- a/tests/week_numbers.html +++ b/tests/week_numbers.html @@ -5,7 +5,7 @@ - +