Skip to content
Snippets Groups Projects
Commit 4b1755bd authored by Adrian Lang's avatar Adrian Lang
Browse files

Make locktimer more robust

If no HTML element with the id wiki__text exists, locktimer.init led to a
JavaScript error.
parent 30d5f023
No related branches found
No related tags found
No related merge requests found
...@@ -113,7 +113,7 @@ function js_out(){ ...@@ -113,7 +113,7 @@ function js_out(){
js_runonstart("initSizeCtl('size__ctl','wiki__text')"); js_runonstart("initSizeCtl('size__ctl','wiki__text')");
js_runonstart("initToolbar('tool__bar','wiki__text',toolbar)"); js_runonstart("initToolbar('tool__bar','wiki__text',toolbar)");
if($conf['locktime'] != 0){ if($conf['locktime'] != 0){
js_runonstart("locktimer.init(".($conf['locktime'] - 60).",'".js_escape($lang['willexpire'])."',".$conf['usedraft'].")"); js_runonstart("locktimer.init(".($conf['locktime'] - 60).",'".js_escape($lang['willexpire'])."',".$conf['usedraft'].", 'wiki__text')");
} }
js_runonstart('scrollToMarker()'); js_runonstart('scrollToMarker()');
js_runonstart('focusMarker()'); js_runonstart('focusMarker()');
......
...@@ -9,7 +9,11 @@ var locktimer = { ...@@ -9,7 +9,11 @@ var locktimer = {
msg: '', msg: '',
pageid: '', pageid: '',
init: function(timeout,msg,draft){ init: function(timeout,msg,draft,edid){
var edit = $(edid);
if(!edit) return;
if(edit.readOnly) return;
// init values // init values
locktimer.timeout = timeout*1000; locktimer.timeout = timeout*1000;
locktimer.msg = msg; locktimer.msg = msg;
...@@ -19,7 +23,6 @@ var locktimer = { ...@@ -19,7 +23,6 @@ var locktimer = {
if(!$('dw__editform')) return; if(!$('dw__editform')) return;
locktimer.pageid = $('dw__editform').elements.id.value; locktimer.pageid = $('dw__editform').elements.id.value;
if(!locktimer.pageid) return; if(!locktimer.pageid) return;
if($('wiki__text').readOnly) return;
// init ajax component // init ajax component
locktimer.sack = new sack(DOKU_BASE + 'lib/exe/ajax.php'); locktimer.sack = new sack(DOKU_BASE + 'lib/exe/ajax.php');
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment