From: Jakub Vrana <jakub@vrana.cz>
Date: Mon, 18 Oct 2010 23:45:48 +0000 (+0200)
Subject: Merge branch 'master' into ajax
X-Git-Tag: v3.2.0~140^2~8
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=dfa1a98829778bca927a487a9dfa8ab39a440921;p=adminer.git

Merge branch 'master' into ajax
---

dfa1a98829778bca927a487a9dfa8ab39a440921
diff --cc adminer/static/functions.js
index 54728a00,f8478a00..27a3468f
--- a/adminer/static/functions.js
+++ b/adminer/static/functions.js
@@@ -254,9 -156,10 +254,10 @@@ function ajaxForm(form, data) 
  /** Display edit field
  * @param HTMLElement
  * @param MouseEvent
 -* @param boolean display textarea instead of input
 +* @param number display textarea instead of input, 2 - load long text
  */
  function selectDblClick(td, event, text) {
+ 	td.ondblclick = function () { };
  	var pos = event.rangeOffset;
  	var value = (td.firstChild.firstChild ? td.firstChild.firstChild.data : (td.firstChild.alt ? td.firstChild.alt : td.firstChild.data));
  	var input = document.createElement(text ? 'textarea' : 'input');