--- takahashi.xul 2006/06/09 21:15:49 1 +++ takahashi.xul 2006/06/09 21:51:42 3 @@ -718,10 +718,10 @@ var image_total_height = 0; var image_src; - var labelId = 0; + var labelId = 0; var lineRegExp = this.makePhraseRegExp('^([^%O]+)?(%O%Oem:((.+?)(:em)?%C%C)?|%O%Opre:((.+?)(:pre)?%C%C)?|%O%O\#[^:]+:((.+?)%C%C)?|%O%Oima?ge? +src="([^"]+)" +width="([0-9]+)" +height="([0-9]+)"[^%C]*%C%C|%O%O(([^\|]+)?\\||)([^%C]+)%C%C|%O([^%C]+)%C)(.+)?', 'i'); - var emRegExp = this.makePhraseRegExp('^([^%O]+)?%O%Oem:(.+?)()?%C%C', 'i'); + var emRegExp = this.makePhraseRegExp('^([^%O]+)?%O%Oem:(.+?)(:em)?%C%C', 'i'); var emStartRegExp = this.makePhraseRegExp('^([^%O]+)?%O%Oem:(.*)', 'i'); var emEndRegExp = this.makePhraseRegExp('^(.*?)((:em)?%C%C)', 'i'); @@ -1712,14 +1712,14 @@ { var now = (new Date()).getTime(); if (aStart === void(0) || aEnd === void(0)) { - var rest = prompt('Remaining Time (minits)'); - if (rest == '') { - this.resetTimer(); + var rest = prompt('Remaining Time (minits)'); + if (rest == '') { + this.resetTimer(); return; - } + } else { rest = Number(rest); - if (!rest || isNaN(rest)) return; + if (!rest || isNaN(rest)) return; } rest = Math.abs(rest);