From e7f921dcad959dc0d27e53da4d77f5b1211c030a Mon Sep 17 00:00:00 2001
From: Oscar Ciudad <oscar@jacho.net>
Date: Sat, 27 Aug 2011 13:53:11 +0200
Subject: Spanish language update

---
 inc/lang/es/lang.php                     | 3 ++-
 lib/plugins/acl/lang/es/lang.php         | 1 +
 lib/plugins/config/lang/es/lang.php      | 2 ++
 lib/plugins/plugin/lang/es/lang.php      | 1 +
 lib/plugins/popularity/lang/es/lang.php  | 1 +
 lib/plugins/revert/lang/es/lang.php      | 1 +
 lib/plugins/usermanager/lang/es/lang.php | 1 +
 7 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/inc/lang/es/lang.php b/inc/lang/es/lang.php
index 5dc6834e6..4c83f5d96 100644
--- a/inc/lang/es/lang.php
+++ b/inc/lang/es/lang.php
@@ -24,6 +24,7 @@
  * @author Victor Castelan <victorcastelan@gmail.com>
  * @author Mauro Javier Giamberardino <mgiamberardino@gmail.com>
  * @author emezeta <emezeta@infoprimo.com>
+ * @author Oscar Ciudad <oscar@jacho.net>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -109,7 +110,7 @@ $lang['txt_filename']          = 'Subir como (opcional)';
 $lang['txt_overwrt']           = 'Sobreescribir archivo existente';
 $lang['lockedby']              = 'Actualmente bloqueado por';
 $lang['lockexpire']            = 'El bloqueo expira en';
-$lang['js']['willexpire']            = 'Tu bloqueo para editar esta página expira en un minuto.\nPara evitar conflictos usa el botón previsualizar para reiniciar el contador de tiempo.';
+$lang['willexpire']            = 'Tu bloqueo para editar esta página expira en un minuto.\nPara evitar conflictos usa el botón previsualizar para reiniciar el contador de tiempo.';
 $lang['js']['notsavedyet']     = 'Los cambios que no se han guardado se perderán.
 ¿Realmente quieres continuar?';
 $lang['js']['searchmedia']     = 'Buscar archivos';
diff --git a/lib/plugins/acl/lang/es/lang.php b/lib/plugins/acl/lang/es/lang.php
index 096320af9..91a4ca1a1 100644
--- a/lib/plugins/acl/lang/es/lang.php
+++ b/lib/plugins/acl/lang/es/lang.php
@@ -20,6 +20,7 @@
  * @author Victor Castelan <victorcastelan@gmail.com>
  * @author Mauro Javier Giamberardino <mgiamberardino@gmail.com>
  * @author emezeta <emezeta@infoprimo.com>
+ * @author Oscar Ciudad <oscar@jacho.net>
  */
 $lang['admin_acl']             = 'Administración de lista de control de acceso';
 $lang['acl_group']             = 'Grupo';
diff --git a/lib/plugins/config/lang/es/lang.php b/lib/plugins/config/lang/es/lang.php
index 5355d64ad..ccb963ff1 100644
--- a/lib/plugins/config/lang/es/lang.php
+++ b/lib/plugins/config/lang/es/lang.php
@@ -20,6 +20,7 @@
  * @author Victor Castelan <victorcastelan@gmail.com>
  * @author Mauro Javier Giamberardino <mgiamberardino@gmail.com>
  * @author emezeta <emezeta@infoprimo.com>
+ * @author Oscar Ciudad <oscar@jacho.net>
  */
 $lang['menu']                  = 'Parámetros de configuración';
 $lang['error']                 = 'Los parámetros no han sido actualizados a causa de un valor inválido, por favor revise los cambios y re-envíe el formulario. <br /> Los valores incorrectos se mostrarán con un marco rojo alrededor.';
@@ -124,6 +125,7 @@ $lang['jpg_quality']           = 'Calidad de compresión de JPG (0-100)';
 $lang['subscribers']           = 'Habilitar soporte para suscripción a páginas';
 $lang['subscribe_time']        = 'Tiempo después que alguna lista de suscripción fue enviada (seg); Debe ser menor que el tiempo especificado en días recientes.';
 $lang['compress']              = 'Compactar la salida de CSS y javascript';
+$lang['cssdatauri']            = 'Tamaño en bytes hasta el cual las imágenes referenciadas en archivos CSS deberían ir incrustadas en la hoja de estilos para reducir el número de cabeceras de petición HTTP. ¡Esta técnica no funcionará en IE < 8! De <code>400</code> a <code>600</code> bytes es un valor adecuado. Establezca <code>0</code> para deshabilitarlo.';
 $lang['hidepages']             = 'Ocultar páginas con coincidencias (expresiones regulares)';
 $lang['send404']               = 'Enviar "HTTP 404/Page Not Found" para páginas no existentes';
 $lang['sitemap']               = 'Generar sitemap de Google (días)';
diff --git a/lib/plugins/plugin/lang/es/lang.php b/lib/plugins/plugin/lang/es/lang.php
index 207c48d2c..2726a5ffa 100644
--- a/lib/plugins/plugin/lang/es/lang.php
+++ b/lib/plugins/plugin/lang/es/lang.php
@@ -20,6 +20,7 @@
  * @author Victor Castelan <victorcastelan@gmail.com>
  * @author Mauro Javier Giamberardino <mgiamberardino@gmail.com>
  * @author emezeta <emezeta@infoprimo.com>
+ * @author Oscar Ciudad <oscar@jacho.net>
  */
 $lang['menu']                  = 'Administración de Plugins';
 $lang['download']              = 'Descargar e instalar un nuevo plugin';
diff --git a/lib/plugins/popularity/lang/es/lang.php b/lib/plugins/popularity/lang/es/lang.php
index 5e42cd45c..d78343a36 100644
--- a/lib/plugins/popularity/lang/es/lang.php
+++ b/lib/plugins/popularity/lang/es/lang.php
@@ -17,6 +17,7 @@
  * @author Mauro Javier Giamberardino <mgiamberardino@gmail.com>
  * @author Oscar M. Lage <r0sk10@gmail.com>
  * @author emezeta <emezeta@infoprimo.com>
+ * @author Oscar Ciudad <oscar@jacho.net>
  */
 $lang['name']                  = 'Retroinformación (Feedback) plugin Popularity';
 $lang['submit']                = 'Enviar datos';
diff --git a/lib/plugins/revert/lang/es/lang.php b/lib/plugins/revert/lang/es/lang.php
index 7e357e3db..f793eb06d 100644
--- a/lib/plugins/revert/lang/es/lang.php
+++ b/lib/plugins/revert/lang/es/lang.php
@@ -18,6 +18,7 @@
  * @author Victor Castelan <victorcastelan@gmail.com>
  * @author Mauro Javier Giamberardino <mgiamberardino@gmail.com>
  * @author emezeta <emezeta@infoprimo.com>
+ * @author Oscar Ciudad <oscar@jacho.net>
  */
 $lang['menu']                  = 'Restaurador';
 $lang['filter']                = 'Buscar páginas con spam';
diff --git a/lib/plugins/usermanager/lang/es/lang.php b/lib/plugins/usermanager/lang/es/lang.php
index 1e79c6826..50138bf2b 100644
--- a/lib/plugins/usermanager/lang/es/lang.php
+++ b/lib/plugins/usermanager/lang/es/lang.php
@@ -19,6 +19,7 @@
  * @author Victor Castelan <victorcastelan@gmail.com>
  * @author Mauro Javier Giamberardino <mgiamberardino@gmail.com>
  * @author emezeta <emezeta@infoprimo.com>
+ * @author Oscar Ciudad <oscar@jacho.net>
  */
 $lang['menu']                  = 'Administración de usuarios';
 $lang['noauth']                = '(la autenticación de usuarios no está disponible)';
-- 
cgit v1.2.3


From ab8fecc6efc832771505467be33a88e0cafec04e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Chmaj?= <teachmeter@gmail.com>
Date: Sat, 27 Aug 2011 13:54:16 +0200
Subject: Polish language update

