From 11bf24d856a6a4cb606bc6fe10ebcbd844f4127f Mon Sep 17 00:00:00 2001
From: Michal Rezler <rezlemic@fel.cvut.cz>
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/scripts/edit.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/scripts/edit.js')

diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js
index 45c1fb111..8516fd186 100644
--- a/lib/scripts/edit.js
+++ b/lib/scripts/edit.js
@@ -90,7 +90,7 @@ function createPicker(id,props,edid){
             btn.appendChild(ico);
             addEvent(btn,'click',bind(pickerInsert,key,edid));
             picker.appendChild(btn);
-        }else if(isString(list[key])){
+        }else if(typeof (list[key]) == 'string'){
             // a list of text -> treat as text picker
             var btn = document.createElement('button');
             btn.className = 'pickerbutton';
-- 
cgit v1.2.3


From ff482cae0f5a620704d845037d60ae13ab851410 Mon Sep 17 00:00:00 2001
From: Michal Rezler <rezlemic@fel.cvut.cz>
Date: Wed, 30 Mar 2011 23:08:13 +0200
Subject: fixed import for drag.js and started a rewrite of edit.js

---
 lib/scripts/edit.js | 115 ++++++++++++++++++++++++++++++----------------------
 1 file changed, 66 insertions(+), 49 deletions(-)

(limited to 'lib/scripts/edit.js')

diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js
index 8516fd186..36861973a 100644
--- a/lib/scripts/edit.js
+++ b/lib/scripts/edit.js
@@ -11,37 +11,41 @@
  * Style the buttons through the toolbutton class
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Michal Rezler <m.rezler@centrum.cz> 
  */
 function createToolButton(icon,label,key,id,classname){
-    var btn = document.createElement('button');
-    var ico = document.createElement('img');
+    var $ = jQuery;
+    var btn = $('<button>');
+    var ico = $('<img />');
 
     // preapare the basic button stuff
-    btn.className = 'toolbutton';
+    btn.attr('class', 'toolbutton');
     if(classname){
-        btn.className += ' '+classname;
+        btn.attr('class', 'toolbutton '+classname);
     }
-    btn.title = label;
+    
+    btn.attr('title', label);
     if(key){
-        btn.title += ' ['+key.toUpperCase()+']';
-        btn.accessKey = key;
+        btn.attr('title', label + ' ['+key.toUpperCase()+']')
+            .attr('accessKey', key);    
     }
 
     // set IDs if given
     if(id){
-        btn.id = id;
-        ico.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.src = icon;
+        ico.attr('src', icon);
     }else{
-        ico.src = DOKU_BASE+'lib/images/toolbar/'+icon;
+        ico.attr('src', DOKU_BASE+'lib/images/toolbar/'+icon);
     }
-    btn.appendChild(ico);
-
-    return btn;
+    btn.append(ico);
+                     
+    // we have to return a javascript object (for compatibility reasons)                             
+    return btn[0];
 }
 
 /**
@@ -60,45 +64,56 @@ function createToolButton(icon,label,key,id,classname){
  */
 function createPicker(id,props,edid){
     var icobase = props['icobase'];
-    var list    = props['list'];
+    var list = props['list'];
+    var $ = jQuery;
 
     // create the wrapping div
-    var picker            = document.createElement('div');
-    picker.className      = 'picker';
+    var picker = $('<div></div>');
+    
+    var className = 'picker';
     if(props['class']){
-        picker.className += ' '+props['class'];
+        className += ' '+props['class'];
     }
-    picker.id               = id;
-    picker.style.position   = 'absolute';
-    picker.style.marginLeft = '-10000px'; // no display:none, to keep access keys working
-    picker.style.marginTop  = '-10000px';
+    
+    picker.attr('class', className)
+        .attr('id', id)
+        .css('position', 'absolute')
+        .css('marginLeft', '-10000px') // no display:none, to keep access keys working
+        .css('marginTop', '-10000px');
 
     for(var key in list){
         if (!list.hasOwnProperty(key)) continue;
 
         if(isNaN(key)){
             // associative array -> treat as image/value pairs
-            var btn = document.createElement('button');
-            btn.className = 'pickerbutton';
-            var ico = document.createElement('img');
-            if(list[key].substr(0,1) == '/'){
-                ico.src = list[key];
-            }else{
-                ico.src = DOKU_BASE+'lib/images/'+icobase+'/'+list[key];
+            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];
             }
-            btn.title     = key;
-            btn.appendChild(ico);
-            addEvent(btn,'click',bind(pickerInsert,key,edid));
-            picker.appendChild(btn);
-        }else if(typeof (list[key]) == '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
-            var btn = document.createElement('button');
-            btn.className = 'pickerbutton';
-            var txt = document.createTextNode(list[key]);
-            btn.title     = list[key];
-            btn.appendChild(txt);
-            addEvent(btn,'click',bind(pickerInsert,list[key],edid));
-            picker.appendChild(btn);
+            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,list);
@@ -106,9 +121,11 @@ function createPicker(id,props,edid){
         }
 
     }
-    var body = document.getElementsByTagName('body')[0];
-    body.appendChild(picker);
-    return picker;
+    var body = $('body');
+    body.append(picker);
+    
+    // we have to return a javascript object (for compatibility reasons)
+    return picker[0];
 }
 
 /**
@@ -132,7 +149,7 @@ function pickerInsert(text,edid){
  */
 function addBtnActionSignature(btn, props, edid) {
     if(typeof(SIG) != 'undefined' && SIG != ''){
-        addEvent(btn,'click',bind(insertAtCarret,edid,SIG));
+        btn.bind('click', bind(insertAtCarret,edid,SIG));
         return true;
     }
     return false;
@@ -220,14 +237,14 @@ function keyHandler(e){
 
 //FIXME consolidate somewhere else
 addInitEvent(function(){
-    var field = $('wiki__text');
-    if(!field) return;
+    var field = jQuery('#wiki__text');
+    if(field.length == 0) return;
     // in Firefox, keypress doesn't send the correct keycodes,
     // in Opera, the default of keydown can't be prevented
     if (is_opera) {
-        addEvent(field,'keypress',keyHandler);
+        field.bind('keypress', keyHandler);
     } else {
-        addEvent(field,'keydown',keyHandler);
+        field.bind('keydown', keyHandler);
     }
 });
 
-- 
cgit v1.2.3


From 2ec634147934630c29abe5f6b9b544c45b952cc6 Mon Sep 17 00:00:00 2001
From: Michal Rezler <rezlemic@fel.cvut.cz>
Date: Sat, 9 Apr 2011 22:23:48 +0200
Subject: edit.js is jQueryfied

---
 lib/scripts/edit.js | 108 ++++++++++++++++++++++++++--------------------------
 1 file changed, 54 insertions(+), 54 deletions(-)

(limited to 'lib/scripts/edit.js')

diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js
index 36861973a..d04baaa6d 100644
--- a/lib/scripts/edit.js
+++ b/lib/scripts/edit.js
@@ -235,19 +235,6 @@ function keyHandler(e){
     }
 }
 
-//FIXME consolidate somewhere else
-addInitEvent(function(){
-    var field = jQuery('#wiki__text');
-    if(field.length == 0) return;
-    // in Firefox, keypress doesn't send the correct keycodes,
-    // in Opera, the default of keydown can't be prevented
-    if (is_opera) {
-        field.bind('keypress', keyHandler);
-    } else {
-        field.bind('keydown', keyHandler);
-    }
-});
-
 /**
  * Determine the current section level while editing
  *
@@ -288,18 +275,16 @@ function deleteDraft() {
     if (window.keepDraft) return;
 
     // remove a possibly saved draft using ajax
-    var dwform = $('dw__editform');
-    if(dwform){
-        var params = 'call=draftdel';
-        params += '&id='+encodeURIComponent(dwform.elements.id.value);
-
-        var sackobj = new sack(DOKU_BASE + 'lib/exe/ajax.php');
-        // this needs to be synchronous and GET to not be aborted upon page unload
-        sackobj.asynchronous = false;
-        sackobj.method = 'GET';
-        sackobj.AjaxFailedAlert = '';
-        sackobj.encodeURIString = false;
-        sackobj.runAJAX(params);
+    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()
+            }
+        );
     }
 }
 
@@ -309,24 +294,34 @@ function deleteDraft() {
  *
  * Sets focus to the editbox as well
  */
-addInitEvent(function (){
-    var editform = $('dw__editform');
-    if (!editform) return;
-
-    var edit_text   = $('wiki__text');
-    if(edit_text) {
-        if(edit_text.readOnly) return;
-
+addInitEvent(function () {
+    var $ = jQuery;            
+    var editform = $('#dw__editform');
+    if (editform.length == 0) return;
+
+    var edit_text = $('#wiki__text');
+    if (edit_text.length > 0) {        
+        if(edit_text.attr('readOnly')) return;
+        
+        // in Firefox, keypress doesn't send the correct keycodes,
+        // in Opera, the default of keydown can't be prevented
+        if (is_opera) {
+            edit_text.keypress(keyHandler);
+        } else {
+            edit_text.keydown(keyHandler);
+        }
+                              
         // set focus
         edit_text.focus();
     }
-
-    var checkfunc = function(){
+                                      
+    var checkfunc = function() {
         textChanged = true; //global var
         summaryCheck();
-    };
-    addEvent(editform, 'change', checkfunc);
-    addEvent(editform, 'keydown', checkfunc);
+    };                              
+    
+    editform.change(checkfunc);         
+    editform.keydown(checkfunc);
 
     window.onbeforeunload = function(){
         if(textChanged) {
@@ -336,17 +331,22 @@ addInitEvent(function (){
     window.onunload = deleteDraft;
 
     // reset change memory var on submit
-    addEvent($('edbtn__save'), 'click', function(){
-        textChanged = false;
-    });
-    addEvent($('edbtn__preview'), 'click', function(){
-        textChanged = false;
-        window.keepDraft = true; // needed to keep draft on page unload
-    });
+    $('#edbtn__save').click(
+        function() {
+            textChanged = false;
+        }
+    );
+    $('#edbtn__preview').click(
+        function() {
+            textChanged = false;
+            window.keepDraft = true; // needed to keep draft on page unload
+        }
+    );
 
-    var summary = $('edit__summary');
-    addEvent(summary, 'change', summaryCheck);
-    addEvent(summary, 'keyup', summaryCheck);
+    var summary = $('#edit__summary');
+    summary.change(summaryCheck);
+    summary.keyup(summaryCheck);
+    
     if (textChanged) summaryCheck();
 });
 
@@ -356,11 +356,11 @@ addInitEvent(function (){
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 function summaryCheck(){
-    var sum = document.getElementById('edit__summary');
-    if(sum.value === ''){
-        sum.className='missing';
-    }else{
-        sum.className='edit';
+    var sum = jQuery('#edit__summary');
+
+    if (sum.val() === '') {
+        sum.attr('class', 'missing');
+    } else{
+        sum.attr('class', 'edit');
     }
 }
-
-- 
cgit v1.2.3


From bedfa6abf0ea09be1ea44de0c014d83bd57a7412 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 19 Aug 2011 20:09:07 +0200
Subject: moved keyhandler to the new dw_editor object

---
 lib/scripts/edit.js | 88 -----------------------------------------------------
 1 file changed, 88 deletions(-)

(limited to 'lib/scripts/edit.js')

diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js
index a9623e14d..816568e92 100644
--- a/lib/scripts/edit.js
+++ b/lib/scripts/edit.js
@@ -155,86 +155,6 @@ function addBtnActionSignature(btn, props, edid) {
     return false;
 }
 
-/**
- * Make intended formattings easier to handle
- *
- * Listens to all key inputs and handle indentions
- * of lists and code blocks
- *
- * Currently handles space, backspce and enter presses
- *
- * @author Andreas Gohr <andi@splitbrain.org>
- * @fixme handle tabs
- */
-function keyHandler(e){
-    if(e.keyCode != 13 &&
-       e.keyCode != 8  &&
-       e.keyCode != 32) return;
-    var field     = e.target;
-    var selection = getSelection(field);
-    if(selection.getLength()) return; //there was text selected, keep standard behavior
-    var search    = "\n"+field.value.substr(0,selection.start);
-    var linestart = Math.max(search.lastIndexOf("\n"),
-                             search.lastIndexOf("\r")); //IE workaround
-    search = search.substr(linestart);
-
-
-    if(e.keyCode == 13){ // Enter
-        // keep current indention for lists and code
-        var match = search.match(/(\n  +([\*-] ?)?)/);
-        if(match){
-            var scroll = field.scrollHeight;
-            var match2 = search.match(/^\n  +[\*-]\s*$/);
-            // Cancel list if the last item is empty (i. e. two times enter)
-            if (match2 && field.value.substr(selection.start).match(/^($|\r?\n)/)) {
-                field.value = field.value.substr(0, linestart) + "\n" +
-                              field.value.substr(selection.start);
-                selection.start = linestart + 1;
-                selection.end = linestart + 1;
-                setSelection(selection);
-            } else {
-                insertAtCarret(field.id,match[1]);
-            }
-            field.scrollTop += (field.scrollHeight - scroll);
-            e.preventDefault(); // prevent enter key
-            return false;
-        }
-    }else if(e.keyCode == 8){ // Backspace
-        // unindent lists
-        var match = search.match(/(\n  +)([*-] ?)$/);
-        if(match){
-            var spaces = match[1].length-1;
-
-            if(spaces > 3){ // unindent one level
-                field.value = field.value.substr(0,linestart)+
-                              field.value.substr(linestart+2);
-                selection.start = selection.start - 2;
-                selection.end   = selection.start;
-            }else{ // delete list point
-                field.value = field.value.substr(0,linestart)+
-                              field.value.substr(selection.start);
-                selection.start = linestart;
-                selection.end   = linestart;
-            }
-            setSelection(selection);
-            e.preventDefault(); // prevent backspace
-            return false;
-        }
-    }else if(e.keyCode == 32){ // Space
-        // intend list item
-        var match = search.match(/(\n  +)([*-] )$/);
-        if(match){
-            field.value = field.value.substr(0,linestart)+'  '+
-                          field.value.substr(linestart);
-            selection.start = selection.start + 2;
-            selection.end   = selection.start;
-            setSelection(selection);
-            e.preventDefault(); // prevent space
-            return false;
-        }
-    }
-}
-
 /**
  * Determine the current section level while editing
  *
@@ -303,14 +223,6 @@ addInitEvent(function () {
     if (edit_text.length > 0) {
         if(edit_text.attr('readOnly')) return;
 
-        // in Firefox, keypress doesn't send the correct keycodes,
-        // in Opera, the default of keydown can't be prevented
-        if (is_opera) {
-            edit_text.keypress(keyHandler);
-        } else {
-            edit_text.keydown(keyHandler);
-        }
-
         // set focus and place cursor at the start
         var sel = getSelection(edit_text.get(0));
         sel.start = 0;
-- 
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/scripts/edit.js | 221 ++++++++++++++++++++++++----------------------------
 1 file changed, 102 insertions(+), 119 deletions(-)

(limited to 'lib/scripts/edit.js')

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() === '');
 }
-- 
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.
---
 lib/scripts/edit.js | 221 ++++++++++++++++++++++++++++------------------------
 1 file changed, 119 insertions(+), 102 deletions(-)

(limited to 'lib/scripts/edit.js')

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');
+    }
 }
-- 
cgit v1.2.3


From 5e7a292691951a0fa0a18f06c8b9bcfb509a032d Mon Sep 17 00:00:00 2001
From: Adrian Lang <mail@adrianlang.de>
Date: Fri, 9 Sep 2011 22:26:16 +0200
Subject: Various JavaScript improvements, JSLint, jQuery

---
 lib/scripts/edit.js | 222 ++++++++++++++++++++++++----------------------------
 1 file changed, 103 insertions(+), 119 deletions(-)

(limited to 'lib/scripts/edit.js')

diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js
index 816568e92..bfbd698f1 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 hidden_with_access_keys');
     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,7 @@ 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'),
+        missing = $sum.val() === '';
+    $sum.toggleClass('missing', missing).toggleClass('edit', !missing);
 }
-- 
cgit v1.2.3


From f1ee1b85ca72341ec706e2ca4ba36b3d58b411ba Mon Sep 17 00:00:00 2001
From: Adrian Lang <mail@adrianlang.de>
Date: Thu, 15 Sep 2011 23:31:43 +0200
Subject: Use jQuery UI Dialog for linkwiz

---
 lib/scripts/edit.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/scripts/edit.js')

diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js
index bfbd698f1..33a8f61b5 100644
--- a/lib/scripts/edit.js
+++ b/lib/scripts/edit.js
@@ -64,7 +64,7 @@ function createPicker(id,props,edid){
     // create the wrapping div
     var $picker = jQuery(document.createElement('div'));
 
-    $picker.addClass('picker hidden_with_access_keys');
+    $picker.addClass('picker a11y');
     if(props['class']){
         $picker.addClass(props['class']);
     }
-- 
cgit v1.2.3