From b2a330ca75f1ceec063a08029abb0204110e3601 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 6 Aug 2011 13:56:57 +0200
Subject: removed events.js

---
 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 44ab2d5ca..4355cbfd7 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -44,7 +44,6 @@ function js_out(){
                 DOKU_INC.'lib/scripts/jquery/jquery.cookie.js',
                 DOKU_INC."lib/scripts/jquery/jquery-ui$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',
                 DOKU_INC.'lib/scripts/script.js',
-- 
cgit v1.2.3


From 02782d1287173f3981a008755958543c178de296 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Thu, 18 Aug 2011 12:24:43 +0200
Subject: moved subscription javascript into behaviour

---
 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 4355cbfd7..93d5439e0 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -59,7 +59,6 @@ function js_out(){
                 DOKU_INC.'lib/scripts/locktimer.js',
                 DOKU_INC.'lib/scripts/linkwiz.js',
                 DOKU_INC.'lib/scripts/media.js',
-                DOKU_INC.'lib/scripts/subscriptions.js',
                 DOKU_INC.'lib/scripts/compatibility.js',
 # disabled for FS#1958                DOKU_INC.'lib/scripts/hotkeys.js',
                 DOKU_TPLINC.'script.js',
-- 
cgit v1.2.3


From fbedf1265a6551391cbb7442ec5f9360328ff508 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Thu, 18 Aug 2011 15:17:54 +0200
Subject: moved footnotes and section highlighting to ne file

jquerized
---
 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 93d5439e0..0e0a22d42 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -61,8 +61,9 @@ function js_out(){
                 DOKU_INC.'lib/scripts/media.js',
                 DOKU_INC.'lib/scripts/compatibility.js',
 # disabled for FS#1958                DOKU_INC.'lib/scripts/hotkeys.js',
-                DOKU_TPLINC.'script.js',
                 DOKU_INC.'lib/scripts/behaviour.js',
+                DOKU_INC.'lib/scripts/page.js',
+                DOKU_TPLINC.'script.js',
             );
 
     // add possible plugin scripts and userscript
-- 
cgit v1.2.3


From 99e7bfd4c733d81cd01dd2d97e10bb4dda62df66 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 19 Aug 2011 11:35:58 +0200
Subject: jqueryized locktimer

---
 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 0e0a22d42..e96d45ee6 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -109,7 +109,7 @@ function js_out(){
     js_runonstart("addEvent(document,'click',closePopups)");
     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'].", 'wiki__text')");
+        js_runonstart("dw_locktimer.init(".($conf['locktime'] - 60).",".$conf['usedraft'].")");
     }
     // init hotkeys - must have been done after init of toolbar
 # disabled for FS#1958    js_runonstart('initializeHotkeys()');
-- 
cgit v1.2.3