Просмотр исходного кода

bower components go in lib/, all demos and tests reference them directly

Adam Shaw 12 лет назад
Родитель
Сommit
9181e8be2e
63 измененных файлов с 150 добавлено и 166 удалено
  1. 3 0
      .bowerrc
  2. 3 3
      .gitignore
  3. 25 16
      Gruntfile.js
  4. 1 8
      bower.json
  5. 2 2
      demos/agenda-views.html
  6. 2 2
      demos/basic-views.html
  7. 2 2
      demos/default.html
  8. 2 2
      demos/external-dragging.html
  9. 2 2
      demos/gcal.html
  10. 2 2
      demos/json.html
  11. 2 2
      demos/selectable.html
  12. 3 3
      demos/theme.html
  13. 0 20
      lumbar.json
  14. 2 2
      tests/data_as_a_function.html
  15. 2 2
      tests/day_render.html
  16. 2 2
      tests/dbclick.html
  17. 2 2
      tests/droppable.html
  18. 2 2
      tests/event_data_transform.html
  19. 2 2
      tests/fullheight.html
  20. 2 2
      tests/gcal.html
  21. 2 2
      tests/hiddenDays.html
  22. 2 2
      tests/issue_206_parseDate_dst.html
  23. 2 2
      tests/issue_220_buttons_ie6.html
  24. 2 2
      tests/issue_221_quick_remove_source.html
  25. 2 2
      tests/issue_230_height_json_events.html
  26. 2 2
      tests/issue_244_aspectRatio_0.html
  27. 2 2
      tests/issue_251_empty_end_date.html
  28. 2 2
      tests/issue_333_blinking.html
  29. 2 2
      tests/issue_417_refetchEvents.html
  30. 2 2
      tests/issue_429_gotoDate.html
  31. 2 2
      tests/issue_477_event_width.html
  32. 2 2
      tests/issue_517_js_error_ie.html
  33. 2 2
      tests/issue_554.html
  34. 2 2
      tests/issue_586_refetchEvents.html
  35. 2 2
      tests/issue_616.html
  36. 2 2
      tests/issue_679.html
  37. 2 2
      tests/issue_688_parseInt.html
  38. 2 2
      tests/issue_740_event_resizing.html
  39. 2 2
      tests/issue_750.html
  40. 2 2
      tests/issue_757_removeEvents.html
  41. 2 2
      tests/liquidwidth.html
  42. 2 2
      tests/locale.html
  43. 2 2
      tests/long_event_titles.html
  44. 2 2
      tests/many_agenda_events.html
  45. 2 2
      tests/many_events.html
  46. 2 2
      tests/method_destroy.html
  47. 2 2
      tests/methods.html
  48. 2 2
      tests/no_event_titles.html
  49. 2 2
      tests/options.html
  50. 2 2
      tests/past_future_classNames.html
  51. 2 2
      tests/plain.html
  52. 2 2
      tests/selectable.html
  53. 2 2
      tests/short_agenda.html
  54. 2 2
      tests/skip-redraw-test.html
  55. 2 2
      tests/snap.html
  56. 2 2
      tests/sources.html
  57. 2 2
      tests/sources_new.html
  58. 2 2
      tests/stacking.html
  59. 3 4
      tests/tabs.html
  60. 2 2
      tests/theming.html
  61. 2 2
      tests/triggers.html
  62. 2 2
      tests/triggers_view.html
  63. 2 2
      tests/week_numbers.html

+ 3 - 0
.bowerrc

@@ -0,0 +1,3 @@
+{
+  "directory": "lib"
+}

+ 3 - 3
.gitignore

@@ -4,8 +4,8 @@ build/bower
 build/cdnjs
 dist
 
-# for npm
+# npm modules
 node_modules
 
