diff options
| author | Michael Hamann <michael@content-space.de> | 2011-05-29 22:57:55 +0200 |
|---|---|---|
| committer | Michael Hamann <michael@content-space.de> | 2011-05-29 23:08:38 +0200 |
| commit | 79344f5bffd7dfe74cbfe5e4362425dda4f5b7af (patch) | |
| tree | 178492676b091c03ec52f3a99ad0d089447df823 /lib/scripts/script.js | |
| parent | 5ff127375bd2292958b989dcec18dbca5a8a751f (diff) | |
| parent | 61a2640a5e066cac3e06f2673c63622d59da2e8d (diff) | |
| download | rpg-79344f5bffd7dfe74cbfe5e4362425dda4f5b7af.tar.gz rpg-79344f5bffd7dfe74cbfe5e4362425dda4f5b7af.tar.bz2 | |
Merge branch 'jquery'
Conflicts:
lib/scripts/edit.js
lib/scripts/locktimer.js
Some whitespace (at end of line) cleanup
Diffstat (limited to 'lib/scripts/script.js')
| -rw-r--r-- | lib/scripts/script.js | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/scripts/script.js b/lib/scripts/script.js index 2cc1246f9..a99735c99 100644 --- a/lib/scripts/script.js +++ b/lib/scripts/script.js @@ -1,3 +1,8 @@ +// if jQuery was loaded, let's make it noConflict here. +if ('function' === typeof jQuery && 'function' === typeof jQuery.noConflict) { + jQuery.noConflict(); +} + /** * Some of these scripts were taken from wikipedia.org and were modified for DokuWiki */ |