# HG changeset patch # User Aleksej Bobylev # Date 1447070198 -7200 # Node ID c79a4557c4b591f86ee4f1bb49cf704042ddeb83 # Parent 1bdec638c408516f91e301cd81dfa5051805a8c5 tazpanel.js, settings.cgi: innerText not works in Firefox diff -r 1bdec638c408 -r c79a4557c4b5 lib/tazpanel.js --- a/lib/tazpanel.js Sun Nov 08 12:43:04 2015 +0100 +++ b/lib/tazpanel.js Mon Nov 09 13:56:38 2015 +0200 @@ -12,7 +12,7 @@ // Confirm page loading break function confirmExit() { - return document.getElementById('confirmBreak').innerText; + return document.getElementById('confirmBreak').textContent; } // Attach event handler window.onbeforeunload = confirmExit; @@ -145,7 +145,7 @@ windowScrolled = document.body.scrollTop; if ((headerOffset - windowScrolled) < paddingTop) { -// document.getElementById('miscinfo1').innerText = '<'; +// document.getElementById('miscinfo1').textContent = '<'; var head1h = document.getElementById('head1h'); var head1 = document.getElementById('head1'); @@ -156,12 +156,12 @@ setProperty('width', head1.offsetWidth + 'px', 1); } -// document.getElementById('miscinfo1').innerText = '(' + toopop +')P^' + paddingTop + 'L' + head1h.offsetLeft + ':W' + head1h.offsetWidth + ':H' + head1h.offsetHeight + ':T' + head1h.clientTop +',' + head1h.offsetTop; +// document.getElementById('miscinfo1').textContent = '(' + toopop +')P^' + paddingTop + 'L' + head1h.offsetLeft + ':W' + head1h.offsetWidth + ':H' + head1h.offsetHeight + ':T' + head1h.clientTop +',' + head1h.offsetTop; } else { - //document.getElementById('miscinfo1').innerText = '>'; + //document.getElementById('miscinfo1').textContent = '>'; document.getElementById('head1h').style.display = 'none'; } @@ -201,17 +201,17 @@ // Element "cmd" is a text input, put History element there var cmd = document.getElementById('typeField'); cmd.focus(); - cmd.innerText = ash_history[cur_hist]; + cmd.textContent = ash_history[cur_hist]; var hint = '' if (cur_hist < max_hist) hint = '[' + cur_hist + '/' + (max_hist - 1) + '] '; - document.getElementById('num_hist').innerText = hint; + document.getElementById('num_hist').textContent = hint; //window.localStorage.setItem('cur_hist', cur_hist); return false } if (keyCode==13) { - document.getElementById('cmd').value=document.getElementById('typeField').innerText; + document.getElementById('cmd').value=document.getElementById('typeField').textContent; document.getElementById('term').submit(); return false } @@ -453,7 +453,7 @@ function countSelPkgs(el) { countSelectedSpan = document.getElementById('countSelected'); - countSelected = countSelectedSpan.innerText; + countSelected = countSelectedSpan.textContent; if (countSelected == '') countSelected = 0; element = (el.type == 'change' ? this : el); @@ -463,7 +463,7 @@ else countSelected--; - countSelectedSpan.innerText = countSelected; + countSelectedSpan.textContent = countSelected; // Disable buttons when no one package selected panelButtons = document.getElementsByName('do'); @@ -502,7 +502,7 @@ if (improveType.value == '') improveText.value = ''; else - improveText.value = document.getElementById(improveType.value).innerText; + improveText.value = document.getElementById(improveType.value).textContent; } diff -r 1bdec638c408 -r c79a4557c4b5 settings.cgi --- a/settings.cgi Sun Nov 08 12:43:04 2015 +0100 +++ b/settings.cgi Mon Nov 09 13:56:38 2015 +0200 @@ -682,7 +682,7 @@ return ((this.getHours() < 10)?"0":"") + this.getHours() + ":" + ((this.getMinutes() < 10)?"0":"") + this.getMinutes() + ":" + ((this.getSeconds() < 10)?"0":"") + this.getSeconds(); } setInterval(function(){ - document.getElementById('time').innerText = new Date().timeNow(); + document.getElementById('time').textContent = new Date().timeNow(); //ajax('settings.cgi?do=gethwclock', '1', 'hwclocks'); }, 1000); @@ -698,7 +698,7 @@ var dateFull = document.createElement('INPUT'); dateFull.name = 'dateFull'; - dateFull.value = document.getElementById('dateTime').childNodes[1].innerText; + dateFull.value = document.getElementById('dateTime').childNodes[1].textContent; dateFull.type = 'hidden'; sysTimeForm.appendChild(dateFull);