-# for bower
-bower_components
+# bower components
+lib/*/*

+ 25 - 16
Gruntfile.js

@@ -61,7 +61,7 @@ module.exports = function(grunt) {
 		},
 		expand: true,
 		cwd: 'build/out/',
-		src: [ '*.js', '*.css', '!jquery*' ],
+		src: [ '*.js', '*.css' ],
 		dest: 'build/out/'
 	};
 
@@ -87,7 +87,8 @@ module.exports = function(grunt) {
 		'clean:archive',
 		'modules',
 		'copy:archiveModules',
-		'copy:archiveDependencies',
+		'copy:archiveJQuery',
+		'concat:archiveJQueryUI',
 		'copy:archiveDemos',
 		'copy:archiveDemoTheme',
 		'copy:archiveMisc',
@@ -98,16 +99,24 @@ module.exports = function(grunt) {
 	config.copy.archiveModules = {
 		expand: true,
 		cwd: 'build/out/',
-		src: [ '*.js', '*.css', '!jquery*' ],
+		src: [ '*.js', '*.css' ],
 		dest: 'build/archive/fullcalendar/'
 	};
 
-	// copy the already-minified jQuery and jQuery UI files into the ./jquery/ directory
-	config.copy.archiveDependencies = {
-		files: [
-			{ src: 'build/out/jquery.js', dest: 'build/archive/jquery/jquery.min.js' },
-			{ src: 'build/out/jquery-ui.js', dest: 'build/archive/jquery/jquery-ui.custom.min.js' }
-		]
+	config.copy.archiveJQuery = {
+		src: 'lib/jquery/jquery.min.js',
+		dest: 'build/archive/lib/jquery.min.js'
+	};
+
+	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'
+		],
+		dest: 'build/archive/lib/jquery-ui.custom.min.js'
 	};
 
 	// copy demo files into ./demos/ directory
@@ -127,17 +136,17 @@ module.exports = function(grunt) {
 	// copy the "cupertino" jquery-ui theme into the demo directory (for demos/theme.html)
 	config.copy.archiveDemoTheme = {
 		expand: true,
-		cwd: 'bower_components/jquery-ui/themes/cupertino/',
+		cwd: 'lib/jquery-ui/themes/cupertino/',
 		src: [ 'jquery-ui.min.css', 'images/*' ],
 		dest: 'build/archive/demos/cupertino/'
 	};
 
 	// in demo HTML, rewrites paths to work in the archive
 	function transformDemoPath(path) {
-		path = path.replace('../bower_components/jquery-ui/themes/', ''); // for demos/theme.html
-		path = path.replace('/build/out/jquery.js', '/jquery/jquery.min.js');
-		path = path.replace('/build/out/jquery-ui.js', '/jquery/jquery-ui.custom.min.js');
-		path = path.replace('/build/out/', '/fullcalendar/');
+		path = path.replace('../lib/jquery/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/themes/', '');
+		path = path.replace('../build/out/', '../fullcalendar/');
 		path = path.replace('/fullcalendar.js', '/fullcalendar.min.js');
 		return path;
 	}
@@ -180,7 +189,7 @@ module.exports = function(grunt) {
 	config.copy.bowerModules = {
 		expand: true,
 		cwd: 'build/out/',
-		src: [ '*.js', '*.css', '!jquery*' ],
+		src: [ '*.js', '*.css' ],
 		dest: 'build/bower/'
 	};
 
@@ -221,7 +230,7 @@ module.exports = function(grunt) {
 	config.copy.cdnjsModules = {
 		expand: true,
 		cwd: 'build/out/',
-		src: [ '*.js', '*.css', '!jquery*' ],
+		src: [ '*.js', '*.css' ],
 		dest: 'build/cdnjs/<%= meta.version %>/'
 	};
 

+ 1 - 8
bower.json

@@ -4,12 +4,5 @@
   "devDependencies": {
     "jquery": "~1.10.2",
     "jquery-ui": "~1.10.3"
-  },
-  "ignore": [
-    "**/.*",
-    "node_modules",
-    "bower_components",
-    "test",
-    "tests"
-  ]
+  }
 }

+ 2 - 2
demos/agenda-views.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 2 - 2
demos/basic-views.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 2 - 2
demos/default.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 2 - 2
demos/external-dragging.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 2 - 2
demos/gcal.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script src='../build/out/gcal.js'></script>
 <script>

+ 2 - 2
demos/json.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 2 - 2
demos/selectable.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 3 - 3
demos/theme.html

@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html>
 <head>
-<link rel='stylesheet' href='../bower_components/jquery-ui/themes/cupertino/jquery-ui.min.css' />
+<link rel='stylesheet' href='../lib/jquery-ui/themes/cupertino/jquery-ui.min.css' />
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 0 - 20
lumbar.json