---
 inc/lang/pl/lang.php                         | 6 +++++-
 lib/plugins/acl/lang/pl/lang.php             | 1 +
 lib/plugins/config/lang/pl/lang.php          | 1 +
 lib/plugins/plugin/lang/pl/lang.php          | 1 +
 lib/plugins/popularity/lang/pl/lang.php      | 6 ++++++
 lib/plugins/popularity/lang/pl/submitted.txt | 3 +++
 lib/plugins/revert/lang/pl/lang.php          | 1 +
 lib/plugins/usermanager/lang/pl/lang.php     | 1 +
 8 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 lib/plugins/popularity/lang/pl/submitted.txt

diff --git a/inc/lang/pl/lang.php b/inc/lang/pl/lang.php
index 32e5bf80c..f9bf57852 100644
--- a/inc/lang/pl/lang.php
+++ b/inc/lang/pl/lang.php
@@ -11,6 +11,7 @@
  * @author Leszek Stachowski <shazarre@gmail.com>
  * @author maros <dobrimaros@yahoo.pl>
  * @author Grzegorz Widła <dzesdzes@gmail.com>
+ * @author Łukasz Chmaj <teachmeter@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -96,7 +97,7 @@ $lang['txt_filename']          = 'Nazwa pliku (opcjonalnie)';
 $lang['txt_overwrt']           = 'Nadpisać istniejący plik?';
 $lang['lockedby']              = 'Aktualnie zablokowane przez';
 $lang['lockexpire']            = 'Blokada wygasa';
-$lang['js']['willexpire']            = 'Za minutę Twoja blokada tej strony wygaśnie.\nW celu uniknięcia konfliktów wyświetl podgląd aby odnowić blokadę.';
+$lang['willexpire']            = 'Za minutę Twoja blokada tej strony wygaśnie.\nW celu uniknięcia konfliktów wyświetl podgląd aby odnowić blokadę.';
 $lang['js']['notsavedyet']     = 'Nie zapisane zmiany zostaną utracone.
 Czy na pewno kontynuować?';
 $lang['js']['searchmedia']     = 'Szukaj plików';
@@ -163,6 +164,9 @@ $lang['yours']                 = 'Twoja wersja';
 $lang['diff']                  = 'Pokaż różnice między wersjami';
 $lang['diff2']                 = 'Pokaż różnice między zaznaczonymi wersjami';
 $lang['difflink']              = 'Odnośnik do tego porównania';
+$lang['diff_type']             = 'Zobacz różnice:';
+$lang['diff_inline']           = 'W linii';
+$lang['diff_side']             = 'Jeden obok drugiego';
 $lang['line']                  = 'Linia';
 $lang['breadcrumb']            = 'Ślad';
 $lang['youarehere']            = 'Jesteś tutaj';
diff --git a/lib/plugins/acl/lang/pl/lang.php b/lib/plugins/acl/lang/pl/lang.php
index c954abe2a..a72b6af11 100644
--- a/lib/plugins/acl/lang/pl/lang.php
+++ b/lib/plugins/acl/lang/pl/lang.php
@@ -11,6 +11,7 @@
  * @author Leszek Stachowski <shazarre@gmail.com>
  * @author maros <dobrimaros@yahoo.pl>
  * @author Grzegorz Widła <dzesdzes@gmail.com>
+ * @author Łukasz Chmaj <teachmeter@gmail.com>
  */
 $lang['admin_acl']             = 'Zarządzanie uprawnieniami';
 $lang['acl_group']             = 'Grupa';
diff --git a/lib/plugins/config/lang/pl/lang.php b/lib/plugins/config/lang/pl/lang.php
index c051e9e13..6e94a2e3d 100644
--- a/lib/plugins/config/lang/pl/lang.php
+++ b/lib/plugins/config/lang/pl/lang.php
@@ -12,6 +12,7 @@
  * @author Leszek Stachowski <shazarre@gmail.com>
  * @author maros <dobrimaros@yahoo.pl>
  * @author Grzegorz Widła <dzesdzes@gmail.com>
+ * @author Łukasz Chmaj <teachmeter@gmail.com>
  */
 $lang['menu']                  = 'Ustawienia';
 $lang['error']                 = 'Ustawienia nie zostały zapisane z powodu błędnych wartości, przejrzyj je i ponów próbę zapisu. <br/> Niepoprawne wartości są wyróżnione kolorem czerwonym.';
diff --git a/lib/plugins/plugin/lang/pl/lang.php b/lib/plugins/plugin/lang/pl/lang.php
index d4ccc7751..f48426bf6 100644
--- a/lib/plugins/plugin/lang/pl/lang.php
+++ b/lib/plugins/plugin/lang/pl/lang.php
@@ -12,6 +12,7 @@
  * @author Leszek Stachowski <shazarre@gmail.com>
  * @author maros <dobrimaros@yahoo.pl>
  * @author Grzegorz Widła <dzesdzes@gmail.com>
+ * @author Łukasz Chmaj <teachmeter@gmail.com>
  */
 $lang['menu']                  = 'Menadżer wtyczek';
 $lang['download']              = 'Ściągnij i zainstaluj nową wtyczkę';
diff --git a/lib/plugins/popularity/lang/pl/lang.php b/lib/plugins/popularity/lang/pl/lang.php
index fbbe6dab2..d96254fd8 100644
--- a/lib/plugins/popularity/lang/pl/lang.php
+++ b/lib/plugins/popularity/lang/pl/lang.php
@@ -10,6 +10,12 @@
  * @author Leszek Stachowski <shazarre@gmail.com>
  * @author maros <dobrimaros@yahoo.pl>
  * @author Grzegorz Widła <dzesdzes@gmail.com>
+ * @author Łukasz Chmaj <teachmeter@gmail.com>
  */
 $lang['name']                  = 'Informacja o popularności (ładowanie może zająć dłuższą chwilę)';
 $lang['submit']                = 'Wyślij dane';
+$lang['autosubmit']            = 'Automatycznie wysyłaj dane raz na miesiąc';
+$lang['submissionFailed']      = 'Dane nie mogły być przesłane ze względu na następujące błędy:';
+$lang['submitDirectly']        = 'Możesz wysłać dane ręcznie poprzez następujący formularz:';
+$lang['autosubmitError']       = 'Ostatnie wysyłanie automatyczne nie powiodło się ze względu na następujące błędy:';
+$lang['lastSent']              = 'Dane zostały wysłane:';
diff --git a/lib/plugins/popularity/lang/pl/submitted.txt b/lib/plugins/popularity/lang/pl/submitted.txt
new file mode 100644
index 000000000..195e81388
--- /dev/null
+++ b/lib/plugins/popularity/lang/pl/submitted.txt
@@ -0,0 +1,3 @@
+====== Informacje o popularności ======
+
+Wysyłanie danych powiodło się.
\ No newline at end of file
diff --git a/lib/plugins/revert/lang/pl/lang.php b/lib/plugins/revert/lang/pl/lang.php
index 8166250b4..f36dc591a 100644
--- a/lib/plugins/revert/lang/pl/lang.php
+++ b/lib/plugins/revert/lang/pl/lang.php
@@ -9,6 +9,7 @@
  * @author Leszek Stachowski <shazarre@gmail.com>
  * @author maros <dobrimaros@yahoo.pl>
  * @author Grzegorz Widła <dzesdzes@gmail.com>
+ * @author Łukasz Chmaj <teachmeter@gmail.com>
  */
 $lang['menu']                  = 'Menadżer przywracania';
 $lang['filter']                = 'Wyszukaj uszkodzone strony';
diff --git a/lib/plugins/usermanager/lang/pl/lang.php b/lib/plugins/usermanager/lang/pl/lang.php
index 0c4ecbcdf..7c79c5d1f 100644
--- a/lib/plugins/usermanager/lang/pl/lang.php
+++ b/lib/plugins/usermanager/lang/pl/lang.php
@@ -10,6 +10,7 @@
  * @author Leszek Stachowski <shazarre@gmail.com>
  * @author maros <dobrimaros@yahoo.pl>
  * @author Grzegorz Widła <dzesdzes@gmail.com>
+ * @author Łukasz Chmaj <teachmeter@gmail.com>
  */
 $lang['menu']                  = 'Menadżer użytkowników';
 $lang['noauth']                = '(uwierzytelnienie użytkownika niemożliwe)';
-- 
cgit v1.2.3


