diff options
| -rw-r--r-- | inc/media.php | 2 | ||||
| -rw-r--r-- | inc/parser/xhtml.php | 3 | ||||
| -rw-r--r-- | lib/plugins/acl/script.js | 1 | ||||
| -rw-r--r-- | lib/plugins/usermanager/script.js | 1 | ||||
| -rw-r--r-- | lib/scripts/edit.js | 7 |
5 files changed, 2 insertions, 12 deletions
diff --git a/inc/media.php b/inc/media.php index e8a19caf9..79e9a7a7e 100644 --- a/inc/media.php +++ b/inc/media.php @@ -450,7 +450,7 @@ function media_fileactions($item,$auth){ echo ' <a href="'.DOKU_BASE.'lib/exe/mediamanager.php?delete='.rawurlencode($item['id']). '&sectok='.getSecurityToken().'" '. - 'onclick="return confirm(\''.$ask.'\')" onkeypress="return confirm(\''.$ask.'\')">'. + 'onclick="return confirm(\''.$ask.'\')">'. '<img src="'.DOKU_BASE.'lib/images/trash.png" alt="'.$lang['btn_delete'].'" '. 'title="'.$lang['btn_delete'].'" class="btn" /></a>'; } diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php index 91b462089..726bccd19 100644 --- a/inc/parser/xhtml.php +++ b/inc/parser/xhtml.php @@ -613,8 +613,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer { //Display error on browsers other than IE $link['more'] = 'onclick="if(document.all == null){alert(\''. str_replace('\\\\n','\\n',addslashes($lang['nosmblinks'])). - '\');}" onkeypress="if(document.all == null){alert(\''. - str_replace('\\\\n','\\n',addslashes($lang['nosmblinks'])).'\');}"'; + '\');}"'; $link['name'] = $this->_getLinkTitle($name, $url, $isImage); if ( !$isImage ) { diff --git a/lib/plugins/acl/script.js b/lib/plugins/acl/script.js index b719cda58..01f9d12bc 100644 --- a/lib/plugins/acl/script.js +++ b/lib/plugins/acl/script.js @@ -8,7 +8,6 @@ acl = { addEvent(sel,'change',acl.userselhandler); addEvent($('acl__tree'),'click',acl.treehandler); addEvent($('acl__user').getElementsByTagName('input')[1],'click',acl.loadinfo); - addEvent($('acl__user').getElementsByTagName('input')[1],'keypress',acl.loadinfo); }, diff --git a/lib/plugins/usermanager/script.js b/lib/plugins/usermanager/script.js index 252e977f2..68d437129 100644 --- a/lib/plugins/usermanager/script.js +++ b/lib/plugins/usermanager/script.js @@ -4,7 +4,6 @@ function usrmgr_delconfirm(){ if($('usrmgr__del')){ addEvent( $('usrmgr__del'),'click',function(){ return confirm(reallyDel); } ); - addEvent( $('usrmgr__del'),'keypress',function(){ return confirm(reallyDel); } ); } }; addInitEvent(usrmgr_delconfirm); diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js index 3436432c7..80bb7a507 100644 --- a/lib/scripts/edit.js +++ b/lib/scripts/edit.js @@ -445,11 +445,6 @@ function initChangeCheck(msg){ if(window.event) window.event.returnValue = rc; return rc; }; - links[i].onkeypress = function(){ - var rc = changeCheck(msg); - if(window.event) window.event.returnValue = rc; - return rc; - }; } } // add change check for forms @@ -467,10 +462,8 @@ function initChangeCheck(msg){ // reset change memory var on submit var btn_save = document.getElementById('edbtn__save'); btn_save.onclick = function(){ textChanged = false; }; - btn_save.onkeypress = function(){ textChanged = false; }; var btn_prev = document.getElementById('edbtn__preview'); btn_prev.onclick = function(){ textChanged = false; }; - btn_prev.onkeypress = function(){ textChanged = false; }; // add change memory setter var edit_text = document.getElementById('wiki__text'); |