diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2013-01-26 12:28:08 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2013-01-26 12:28:08 +0100 |
| commit | 740ad2a0110d8ab4529231c74eef0b87a4c741ac (patch) | |
| tree | aea9573ccb84a93ebdc0b3ef0d1d990cf6c8d24b /lib/exe/js.php | |
| parent | bcc1938ed0f7c97629d290070aec14b180e441ae (diff) | |
| parent | c499bfe13cc054e1a85ba63045d722c713ca8da4 (diff) | |
| download | rpg-740ad2a0110d8ab4529231c74eef0b87a4c741ac.tar.gz rpg-740ad2a0110d8ab4529231c74eef0b87a4c741ac.tar.bz2 | |
Merge branch 'pull-request-158' into jquery1.9
* pull-request-158:
added jquery-migrate as a copatibility layer
fixed closing of link wizard
fixed permission messup
update.js applied
update.sh must overwrite stylesheet
jQuery update.sh
jQuery latest
Diffstat (limited to 'lib/exe/js.php')
| -rw-r--r-- | lib/exe/js.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/exe/js.php b/lib/exe/js.php index 42979eeed..969a811cf 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -43,6 +43,8 @@ function js_out(){ DOKU_INC."lib/scripts/jquery/jquery$min.js", DOKU_INC.'lib/scripts/jquery/jquery.cookie.js', DOKU_INC."lib/scripts/jquery/jquery-ui$min.js", + DOKU_INC."lib/scripts/jquery/jquery.mb.browser.js", + DOKU_INC."lib/scripts/jquery/jquery-migrate.js", DOKU_INC."lib/scripts/fileuploader.js", DOKU_INC."lib/scripts/fileuploaderextended.js", DOKU_INC.'lib/scripts/helpers.js', |