From 2d6262c1145c5937afa14d66b5203c84393df679 Mon Sep 17 00:00:00 2001 From: Pierre Spring Date: Fri, 17 Sep 2010 15:13:37 +0200 Subject: loading jQuery and putting it into noConflict mode --- lib/exe/js.php | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'lib/exe/js.php') diff --git a/lib/exe/js.php b/lib/exe/js.php index 3756c43b9..c916bf85d 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -34,8 +34,16 @@ function js_out(){ // The generated script depends on some dynamic options $cache = getCacheName('scripts'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'],'.js'); + // load jQuery, minified if compression is eanbled. + $jquery_file_path = DOKU_INC.'lib/scripts/jquery/jquery'; + if($conf['compress']) { + $jquery_file_path .= '.min'; + } + $jquery_file_path .= '.js'; + // array of core files $files = array( + $jquery_file_path, DOKU_INC.'lib/scripts/helpers.js', DOKU_INC.'lib/scripts/events.js', DOKU_INC.'lib/scripts/delay.js', -- cgit v1.2.3 From c4bb7947fcb2d4a5e5f8a15d9e3bbec333e44e13 Mon Sep 17 00:00:00 2001 From: Pierre Spring Date: Sun, 10 Oct 2010 23:42:56 +0200 Subject: Got rid of drag.js and added jQuery UI instead. --- lib/exe/js.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/exe/js.php') diff --git a/lib/exe/js.php b/lib/exe/js.php index c916bf85d..59d1ded2c 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -44,6 +44,8 @@ function js_out(){ // array of core files $files = array( $jquery_file_path, + DOKU_INC.'lib/scripts/jquery-ui/jquery-ui.core.min.js', + DOKU_INC.'lib/scripts/jquery-ui/jquery-ui.interactions.min.js', DOKU_INC.'lib/scripts/helpers.js', DOKU_INC.'lib/scripts/events.js', DOKU_INC.'lib/scripts/delay.js', @@ -52,7 +54,6 @@ function js_out(){ DOKU_INC.'lib/scripts/tw-sack.js', DOKU_INC.'lib/scripts/ajax.js', DOKU_INC.'lib/scripts/index.js', - DOKU_INC.'lib/scripts/drag.js', DOKU_INC.'lib/scripts/textselection.js', DOKU_INC.'lib/scripts/toolbar.js', DOKU_INC.'lib/scripts/edit.js', -- cgit v1.2.3 From 80997d21e0aee9b8f27153000742ecd781f429f8 Mon Sep 17 00:00:00 2001 From: Michal Rezler Date: Sat, 26 Mar 2011 12:46:37 +0100 Subject: locktimer.js is jQueryfied --- lib/exe/js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/exe/js.php') diff --git a/lib/exe/js.php b/lib/exe/js.php index f953aae9e..b0b722a2e 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -122,7 +122,7 @@ function js_out(){ js_runonstart("initSizeCtl('size__ctl','wiki__text')"); js_runonstart("initToolbar('tool__bar','wiki__text',toolbar)"); if($conf['locktime'] != 0){ - js_runonstart("locktimer.init(".($conf['locktime'] - 60).",'".js_escape($lang['willexpire'])."',".$conf['usedraft'].")"); + js_runonstart("initLocktimer(".($conf['locktime'] - 60).",'".js_escape($lang['willexpire'])."',".$conf['usedraft'].")"); } js_runonstart('scrollToMarker()'); js_runonstart('focusMarker()'); -- cgit v1.2.3 From fdfb9c6a2877dcbadeab697aad779bea76780965 Mon Sep 17 00:00:00 2001 From: Michal Rezler Date: Sat, 26 Mar 2011 15:42:22 +0100 Subject: cookie.js is jQueryfied, added jQuery-cookie-plugin --- lib/exe/js.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/exe/js.php') diff --git a/lib/exe/js.php b/lib/exe/js.php index b0b722a2e..d3377fb0b 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -44,6 +44,7 @@ function js_out(){ // array of core files $files = array( $jquery_file_path, + DOKU_INC.'lib/scripts/jquery/jquery.cookie.js', DOKU_INC.'lib/scripts/jquery-ui/jquery-ui.core.min.js', DOKU_INC.'lib/scripts/jquery-ui/jquery-ui.interactions.min.js', DOKU_INC.'lib/scripts/helpers.js', -- cgit v1.2.3 From 11bf24d856a6a4cb606bc6fe10ebcbd844f4127f Mon Sep 17 00:00:00 2001 From: Michal Rezler Date: Sun, 27 Mar 2011 13:57:35 +0200 Subject: helpers.js was removed - it basically contained functions they are implemented in jQuery library --- lib/exe/js.php | 1 - 1 file changed, 1 deletion(-) (limited to 'lib/exe/js.php') diff --git a/lib/exe/js.php b/lib/exe/js.php index d3377fb0b..4aa2851c8 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -47,7 +47,6 @@ function js_out(){ DOKU_INC.'lib/scripts/jquery/jquery.cookie.js', DOKU_INC.'lib/scripts/jquery-ui/jquery-ui.core.min.js', DOKU_INC.'lib/scripts/jquery-ui/jquery-ui.interactions.min.js', - DOKU_INC.'lib/scripts/helpers.js', DOKU_INC.'lib/scripts/events.js', DOKU_INC.'lib/scripts/delay.js', DOKU_INC.'lib/scripts/cookie.js', -- cgit v1.2.3 From 2ed49e2ac1bc9ed8a9d514d3ea9515e455768152 Mon Sep 17 00:00:00 2001 From: Michal Rezler Date: Mon, 28 Mar 2011 23:09:13 +0200 Subject: JS API is corrected to the original state --- lib/exe/js.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/exe/js.php') diff --git a/lib/exe/js.php b/lib/exe/js.php index 4aa2851c8..169803658 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -47,6 +47,7 @@ function js_out(){ DOKU_INC.'lib/scripts/jquery/jquery.cookie.js', DOKU_INC.'lib/scripts/jquery-ui/jquery-ui.core.min.js', DOKU_INC.'lib/scripts/jquery-ui/jquery-ui.interactions.min.js', + DOKU_INC.'lib/scripts/helpers.js', DOKU_INC.'lib/scripts/events.js', DOKU_INC.'lib/scripts/delay.js', DOKU_INC.'lib/scripts/cookie.js', @@ -122,7 +123,7 @@ function js_out(){ js_runonstart("initSizeCtl('size__ctl','wiki__text')"); js_runonstart("initToolbar('tool__bar','wiki__text',toolbar)"); if($conf['locktime'] != 0){ - js_runonstart("initLocktimer(".($conf['locktime'] - 60).",'".js_escape($lang['willexpire'])."',".$conf['usedraft'].")"); + js_runonstart("locktimer.init(".($conf['locktime'] - 60).",'".js_escape($lang['willexpire'])."',".$conf['usedraft'].")"); } js_runonstart('scrollToMarker()'); js_runonstart('focusMarker()'); -- cgit v1.2.3 From ff482cae0f5a620704d845037d60ae13ab851410 Mon Sep 17 00:00:00 2001 From: Michal Rezler Date: Wed, 30 Mar 2011 23:08:13 +0200 Subject: fixed import for drag.js and started a rewrite of edit.js --- lib/exe/js.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/exe/js.php') diff --git a/lib/exe/js.php b/lib/exe/js.php index 169803658..183ae6d4c 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -55,6 +55,7 @@ function js_out(){ DOKU_INC.'lib/scripts/tw-sack.js', DOKU_INC.'lib/scripts/ajax.js', DOKU_INC.'lib/scripts/index.js', + DOKU_INC.'lib/scripts/drag.js', DOKU_INC.'lib/scripts/textselection.js', DOKU_INC.'lib/scripts/toolbar.js', DOKU_INC.'lib/scripts/edit.js', -- cgit v1.2.3