Merge branch 'master' into skeleton

Gruntfile.js

@@ -221,10 +221,10 @@ 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/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'
 		],
 		dest: 'build/temp/archive/lib/jquery-ui.custom.min.js'
 	};
@@ -255,7 +255,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');

bower.json

@@ -11,17 +11,17 @@
     "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.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": [
-    "/dist/fullcalendar.js",
-    "/dist/fullcalendar.css"
+    "dist/fullcalendar.js",
+    "dist/fullcalendar.css"
   ],
   "ignore": [
     "*",

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

changelog.md

@@ -103,6 +103,17 @@ RESOLVED ISSUES:
 [304]: https://code.google.com/p/fullcalendar/issues/detail?id=304
 
 
+v2.0.3 (2014-08-15)
+-------------------
+
+- moment-2.8.1 compatibility ([2221])
+- relative path in bower.json ([PR 117])
+- upgraded jquery-ui and misc dev dependencies
+
+[2221]: https://code.google.com/p/fullcalendar/issues/detail?id=2221
+[PR 117]: https://github.com/arshaw/fullcalendar/pull/177
+
+
 v2.0.2 (2014-06-24)
 -------------------
 

demos/external-dragging.html

@@ -6,7 +6,7 @@
 <link href='../dist/fullcalendar.print.css' rel='stylesheet' media='print' />
 <script src='../lib/moment/moment.js'></script>
 <script src='../lib/jquery/dist/jquery.js'></script>
-<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
+<script src='../lib/jquery-ui/jquery-ui.js'></script>
 <script src='../dist/fullcalendar.js'></script>
 <script>