@@ -1,12 +1,6 @@
 {
   "scope": "none",
   "packages": {
-    "dependencies": {
-      "modules": [
-        "jquery",
-        "jquery-ui"
-      ]
-    },
     "fullcalendar": {
       "modules": [
         "fullcalendar",
@@ -16,20 +10,6 @@
     }
   },
   "modules": {
-    "jquery": {
-      "scripts": [
-        "bower_components/jquery/jquery.min.js"
-      ]
-    },
-    "jquery-ui": {
-      "scripts": [
-        "bower_components/jquery-ui/ui/minified/jquery.ui.core.min.js",
-        "bower_components/jquery-ui/ui/minified/jquery.ui.widget.min.js",
-        "bower_components/jquery-ui/ui/minified/jquery.ui.mouse.min.js",
-        "bower_components/jquery-ui/ui/minified/jquery.ui.draggable.min.js",
-        "bower_components/jquery-ui/ui/minified/jquery.ui.resizable.min.js"
-      ]
-    },
     "fullcalendar": {
       "scripts": [
         "src/intro.js",

+ 2 - 2
tests/data_as_a_function.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 2 - 2
tests/day_render.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 2 - 2
tests/dbclick.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 2 - 2
tests/droppable.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 2 - 2
tests/event_data_transform.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 2 - 2
tests/fullheight.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 2 - 2
tests/gcal.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script src='../build/out/gcal.js'></script>
 <script>

+ 2 - 2
tests/hiddenDays.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 2 - 2
tests/issue_206_parseDate_dst.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 2 - 2
tests/issue_220_buttons_ie6.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 2 - 2
tests/issue_221_quick_remove_source.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script src='../build/out/gcal.js'></script>
 <script>

+ 2 - 2
tests/issue_230_height_json_events.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 2 - 2
tests/issue_244_aspectRatio_0.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 2 - 2
tests/issue_251_empty_end_date.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 2 - 2
tests/issue_333_blinking.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 2 - 2
tests/issue_417_refetchEvents.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script src='../build/out/gcal.js'></script>
 <script>

+ 2 - 2
tests/issue_429_gotoDate.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 2 - 2
tests/issue_477_event_width.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 2 - 2
tests/issue_517_js_error_ie.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 2 - 2
tests/issue_554.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script src='../build/out/gcal.js'></script>
 <script>

+ 2 - 2
tests/issue_586_refetchEvents.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script src='../build/out/gcal.js'></script>
 <script>

+ 2 - 2
tests/issue_616.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script src='../build/out/gcal.js'></script>
 <script>

+ 2 - 2
tests/issue_679.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script src='../build/out/gcal.js'></script>
 <script>

+ 2 - 2
tests/issue_688_parseInt.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 2 - 2
tests/issue_740_event_resizing.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 2 - 2
tests/issue_750.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 2 - 2
tests/issue_757_removeEvents.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 2 - 2
tests/liquidwidth.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 2 - 2
tests/locale.html

@@ -9,8 +9,8 @@
 </style>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 2 - 2
tests/long_event_titles.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 2 - 2
tests/many_agenda_events.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 2 - 2
tests/many_events.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 2 - 2
tests/method_destroy.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 2 - 2
tests/methods.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script src='../build/out/gcal.js'></script>
 <script>

+ 2 - 2
tests/no_event_titles.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 2 - 2
tests/options.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 2 - 2
tests/past_future_classNames.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 2 - 2
tests/plain.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 2 - 2
tests/selectable.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 2 - 2
tests/short_agenda.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 2 - 2
tests/skip-redraw-test.html

@@ -10,8 +10,8 @@
 </style>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 2 - 2
tests/snap.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 2 - 2
tests/sources.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script src='../build/out/gcal.js'></script>
 <script>

+ 2 - 2
tests/sources_new.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script src='../build/out/gcal.js'></script>
 <script>

+ 2 - 2
tests/stacking.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>
 

+ 3 - 4
tests/tabs.html

@@ -1,13 +1,12 @@
 <!DOCTYPE html>
 <html>
 <head>
-<link rel='stylesheet' href='../bower_components/jquery-ui/themes/cupertino/jquery-ui.min.css' />
+<link rel='stylesheet' href='../lib/jquery-ui/themes/cupertino/jquery-ui.min.css' />
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
-<script src='../bower_components/jquery-ui/ui/minified/jquery.ui.tabs.min.js'></script>
 <script>
 
 	$(document).ready(function() {

+ 2 - 2
tests/theming.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script src='lib/themeswitcher/jquery.themeswitcher.js'></script>
 <script>

+ 2 - 2
tests/triggers.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script src='../build/out/gcal.js'></script>
 <script>

+ 2 - 2
tests/triggers_view.html

@@ -3,8 +3,8 @@
 <head>
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script src='../build/out/gcal.js'></script>
 <script>

+ 2 - 2
tests/week_numbers.html

@@ -4,8 +4,8 @@
 <link rel='stylesheet' href='../demos/cupertino/theme.css' />
 <link href='../build/out/fullcalendar.css' rel='stylesheet' />
 <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
-<script src='../build/out/jquery.js'></script>
-<script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
 <script src='../build/out/fullcalendar.js'></script>
 <script>