From 783d2e49b2d8e12ed3bc0693b56c013215099a4c Mon Sep 17 00:00:00 2001
From: Adrian Lang <mail@adrianlang.de>
Date: Sun, 4 Sep 2011 12:35:38 +0200
Subject: Use search_universal in search_index

---
 inc/search.php | 49 +++++++++++++------------------------------------
 1 file changed, 13 insertions(+), 36 deletions(-)

diff --git a/inc/search.php b/inc/search.php
index 7b53edabe..bc7c35482 100644
--- a/inc/search.php
+++ b/inc/search.php
@@ -78,8 +78,8 @@ function search_callback($func,&$data,$base,$file,$type,$lvl,$opts){
  * return values for files are ignored
  *
  * All functions should check the ACL for document READ rights
- * namespaces (directories) are NOT checked as this would break
- * the recursion (You can have an nonreadable dir over a readable
+ * namespaces (directories) are NOT checked (when sneaky_index is 0) as this
+ * would break the recursion (You can have an nonreadable dir over a readable
  * one deeper nested) also make sure to check the file type (for example
  * in case of lockfiles).
  */
@@ -101,45 +101,22 @@ function search_qsearch(&$data,$base,$file,$type,$lvl,$opts){
 /**
  * Build the browsable index of pages
  *
- * $opts['ns'] is the current namespace
+ * $opts['ns'] is the currently viewed namespace
  *
  * @author  Andreas Gohr <andi@splitbrain.org>
  */
 function search_index(&$data,$base,$file,$type,$lvl,$opts){
     global $conf;
-    $return = true;
-
-    $item = array();
-
-    if($type == 'd' && !preg_match('#^'.$file.'(/|$)#','/'.$opts['ns'])){
-        //add but don't recurse
-        $return = false;
-    }elseif($type == 'f' && ($opts['nofiles'] || substr($file,-4) != '.txt')){
-        //don't add
-        return false;
-    }
-
-    $id = pathID($file,($type == 'd'));
-
-    if($type=='d' && $conf['sneaky_index'] && auth_quickaclcheck($id.':') < AUTH_READ){
-        return false;
-    }
-
-    //check hidden
-    if(isHiddenPage($id)){
-        return false;
-    }
-
-    //check ACL
-    if($type=='f' && auth_quickaclcheck($id) < AUTH_READ){
-        return false;
-    }
-
-    $data[]=array( 'id'    => $id,
-            'type'  => $type,
-            'level' => $lvl,
-            'open'  => $return );
-    return $return;
+    $opts = array(
+        'pagesonly' => true,
+        'listdirs' => true,
+        'listfiles' => !$opts['nofiles'],
+        'sneakyacl' => $conf['sneaky_index'],
+        // Hacky, should rather use recmatch
+        'depth' => preg_match('#^'.$file.'(/|$)#','/'.$opts['ns']) ? 0 : -1
+    );
+
+    return search_universal($data, $base, $file, $type, $lvl, $opts);
 }
 
 /**
-- 
cgit v1.2.3


From 923510088dda99cb2790b15308593e47369d4f01 Mon Sep 17 00:00:00 2001
From: Adrian Lang <mail@adrianlang.de>
Date: Sun, 4 Sep 2011 13:52:26 +0200
Subject: tmp: Introduce sneaky2

---
 inc/search.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/inc/search.php b/inc/search.php
index bc7c35482..5ba28a1fc 100644
--- a/inc/search.php
+++ b/inc/search.php
@@ -596,6 +596,25 @@ function search_universal(&$data,$base,$file,$type,$lvl,$opts){
         if($opts['firsthead']) $item['title'] = p_get_first_heading($item['id'],METADATA_DONT_RENDER);
     }
 
+    if($type == 'd' && !$opts['skipacl'] && $opts['sneakyacl'] && $item['perm'] < AUTH_READ) {
+        if ($opts['sneakyacl'] === 2) {
+            // Perform shy sneaking, i. e. just show the ns if it contains
+            // something accessible
+            $old_data_count = count($data);
+            search($data,$base,'search_universal',$opts,$file,$lvl+1);
+            if (count($data) > $old_data_count) {
+                // Contains something visible
+                array_splice($data, $old_data_count, $return ? 0 : count($data),
+                             array($item));
+            } else {
+                // Contains nothing visible, so hide
+                $data = array_slice($data, 0, $old_data_count);
+            }
+        }
+        // Stop recursing in any case since we did it ourself
+        return false;
+    }
+
     // finally add the item
     $data[] = $item;
     return $return;
-- 
cgit v1.2.3


From ba6c070edd92ca0fc8a6ee85d51769d64a19ee7c Mon Sep 17 00:00:00 2001
From: Adrian Lang <mail@adrianlang.de>
Date: Sun, 4 Sep 2011 13:52:43 +0200
Subject: tmp

---
 lib/exe/js.php               |   1 +
 lib/scripts/compatibility.js |   2 +-
 lib/scripts/edit.js          | 221 ++++++++++++++++++++-----------------------
 lib/scripts/index.js         |   3 -
 lib/scripts/linkwiz.js       |   4 -
 lib/scripts/media.js         |   3 -
 lib/scripts/qsearch.js       |   3 -
 lib/scripts/script.js        |   5 +-
 lib/scripts/toolbar.js       |  35 +++----
 lib/scripts/tree.js          |   3 -
 lib/styles/screen.css        |   5 +
 11 files changed, 124 insertions(+), 161 deletions(-)

diff --git a/lib/exe/js.php b/lib/exe/js.php
index e96d45ee6..d52fe3607 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -86,6 +86,7 @@ function js_out(){
     // add some global variables
     print "var DOKU_BASE   = '".DOKU_BASE."';";
     print "var DOKU_TPL    = '".DOKU_TPL."';";
+    // FIXME: Move those to JSINFO
     print "var DOKU_UHN    = ".((int) useHeading('navigation')).";";
     print "var DOKU_UHC    = ".((int) useHeading('content')).";";
 
diff --git a/lib/scripts/compatibility.js b/lib/scripts/compatibility.js
index 39f703c71..3b027f016 100644
--- a/lib/scripts/compatibility.js
+++ b/lib/scripts/compatibility.js
@@ -38,7 +38,7 @@ function DEPRECATED_WRAP(func, context) {
     return function () {
         DEPRECATED();
         return func.apply(context || this, arguments);
-    }
+    };
 }
 
 /**
diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js
index 816568e92..fe8e4eb78 100644
--- a/lib/scripts/edit.js
+++ b/lib/scripts/edit.js
@@ -14,38 +14,36 @@
  * @author Michal Rezler <m.rezler@centrum.cz>
  */
 function createToolButton(icon,label,key,id,classname){
-    var $ = jQuery;
-    var btn = $('<button>');
-    var ico = $('<img />');
+    var $btn = jQuery(document.createElement('button')),
+        $ico = jQuery(document.createElement('img'));
 
-    // preapare the basic button stuff
-    btn.attr('class', 'toolbutton');
+    // prepare the basic button stuff
+    $btn.addClass('toolbutton');
     if(classname){
-        btn.attr('class', 'toolbutton '+classname);
+        $btn.addClass(classname);
     }
 
-    btn.attr('title', label);
+    $btn.attr('title', label);
     if(key){
-        btn.attr('title', label + ' ['+key.toUpperCase()+']')
+        $btn.attr('title', label + ' ['+key.toUpperCase()+']')
             .attr('accessKey', key);
     }
 
     // set IDs if given
     if(id){
-        btn.attr('id', id);
-        ico.attr('id', id+'_ico');
+        $btn.attr('id', id);
+        $ico.attr('id', id+'_ico');
     }
 
     // create the icon and add it to the button
-    if(icon.substr(0,1) == '/'){
-        ico.attr('src', icon);
-    }else{
-        ico.attr('src', DOKU_BASE+'lib/images/toolbar/'+icon);
+    if(icon.substr(0,1) !== '/'){
+        icon = DOKU_BASE + 'lib/images/toolbar/' + icon;
     }
-    btn.append(ico);
+    $ico.attr('src', icon);
+    $btn.append($ico);
 
-    // we have to return a javascript object (for compatibility reasons)
-    return btn[0];
+    // we have to return a DOM object (for compatibility reasons)
+    return $btn[0];
 }
 
 /**
@@ -63,69 +61,51 @@ function createToolButton(icon,label,key,id,classname){
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 function createPicker(id,props,edid){
-    var icobase = props['icobase'];
-    var list = props['list'];
-    var $ = jQuery;
-
     // create the wrapping div
-    var picker = $('<div></div>');
+    var $picker = jQuery(document.createElement('div'));
 
-    var className = 'picker';
+    $picker.addClass('picker hiddenpicker');
     if(props['class']){
-        className += ' '+props['class'];
+        $picker.addClass(props['class']);
     }
 
-    picker.attr('class', className)
-        .attr('id', id)
-        .css('position', 'absolute')
-        .css('marginLeft', '-10000px') // no display:none, to keep access keys working
-        .css('marginTop', '-10000px');
+    $picker.attr('id', id).css('position', 'absolute');
+
+    function $makebutton(title) {
+        var $btn = jQuery(document.createElement('button'))
+            .addClass('pickerbutton').attr('title', title)
+            .bind('click', bind(pickerInsert, title, edid))
+            .appendTo($picker);
+        return $btn;
+    }
 
-    for(var key in list){
-        if (!list.hasOwnProperty(key)) continue;
+    jQuery.each(props.list, function (key, item) {
+        if (!props.list.hasOwnProperty(key)) {
+            return;
+        }
 
         if(isNaN(key)){
-            // associative array -> treat as image/value pairs
-            var btn = $('<button>');
-            btn.attr('class', 'pickerbutton')
-                .attr('title', key);
-
-            var ico = $('<img>');
-            if (list[key].substr(0,1) == '/') {
-                var src = list[key];
-            } else {
-                var src = DOKU_BASE+'lib/images/'+icobase+'/'+list[key];
+            // associative array -> treat as text => image pairs
+            if (item.substr(0,1) !== '/') {
+                item = DOKU_BASE+'lib/images/'+props.icobase+'/'+item;
             }
-
-            ico.attr('src', src);
-            btn.append(ico);
-
-            btn.bind('click', bind(pickerInsert, key, edid));
-            picker.append(btn);
-        }else if (typeof (list[key]) == 'string'){
+            jQuery(document.createElement('img'))
+                .attr('src', item)
+                .appendTo($makebutton(key));
+        }else if (typeof item == 'string'){
             // a list of text -> treat as text picker
-            var btn = $('<button>');
-            btn.attr('class', 'pickerbutton')
-                .attr('title', list[key]);
-
-            var txt = $(document.createTextNode(list[key]));
-            btn.append(txt);
-
-            btn.bind('click', bind(pickerInsert, list[key], edid));
-
-            picker.append(btn);
+            $makebutton(item).text(item);
         }else{
             // a list of lists -> treat it as subtoolbar
-            initToolbar(picker,edid,list);
-            break; // all buttons handled already
+            initToolbar($picker,edid,props.list);
+            return false; // all buttons handled already
         }
 
-    }
-    var body = $('body');
-    body.append(picker);
+    });
+    jQuery('body').append($picker);
 
-    // we have to return a javascript object (for compatibility reasons)
-    return picker[0];
+    // we have to return a DOM object (for compatibility reasons)
+    return $picker[0];
 }
 
 /**
@@ -147,9 +127,9 @@ function pickerInsert(text,edid){
  * @return boolean    If button should be appended
  * @author Gabriel Birke <birke@d-scribe.de>
  */
-function addBtnActionSignature(btn, props, edid) {
-    if(typeof(SIG) != 'undefined' && SIG != ''){
-        btn.bind('click', bind(insertAtCarret,edid,SIG));
+function addBtnActionSignature($btn, props, edid) {
+    if(typeof SIG != 'undefined' && SIG != ''){
+        $btn.bind('click', bind(insertAtCarret,edid,SIG));
         return true;
     }
     return false;
@@ -161,24 +141,27 @@ function addBtnActionSignature(btn, props, edid) {
  * @author Andreas Gohr <gohr@cosmocode.de>
  */
 function currentHeadlineLevel(textboxId){
-    var field     = $(textboxId);
-    var selection = getSelection(field);
-    var search    = "\n"+field.value.substr(0,selection.start);
-    var lasthl    = search.lastIndexOf("\n==");
-    if(lasthl == -1 && field.form.prefix){
+    var field = jQuery('#' + textboxId)[0],
+        s = false,
+        opts = [field.value.substr(0,getSelection(field).start)];
+    if (field.form.prefix) {
         // we need to look in prefix context
-        search = field.form.prefix.value;
-        lasthl    = search.lastIndexOf("\n==");
+        opts.push(field.form.prefix.value);
     }
-    search    = search.substr(lasthl+1,6);
 
-    if(search == '======') return 1;
-    if(search.substr(0,5) == '=====') return 2;
-    if(search.substr(0,4) == '====') return 3;
-    if(search.substr(0,3) == '===') return 4;
-    if(search.substr(0,2) == '==') return 5;
-
-    return 0;
+    jQuery.each(opts, function (_, opt) {
+        // Check whether there is a headline in the given string
+        var str = "\n" + opt,
+            lasthl = str.lastIndexOf("\n==");
+        if (lasthl !== -1) {
+            s = str.substr(lasthl+1,6);
+            return false;
+        }
+    });
+    if (s === false) {
+        return 0;
+    }
+    return 7 - s.match(/^={2,6}/)[0].length;
 }
 
 
@@ -191,21 +174,23 @@ window.textChanged = false;
  * Delete the draft before leaving the page
  */
 function deleteDraft() {
-    if (is_opera) return;
-    if (window.keepDraft) return;
+    if (is_opera || window.keepDraft) {
+        return;
+    }
 
-    // remove a possibly saved draft using ajax
-    var dwform = jQuery('#dw__editform');
-    if(dwform.length != 0) {
-
-        jQuery.post(
-            DOKU_BASE + 'lib/exe/ajax.php',
-            {
-                call: 'draftdel',
-                id: jQuery('#dw__editform input[name=id]').val()
-            }
-        );
+    var $dwform = jQuery('#dw__editform');
+
+    if($dwform.length === 0) {
+        return;
     }
+
+    // remove a possibly saved draft using ajax
+    jQuery.post(DOKU_BASE + 'lib/exe/ajax.php',
+        {
+            call: 'draftdel',
+            id: $dwform.find('input[name=id]').val()
+        }
+    );
 }
 
 /**
@@ -214,21 +199,24 @@ function deleteDraft() {
  *
  * Sets focus to the editbox as well
  */
-addInitEvent(function () {
-    var $ = jQuery;
-    var editform = $('#dw__editform');
-    if (editform.length == 0) return;
+jQuery(function () {
+    var $editform = jQuery('#dw__editform');
+    if ($editform.length == 0) {
+        return;
+    }
 
-    var edit_text = $('#wiki__text');
-    if (edit_text.length > 0) {
-        if(edit_text.attr('readOnly')) return;
+    var $edit_text = jQuery('#wiki__text');
+    if ($edit_text.length > 0) {
+        if($edit_text.attr('readOnly')) {
+            return;
+        }
 
         // set focus and place cursor at the start
-        var sel = getSelection(edit_text.get(0));
+        var sel = getSelection($edit_text[0]);
         sel.start = 0;
         sel.end   = 0;
         setSelection(sel);
-        edit_text.focus();
+        $edit_text.focus();
     }
 
     var checkfunc = function() {
@@ -236,8 +224,8 @@ addInitEvent(function () {
         summaryCheck();
     };
 
-    editform.change(checkfunc);
-    editform.keydown(checkfunc);
+    $editform.change(checkfunc);
+    $editform.keydown(checkfunc);
 
     window.onbeforeunload = function(){
         if(window.textChanged) {
@@ -247,13 +235,13 @@ addInitEvent(function () {
     window.onunload = deleteDraft;
 
     // reset change memory var on submit
-    $('#edbtn__save').click(
+    jQuery('#edbtn__save').click(
         function() {
             window.onbeforeunload = '';
             textChanged = false;
         }
     );
-    $('#edbtn__preview').click(
+    jQuery('#edbtn__preview').click(
         function() {
             window.onbeforeunload = '';
             textChanged = false;
@@ -261,9 +249,9 @@ addInitEvent(function () {
         }
     );
 
-    var summary = $('#edit__summary');
-    summary.change(summaryCheck);
-    summary.keyup(summaryCheck);
+    var $summary = jQuery('#edit__summary');
+    $summary.change(summaryCheck);
+    $summary.keyup(summaryCheck);
 
     if (textChanged) summaryCheck();
 });
@@ -274,11 +262,6 @@ addInitEvent(function () {
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 function summaryCheck(){
-    var sum = jQuery('#edit__summary');
-
-    if (sum.val() === '') {
-        sum.attr('class', 'missing');
-    } else{
-        sum.attr('class', 'edit');
-    }
+    var $sum = jQuery('#edit__summary');
+    $sum.toggleClass('missing', $sum.val() === '');
 }
diff --git a/lib/scripts/index.js b/lib/scripts/index.js
index 96d4e2fb9..4b67a0b12 100644
--- a/lib/scripts/index.js
+++ b/lib/scripts/index.js
@@ -1,6 +1,3 @@
-/*jslint white: true, onevar: true, undef: true, nomen: true, eqeqeq: true, plusplus: true, bitwise: true, regexp: false, newcap: true, immed: true */
-/*global jQuery, window, DOKU_BASE, DEPRECATED, bind*/
-
 var dw_index = jQuery('#index__tree').dw_tree({deferInit: true,
     load_data: function  (show_sublist, $clicky) {
         jQuery.post(
diff --git a/lib/scripts/linkwiz.js b/lib/scripts/linkwiz.js
index 83653c9bb..0cad86cc2 100644
--- a/lib/scripts/linkwiz.js
+++ b/lib/scripts/linkwiz.js
@@ -1,7 +1,3 @@
-/*jslint sloppy: true, indent: 4, white: true, browser: true, eqeq: true */
-/*global jQuery, DOKU_BASE, LANG, DOKU_UHC, getSelection, pasteText */
-
-
 /**
  * The Link Wizard
  *
diff --git a/lib/scripts/media.js b/lib/scripts/media.js
index 1402ad4bf..b49454492 100644
--- a/lib/scripts/media.js
+++ b/lib/scripts/media.js
@@ -1,6 +1,3 @@
-/*jslint white: true, onevar: true, undef: true, nomen: true, eqeqeq: true, plusplus: true, bitwise: true, regexp: false, strict: true, newcap: true, immed: true, sloppy: true, browser: true */
-/*global jQuery, DOKU_BASE, LANG, bind, DokuCookie, opener, confirm*/
-
 /**
  * JavaScript functionality for the media management popup
  *
diff --git a/lib/scripts/qsearch.js b/lib/scripts/qsearch.js
index f83b7a5a1..c7128b9e3 100644
--- a/lib/scripts/qsearch.js
+++ b/lib/scripts/qsearch.js
@@ -1,6 +1,3 @@
-/*jslint sloppy: true, plusplus: true, continue: true */
-/*global jQuery, DOKU_BASE, window, document, substr_replace */
-
 /**
  * AJAX functions for the pagename quicksearch
  *
diff --git a/lib/scripts/script.js b/lib/scripts/script.js
index 8db223d61..709e7705a 100644
--- a/lib/scripts/script.js
+++ b/lib/scripts/script.js
@@ -48,8 +48,7 @@ function showLoadBar(){
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 function hideLoadBar(id){
-  obj = $(id);
-  if(obj) obj.style.display="none";
+  jQuery('#' + id).hide();
 }
 
 /**
@@ -58,5 +57,3 @@ function hideLoadBar(id){
 function closePopups(){
     jQuery('div.JSpopup').hide();
 }
-
-
diff --git a/lib/scripts/toolbar.js b/lib/scripts/toolbar.js
index 2306ef5db..7a113ecbf 100644
--- a/lib/scripts/toolbar.js
+++ b/lib/scripts/toolbar.js
@@ -1,4 +1,3 @@
-
 // used to identify pickers
 var pickercounter=0;
 
@@ -202,13 +201,13 @@ function tb_autohead(btn, props, edid){
  * @return boolean    If button should be appended
  * @author Gabriel Birke <birke@d-scribe.de>
  */
-function addBtnActionPicker(btn, props, edid) {
+function addBtnActionPicker($btn, props, edid) {
     var pickerid = 'picker'+(pickercounter++);
     createPicker(pickerid, props, edid);
 
-    btn.click(
+    $btn.click(
         function() {
-            pickerToggle(pickerid,btn);
+            pickerToggle(pickerid,$btn);
             return false;
         }
     );
@@ -240,19 +239,17 @@ function addBtnActionLinkwiz(btn, props, edid) {
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  */
-function pickerToggle(pickerid,btn){
-    var picker = jQuery('#' + pickerid);
-    if (picker.css('marginLeft') == '-10000px'){
-        var x = findPosX(btn[0]);
-        var y = findPosY(btn[0]);
-
-        picker.css('left',(x+3)+'px')
-            .css('top', (y+btn[0].offsetHeight+3)+'px')
-            .css('marginLeft', '0px')
-            .css('marginTop', '0px');
+function pickerToggle(pickerid,$btn){
+    var $picker = jQuery('#' + pickerid);
+    if ($picker.hasClass('hiddenpicker')) {
+        var pos = $btn.offset();
+        $picker.hide().removeClass('hiddenpicker')
+               .dw_show()
+               .offset({left: pos.left+3, top: pos.top+$btn[0].offsetHeight+3})
     } else {
-        picker.css('marginLeft', '-10000px')
-            .css('marginTop', '-10000px');
+        $picker.dw_hide(function () {
+            jQuery(this).addClass('hiddenpicker').show();
+        });
     }
 }
 
@@ -262,11 +259,7 @@ function pickerToggle(pickerid,btn){
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 function pickerClose(){
-    var pobjs = jQuery('#picker');
-    for(var i=0; i<pobjs.length; i++){
-        pobjs[i].css('marginLeft', '-10000px')
-            .css('marginTop', '-10000px');
-    }
+    jQuery('.picker').addClass('hiddenpicker');
 }
 
 
diff --git a/lib/scripts/tree.js b/lib/scripts/tree.js
index 98d3f55d4..96763053d 100644
--- a/lib/scripts/tree.js
+++ b/lib/scripts/tree.js
@@ -1,6 +1,3 @@
-/*jslint white: true, onevar: true, undef: true, nomen: true, eqeqeq: true, plusplus: true, bitwise: true, regexp: false, newcap: true, immed: true, sloppy: true */
-/*global jQuery, window, DOKU_BASE, DEPRECATED, bind*/
-
 jQuery.fn.dw_tree = function(overrides) {
     var dw_tree = {
 
diff --git a/lib/styles/screen.css b/lib/styles/screen.css
index 80a161f19..461b3098f 100644
--- a/lib/styles/screen.css
+++ b/lib/styles/screen.css
@@ -87,3 +87,8 @@ div.notify {
 .code .st0  { color: #ff0000; }
 .code .sy0  { color: #66cc66; }
 
+div.hiddenpicker {
+    /* No display: none to keep accesskeys working */
+    margin-left: -10000px;
+    margin-top: -10000px;
+}
-- 
cgit v1.2.3


From 1ffc211ddb46bfabe649bbacd1e36bc8e035afa3 Mon Sep 17 00:00:00 2001
From: Adrian Lang <mail@adrianlang.de>
Date: Sun, 4 Sep 2011 15:32:41 +0200
Subject: Revert tmp commits

This reverts commit ba6c070edd92ca0fc8a6ee85d51769d64a19ee7c.
This reverts commit 923510088dda99cb2790b15308593e47369d4f01.
---
 inc/search.php               |  19 ----
 lib/exe/js.php               |   1 -
 lib/scripts/compatibility.js |   2 +-
 lib/scripts/edit.js          | 221 +++++++++++++++++++++++--------------------
 lib/scripts/index.js         |   3 +
 lib/scripts/linkwiz.js       |   4 +
 lib/scripts/media.js         |   3 +
 lib/scripts/qsearch.js       |   3 +
 lib/scripts/script.js        |   5 +-
 lib/scripts/toolbar.js       |  35 ++++---
 lib/scripts/tree.js          |   3 +
 lib/styles/screen.css        |   5 -
 12 files changed, 161 insertions(+), 143 deletions(-)

diff --git a/inc/search.php b/inc/search.php
index 5ba28a1fc..bc7c35482 100644
--- a/inc/search.php
+++ b/inc/search.php
@@ -596,25 +596,6 @@ function search_universal(&$data,$base,$file,$type,$lvl,$opts){
         if($opts['firsthead']) $item['title'] = p_get_first_heading($item['id'],METADATA_DONT_RENDER);
     }
 
-    if($type == 'd' && !$opts['skipacl'] && $opts['sneakyacl'] && $item['perm'] < AUTH_READ) {
-        if ($opts['sneakyacl'] === 2) {
-            // Perform shy sneaking, i. e. just show the ns if it contains
-            // something accessible
-            $old_data_count = count($data);
-            search($data,$base,'search_universal',$opts,$file,$lvl+1);
-            if (count($data) > $old_data_count) {
-                // Contains something visible
-                array_splice($data, $old_data_count, $return ? 0 : count($data),
-                             array($item));
-            } else {
-                // Contains nothing visible, so hide
-                $data = array_slice($data, 0, $old_data_count);
-            }
-        }
-        // Stop recursing in any case since we did it ourself
-        return false;
-    }
-
     // finally add the item
     $data[] = $item;
     return $return;
diff --git a/lib/exe/js.php b/lib/exe/js.php
index d52fe3607..e96d45ee6 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -86,7 +86,6 @@ function js_out(){
     // add some global variables
     print "var DOKU_BASE   = '".DOKU_BASE."';";
     print "var DOKU_TPL    = '".DOKU_TPL."';";
-    // FIXME: Move those to JSINFO
     print "var DOKU_UHN    = ".((int) useHeading('navigation')).";";
     print "var DOKU_UHC    = ".((int) useHeading('content')).";";
 
diff --git a/lib/scripts/compatibility.js b/lib/scripts/compatibility.js
index 3b027f016..39f703c71 100644
--- a/lib/scripts/compatibility.js
+++ b/lib/scripts/compatibility.js
@@ -38,7 +38,7 @@ function DEPRECATED_WRAP(func, context) {
     return function () {
         DEPRECATED();
         return func.apply(context || this, arguments);
-    };
+    }
 }
 
 /**
diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js
index fe8e4eb78..816568e92 100644
--- a/lib/scripts/edit.js
+++ b/lib/scripts/edit.js
@@ -14,36 +14,38 @@
  * @author Michal Rezler <m.rezler@centrum.cz>
  */
 function createToolButton(icon,label,key,id,classname){
-    var $btn = jQuery(document.createElement('button')),
-        $ico = jQuery(document.createElement('img'));
+    var $ = jQuery;
+    var btn = $('<button>');
+    var ico = $('<img />');
 
-    // prepare the basic button stuff
-    $btn.addClass('toolbutton');
+    // preapare the basic button stuff
+    btn.attr('class', 'toolbutton');
     if(classname){
-        $btn.addClass(classname);
+        btn.attr('class', 'toolbutton '+classname);
     }
 
-    $btn.attr('title', label);
+    btn.attr('title', label);
     if(key){
-        $btn.attr('title', label + ' ['+key.toUpperCase()+']')
+        btn.attr('title', label + ' ['+key.toUpperCase()+']')
             .attr('accessKey', key);
     }
 
     // set IDs if given
     if(id){
-        $btn.attr('id', id);
-        $ico.attr('id', id+'_ico');
+        btn.attr('id', id);
+        ico.attr('id', id+'_ico');
     }
 
     // create the icon and add it to the button
-    if(icon.substr(0,1) !== '/'){
-        icon = DOKU_BASE + 'lib/images/toolbar/' + icon;
+    if(icon.substr(0,1) == '/'){
+        ico.attr('src', icon);
+    }else{
+        ico.attr('src', DOKU_BASE+'lib/images/toolbar/'+icon);
     }
-    $ico.attr('src', icon);
-    $btn.append($ico);
+    btn.append(ico);
 
-    // we have to return a DOM object (for compatibility reasons)
-    return $btn[0];
+    // we have to return a javascript object (for compatibility reasons)
+    return btn[0];
 }
 
 /**
@@ -61,51 +63,69 @@ function createToolButton(icon,label,key,id,classname){
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 function createPicker(id,props,edid){
+    var icobase = props['icobase'];
+    var list = props['list'];
+    var $ = jQuery;
+
     // create the wrapping div
-    var $picker = jQuery(document.createElement('div'));
+    var picker = $('<div></div>');
 
-    $picker.addClass('picker hiddenpicker');
+    var className = 'picker';
     if(props['class']){
-        $picker.addClass(props['class']);
+        className += ' '+props['class'];
     }
 
-    $picker.attr('id', id).css('position', 'absolute');
-
-    function $makebutton(title) {
-        var $btn = jQuery(document.createElement('button'))
-            .addClass('pickerbutton').attr('title', title)
-            .bind('click', bind(pickerInsert, title, edid))
-            .appendTo($picker);
-        return $btn;
-    }
+    picker.attr('class', className)
+        .attr('id', id)
+        .css('position', 'absolute')
+        .css('marginLeft', '-10000px') // no display:none, to keep access keys working
+        .css('marginTop', '-10000px');
 
-    jQuery.each(props.list, function (key, item) {
-        if (!props.list.hasOwnProperty(key)) {
-            return;
-        }
+    for(var key in list){
+        if (!list.hasOwnProperty(key)) continue;
 
         if(isNaN(key)){
-            // associative array -> treat as text => image pairs
-            if (item.substr(0,1) !== '/') {
-                item = DOKU_BASE+'lib/images/'+props.icobase+'/'+item;
+            // associative array -> treat as image/value pairs
+            var btn = $('<button>');
+            btn.attr('class', 'pickerbutton')
+                .attr('title', key);
+
+            var ico = $('<img>');
+            if (list[key].substr(0,1) == '/') {
+                var src = list[key];
+            } else {
+                var src = DOKU_BASE+'lib/images/'+icobase+'/'+list[key];
             }
-            jQuery(document.createElement('img'))
-                .attr('src', item)
-                .appendTo($makebutton(key));
-        }else if (typeof item == 'string'){
+
+            ico.attr('src', src);
+            btn.append(ico);
+
+            btn.bind('click', bind(pickerInsert, key, edid));
+            picker.append(btn);
+        }else if (typeof (list[key]) == 'string'){
             // a list of text -> treat as text picker
-            $makebutton(item).text(item);
+            var btn = $('<button>');
+            btn.attr('class', 'pickerbutton')
+                .attr('title', list[key]);
+
+            var txt = $(document.createTextNode(list[key]));
+            btn.append(txt);
+
+            btn.bind('click', bind(pickerInsert, list[key], edid));
+
+            picker.append(btn);
         }else{
             // a list of lists -> treat it as subtoolbar
-            initToolbar($picker,edid,props.list);
-            return false; // all buttons handled already
+            initToolbar(picker,edid,list);
+            break; // all buttons handled already
         }
 
-    });
-    jQuery('body').append($picker);
+    }
+    var body = $('body');
+    body.append(picker);
 
-    // we have to return a DOM object (for compatibility reasons)
-    return $picker[0];
+    // we have to return a javascript object (for compatibility reasons)
+    return picker[0];
 }
 
 /**
@@ -127,9 +147,9 @@ function pickerInsert(text,edid){
  * @return boolean    If button should be appended
  * @author Gabriel Birke <birke@d-scribe.de>
  */
-function addBtnActionSignature($btn, props, edid) {
-    if(typeof SIG != 'undefined' && SIG != ''){
-        $btn.bind('click', bind(insertAtCarret,edid,SIG));
+function addBtnActionSignature(btn, props, edid) {
+    if(typeof(SIG) != 'undefined' && SIG != ''){
+        btn.bind('click', bind(insertAtCarret,edid,SIG));
         return true;
     }
     return false;
@@ -141,27 +161,24 @@ function addBtnActionSignature($btn, props, edid) {
  * @author Andreas Gohr <gohr@cosmocode.de>
  */
 function currentHeadlineLevel(textboxId){
-    var field = jQuery('#' + textboxId)[0],
-        s = false,
-        opts = [field.value.substr(0,getSelection(field).start)];
-    if (field.form.prefix) {
+    var field     = $(textboxId);
+    var selection = getSelection(field);
+    var search    = "\n"+field.value.substr(0,selection.start);
+    var lasthl    = search.lastIndexOf("\n==");
+    if(lasthl == -1 && field.form.prefix){
         // we need to look in prefix context
-        opts.push(field.form.prefix.value);
+        search = field.form.prefix.value;
+        lasthl    = search.lastIndexOf("\n==");
     }
+    search    = search.substr(lasthl+1,6);
 
-    jQuery.each(opts, function (_, opt) {
-        // Check whether there is a headline in the given string
-        var str = "\n" + opt,
-            lasthl = str.lastIndexOf("\n==");
-        if (lasthl !== -1) {
-            s = str.substr(lasthl+1,6);
-            return false;
-        }
-    });
-    if (s === false) {
-        return 0;
-    }
-    return 7 - s.match(/^={2,6}/)[0].length;
+    if(search == '======') return 1;
+    if(search.substr(0,5) == '=====') return 2;
+    if(search.substr(0,4) == '====') return 3;
+    if(search.substr(0,3) == '===') return 4;
+    if(search.substr(0,2) == '==') return 5;
+
+    return 0;
 }
 
 
@@ -174,23 +191,21 @@ window.textChanged = false;
  * Delete the draft before leaving the page
  */
 function deleteDraft() {
-    if (is_opera || window.keepDraft) {
-        return;
-    }
-
-    var $dwform = jQuery('#dw__editform');
-
-    if($dwform.length === 0) {
-        return;
-    }
+    if (is_opera) return;
+    if (window.keepDraft) return;
 
     // remove a possibly saved draft using ajax
-    jQuery.post(DOKU_BASE + 'lib/exe/ajax.php',
-        {
-            call: 'draftdel',
-            id: $dwform.find('input[name=id]').val()
-        }
-    );
+    var dwform = jQuery('#dw__editform');
+    if(dwform.length != 0) {
+
+        jQuery.post(
+            DOKU_BASE + 'lib/exe/ajax.php',
+            {
+                call: 'draftdel',
+                id: jQuery('#dw__editform input[name=id]').val()
+            }
+        );
+    }
 }
 
 /**
@@ -199,24 +214,21 @@ function deleteDraft() {
  *
  * Sets focus to the editbox as well
  */
-jQuery(function () {
-    var $editform = jQuery('#dw__editform');
-    if ($editform.length == 0) {
-        return;
-    }
+addInitEvent(function () {
+    var $ = jQuery;
+    var editform = $('#dw__editform');
+    if (editform.length == 0) return;
 
-    var $edit_text = jQuery('#wiki__text');
-    if ($edit_text.length > 0) {
-        if($edit_text.attr('readOnly')) {
-            return;
-        }
+    var edit_text = $('#wiki__text');
+    if (edit_text.length > 0) {
+        if(edit_text.attr('readOnly')) return;
 
         // set focus and place cursor at the start
-        var sel = getSelection($edit_text[0]);
+        var sel = getSelection(edit_text.get(0));
         sel.start = 0;
         sel.end   = 0;
         setSelection(sel);
-        $edit_text.focus();
+        edit_text.focus();
     }
 
     var checkfunc = function() {
@@ -224,8 +236,8 @@ jQuery(function () {
         summaryCheck();
     };
 
-    $editform.change(checkfunc);
-    $editform.keydown(checkfunc);
+    editform.change(checkfunc);
+    editform.keydown(checkfunc);
 
     window.onbeforeunload = function(){
         if(window.textChanged) {
@@ -235,13 +247,13 @@ jQuery(function () {
     window.onunload = deleteDraft;
 
     // reset change memory var on submit
-    jQuery('#edbtn__save').click(
+    $('#edbtn__save').click(
         function() {
             window.onbeforeunload = '';
             textChanged = false;
         }
     );
-    jQuery('#edbtn__preview').click(
+    $('#edbtn__preview').click(
         function() {
             window.onbeforeunload = '';
             textChanged = false;
@@ -249,9 +261,9 @@ jQuery(function () {
         }
     );
 
-    var $summary = jQuery('#edit__summary');
-    $summary.change(summaryCheck);
-    $summary.keyup(summaryCheck);
+    var summary = $('#edit__summary');
+    summary.change(summaryCheck);
+    summary.keyup(summaryCheck);
 
     if (textChanged) summaryCheck();
 });
@@ -262,6 +274,11 @@ jQuery(function () {
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 function summaryCheck(){
-    var $sum = jQuery('#edit__summary');
-    $sum.toggleClass('missing', $sum.val() === '');
+    var sum = jQuery('#edit__summary');
+
+    if (sum.val() === '') {
+        sum.attr('class', 'missing');
+    } else{
+        sum.attr('class', 'edit');
+    }
 }
diff --git a/lib/scripts/index.js b/lib/scripts/index.js
index 4b67a0b12..96d4e2fb9 100644
--- a/lib/scripts/index.js
+++ b/lib/scripts/index.js
@@ -1,3 +1,6 @@
+/*jslint white: true, onevar: true, undef: true, nomen: true, eqeqeq: true, plusplus: true, bitwise: true, regexp: false, newcap: true, immed: true */
+/*global jQuery, window, DOKU_BASE, DEPRECATED, bind*/
+
 var dw_index = jQuery('#index__tree').dw_tree({deferInit: true,
     load_data: function  (show_sublist, $clicky) {
         jQuery.post(
diff --git a/lib/scripts/linkwiz.js b/lib/scripts/linkwiz.js
index 0cad86cc2..83653c9bb 100644
--- a/lib/scripts/linkwiz.js
+++ b/lib/scripts/linkwiz.js
@@ -1,3 +1,7 @@
+/*jslint sloppy: true, indent: 4, white: true, browser: true, eqeq: true */
+/*global jQuery, DOKU_BASE, LANG, DOKU_UHC, getSelection, pasteText */
+
+
 /**
  * The Link Wizard
  *
diff --git a/lib/scripts/media.js b/lib/scripts/media.js
index b49454492..1402ad4bf 100644
--- a/lib/scripts/media.js
+++ b/lib/scripts/media.js
@@ -1,3 +1,6 @@
+/*jslint white: true, onevar: true, undef: true, nomen: true, eqeqeq: true, plusplus: true, bitwise: true, regexp: false, strict: true, newcap: true, immed: true, sloppy: true, browser: true */
+/*global jQuery, DOKU_BASE, LANG, bind, DokuCookie, opener, confirm*/
+
 /**
  * JavaScript functionality for the media management popup
  *
diff --git a/lib/scripts/qsearch.js b/lib/scripts/qsearch.js
index c7128b9e3..f83b7a5a1 100644
--- a/lib/scripts/qsearch.js
+++ b/lib/scripts/qsearch.js
@@ -1,3 +1,6 @@
+/*jslint sloppy: true, plusplus: true, continue: true */
+/*global jQuery, DOKU_BASE, window, document, substr_replace */
+
 /**
  * AJAX functions for the pagename quicksearch
  *
diff --git a/lib/scripts/script.js b/lib/scripts/script.js
index 709e7705a..8db223d61 100644
--- a/lib/scripts/script.js
+++ b/lib/scripts/script.js
@@ -48,7 +48,8 @@ function showLoadBar(){
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 function hideLoadBar(id){
-  jQuery('#' + id).hide();
+  obj = $(id);
+  if(obj) obj.style.display="none";
 }
 
 /**
@@ -57,3 +58,5 @@ function hideLoadBar(id){
 function closePopups(){
     jQuery('div.JSpopup').hide();
 }
+
+
diff --git a/lib/scripts/toolbar.js b/lib/scripts/toolbar.js
index 7a113ecbf..2306ef5db 100644
--- a/lib/scripts/toolbar.js
+++ b/lib/scripts/toolbar.js
@@ -1,3 +1,4 @@
+
 // used to identify pickers
 var pickercounter=0;
 
@@ -201,13 +202,13 @@ function tb_autohead(btn, props, edid){
  * @return boolean    If button should be appended
  * @author Gabriel Birke <birke@d-scribe.de>
  */
-function addBtnActionPicker($btn, props, edid) {
+function addBtnActionPicker(btn, props, edid) {
     var pickerid = 'picker'+(pickercounter++);
     createPicker(pickerid, props, edid);
 
-    $btn.click(
+    btn.click(
         function() {
-            pickerToggle(pickerid,$btn);
+            pickerToggle(pickerid,btn);
             return false;
         }
     );
@@ -239,17 +240,19 @@ function addBtnActionLinkwiz(btn, props, edid) {
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  */
-function pickerToggle(pickerid,$btn){
-    var $picker = jQuery('#' + pickerid);
-    if ($picker.hasClass('hiddenpicker')) {
-        var pos = $btn.offset();
-        $picker.hide().removeClass('hiddenpicker')
-               .dw_show()
-               .offset({left: pos.left+3, top: pos.top+$btn[0].offsetHeight+3})
+function pickerToggle(pickerid,btn){
+    var picker = jQuery('#' + pickerid);
+    if (picker.css('marginLeft') == '-10000px'){
+        var x = findPosX(btn[0]);
+        var y = findPosY(btn[0]);
+
+        picker.css('left',(x+3)+'px')
+            .css('top', (y+btn[0].offsetHeight+3)+'px')
+            .css('marginLeft', '0px')
+            .css('marginTop', '0px');
     } else {
-        $picker.dw_hide(function () {
-            jQuery(this).addClass('hiddenpicker').show();
-        });
+        picker.css('marginLeft', '-10000px')
+            .css('marginTop', '-10000px');
     }
 }
 
@@ -259,7 +262,11 @@ function pickerToggle(pickerid,$btn){
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 function pickerClose(){
-    jQuery('.picker').addClass('hiddenpicker');
+    var pobjs = jQuery('#picker');
+    for(var i=0; i<pobjs.length; i++){
+        pobjs[i].css('marginLeft', '-10000px')
+            .css('marginTop', '-10000px');
+    }
 }
 
 
diff --git a/lib/scripts/tree.js b/lib/scripts/tree.js
index 96763053d..98d3f55d4 100644
--- a/lib/scripts/tree.js
+++ b/lib/scripts/tree.js
@@ -1,3 +1,6 @@
+/*jslint white: true, onevar: true, undef: true, nomen: true, eqeqeq: true, plusplus: true, bitwise: true, regexp: false, newcap: true, immed: true, sloppy: true */
+/*global jQuery, window, DOKU_BASE, DEPRECATED, bind*/
+
 jQuery.fn.dw_tree = function(overrides) {
     var dw_tree = {
 
diff --git a/lib/styles/screen.css b/lib/styles/screen.css
index 461b3098f..80a161f19 100644
--- a/lib/styles/screen.css
+++ b/lib/styles/screen.css
@@ -87,8 +87,3 @@ div.notify {
 .code .st0  { color: #ff0000; }
 .code .sy0  { color: #66cc66; }
 
-div.hiddenpicker {
-    /* No display: none to keep accesskeys working */
-    margin-left: -10000px;
-    margin-top: -10000px;
-}
-- 
cgit v1.2.3


From aea34b5fe445064477d8ad0c98926db33a0d0851 Mon Sep 17 00:00:00 2001
From: Adrian Lang <mail@adrianlang.de>
Date: Sun, 4 Sep 2011 12:35:38 +0200
Subject: Add testcases for search_index

---
 _test/cases/inc/search/data/ns1/ns3/page3.txt |   0
 _test/cases/inc/search/data/ns1/page1.txt     |   0
 _test/cases/inc/search/data/ns1/page2.txt     |   0
 _test/cases/inc/search/data/ns2/nopage.ext    |   0
 _test/cases/inc/search/data/ns2/page1.txt     |   0
 _test/cases/inc/search/search.test.php        | 102 ++++++++++++++++++++++++++
 6 files changed, 102 insertions(+)
 create mode 100644 _test/cases/inc/search/data/ns1/ns3/page3.txt
 create mode 100644 _test/cases/inc/search/data/ns1/page1.txt
 create mode 100644 _test/cases/inc/search/data/ns1/page2.txt
 create mode 100644 _test/cases/inc/search/data/ns2/nopage.ext
 create mode 100644 _test/cases/inc/search/data/ns2/page1.txt
 create mode 100644 _test/cases/inc/search/search.test.php

diff --git a/_test/cases/inc/search/data/ns1/ns3/page3.txt b/_test/cases/inc/search/data/ns1/ns3/page3.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/_test/cases/inc/search/data/ns1/page1.txt b/_test/cases/inc/search/data/ns1/page1.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/_test/cases/inc/search/data/ns1/page2.txt b/_test/cases/inc/search/data/ns1/page2.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/_test/cases/inc/search/data/ns2/nopage.ext b/_test/cases/inc/search/data/ns2/nopage.ext
new file mode 100644
index 000000000..e69de29bb
diff --git a/_test/cases/inc/search/data/ns2/page1.txt b/_test/cases/inc/search/data/ns2/page1.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/_test/cases/inc/search/search.test.php b/_test/cases/inc/search/search.test.php
new file mode 100644
index 000000000..a6f15e9b6
--- /dev/null
+++ b/_test/cases/inc/search/search.test.php
@@ -0,0 +1,102 @@
+<?php
+require_once DOKU_INC.'inc/search.php';
+
+class search_test extends UnitTestCase {
+    function strip_index_data($entry) {
+        $n_entry = array();
+        foreach(array('id', 'type', 'level', 'open') as $k) {
+            $n_entry[$k] = $entry[$k];
+        }
+        return $n_entry;
+    }
+
+    function test_search_index(){
+        $data = array();
+        search($data, dirname(__FILE__) . '/data', 'search_index',
+               array('ns' => 'ns2'));
+        $this->assertEqual(array_map(array($this, 'strip_index_data'), $data),
+                           array(
+                              array(
+                                'id'   => 'ns1',
+                                'type' => 'd',
+                                'level' => 1,
+                                'open' => false
+                              ), array(
+                                'id'   => 'ns2',
+                                'type' => 'd',
+                                'level' => 1,
+                                'open' => true
+                              ), array(
+                                'id' => 'ns2:page1',
+                                'type' => 'f',
+                                'level' => 2,
+                                'open' => true,
+                              ), ));
+        $data = array();
+        search($data, dirname(__FILE__) . '/data', 'search_index',
+               array('ns' => 'ns1/ns3'));
+        $this->assertEqual(array_map(array($this, 'strip_index_data'), $data),
+                           array(
+                              array(
+                                'id' => 'ns1',
+                                'type' => 'd',
+                                'level' => 1,
+                                'open' => true,
+                              ),
+                              array(
+                                'id' => 'ns1:ns3',
+                                'type' => 'd',
+                                'level' => 2,
+                                'open' => true,
+                              ),
+                              array(
+                                'id' => 'ns1:ns3:page3',
+                                'type' => 'f',
+                                'level' => 3,
+                                'open' => true,
+                              ),
+                              array(
+                                'id' => 'ns1:page1',
+                                'type' => 'f',
+                                'level' => 2,
+                                'open' => true,
+                              ),
+                              array(
+                                'id' => 'ns1:page2',
+                                'type' => 'f',
+                                'level' => 2,
+                                'open' => true,
+                              ),
+                              array(
+                                'id' => 'ns2',
+                                'type' => 'd',
+                                'level' => 1,
+                                'open' => false,
+                              ), ));
+        $data = array();
+        search($data, dirname(__FILE__) . '/data', 'search_index',
+               array('ns' => 'ns1/ns3', 'nofiles' => true));
+        $this->assertEqual(array_map(array($this, 'strip_index_data'), $data),
+                           array(
+                              array(
+                                'id' => 'ns1',
+                                'type' => 'd',
+                                'level' => 1,
+                                'open' => true,
+                              ),
+                              array(
+                                'id' => 'ns1:ns3',
+                                'type' => 'd',
+                                'level' => 2,
+                                'open' => true,
+                              ),
+                              array(
+                                'id' => 'ns2',
+                                'type' => 'd',
+                                'level' => 1,
+                                'open' => false,
+                              ), ));
+
+    }
+}
+//Setup VIM: ex: et ts=4 :
-- 
cgit v1.2.3