--- loncom/html/adm/jsMath/jsMath-controls.html 2006/05/17 22:19:27 1.2 +++ loncom/html/adm/jsMath/jsMath-controls.html 2007/10/09 21:29:16 1.3 @@ -9,7 +9,7 @@ | | --------------------------------------------------------------------- | - | Copyright 2004-2006 by Davide P. Cervone + | Copyright 2004-2007 by Davide P. Cervone | | Licensed under the Apache License, Version 2.0 (the "License"); | you may not use this file except in compliance with the License. @@ -41,7 +41,7 @@ while (!window.jsMath && !showWarning) { // if (pageDomain.match(/\..*\./) && (navigator.appName != 'Microsoft Internet Explorer' || - navigator.platform != 'MacPPC' || !navigator.userProfile || !document.all)) { + !navigator.platform.match(/Mac/) || !navigator.userProfile || !document.all)) { try { document.domain = pageDomain.replace(/^[^.]*\./,''); showWarning = 0; @@ -87,12 +87,7 @@ jsMath.Add(jsMath.Controls,{ Main: function () { this.oldCookie = {}; jsMath.Add(this.oldCookie,this.cookie); - this.panel.innerHTML = ""; // for MSIE on the Mac - if (jsMath.browser == 'Mozilla') { - this.panel.appendChild(document.getElementById("jsMath_panel").cloneNode(true)); - } else { - this.panel.innerHTML = document.getElementById("jsMath_panel").innerHTML; - } + this.GetPanel("panel"); jsMath.Element("_version").innerHTML = jsMath.version; @@ -133,15 +128,16 @@ jsMath.Add(jsMath.Controls,{ this.panel.style.display = "block"; this.openMain = 0; + + if (jsMath.Browser.msieMoveButtonHack) { + this.panel.style.left = "0px"; + this.panel.style.top = "0px"; + jsMath.Controls.MoveButton(); + } }, Options: function () { - this.panel.innerHTML = ""; // for MSIE on the Mac - if (jsMath.browser == 'Mozilla') { - this.panel.appendChild(document.getElementById("jsMath_options").cloneNode(true)); - } else { - this.panel.innerHTML = document.getElementById("jsMath_options").innerHTML; - } + this.GetPanel("options"); jsMath.Element("_scale").value = this.cookie.scale; jsMath.Element("_keep").value = this.cookie.keep; jsMath.Element("_global").value = this.cookie.global; @@ -177,6 +173,10 @@ jsMath.Add(jsMath.Controls,{ jsMath.Element("_globalText").className = "disabled"; jsMath.Element("_global").disabled = true; } + if (jsMath.isCHMmode) { + jsMath.Element("_asynchText").className = "disabled"; + jsMath.Element("_asynch").disabled = true; + } if (jsMath.Browser.safariButtonBug) { for (var id in this.optionLabels) @@ -184,6 +184,21 @@ jsMath.Add(jsMath.Controls,{ } this.panel.style.display = "block"; + + if (jsMath.Browser.msieMoveButtonHack) { + this.panel.style.left = "0px"; + this.panel.style.top = "0px"; + jsMath.Controls.MoveButton(); + } + }, + + GetPanel: function (name) { + this.panel.innerHTML = ""; // for MSIE on the Mac + if (jsMath.browser == 'Mozilla') { + this.panel.appendChild(document.getElementById("jsMath_"+name).cloneNode(true)); + } else { + this.panel.innerHTML = document.getElementById("jsMath_"+name).innerHTML; + } }, SaveOptions: function (close) { @@ -249,14 +264,15 @@ jsMath.Add(jsMath.Controls,{ + - + - +
@@ -331,7 +347,7 @@ on mathematics to reopen this panel. Show progress messages - Force asynchronous processing + Force asynchronous processing Don't show page until complete Show jsMath button