commit 596a7cea9813f45748fd9cb492566c4d79559fb0
parent 62236bb26fcf2d75abb8bf09024fc9afcef923b8
Author: Davide P. Cervone <dpvc@union.edu>
Date: Mon, 29 Apr 2013 16:06:03 -0400
Merge branch 'issue445' into develop
Resolves issue #445.
Diffstat:
3 files changed, 1 insertion(+), 121 deletions(-)
diff --git a/extensions/v1.0-warning.js b/extensions/v1.0-warning.js
@@ -1,16 +0,0 @@
-/*
- * /MathJax/extensions/v1.0-warning.js
- *
- * Copyright (c) 2012 Design Science, Inc.
- *
- * Part of the MathJax library.
- * See http://www.mathjax.org for details.
- *
- * Licensed under the Apache License, Version 2.0;
- * you may not use this file except in compliance with the License.
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- */
-
-(function(b,e){var d="2.1";var a={style:{position:"fixed",bottom:"4em",left:"3em",width:"40em",border:"3px solid #880000","background-color":"#E0E0E0",color:"black",padding:"1em","font-size":"small","white-space":"normal","border-radius":".75em","-webkit-border-radius":".75em","-moz-border-radius":".75em","-khtml-border-radius":".75em","box-shadow":"4px 4px 10px #AAAAAA","-webkit-box-shadow":"4px 4px 10px #AAAAAA","-moz-box-shadow":"4px 4px 10px #AAAAAA","-khtml-box-shadow":"4px 4px 10px #AAAAAA",filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=3, OffY=3, Color='gray', Positive='true')"}};if(b.Browser.isIE9&&document.documentMode>=9){delete a.style.filter}var c;b.Register.StartupHook("onLoad",function(){var f=document.body;if(b.Browser.isMSIE){MathJax.Message.Init();f=document.getElementById("MathJax_MSIE_frame")||f;a.style.position="absolute"}else{delete a.style.filter}a.style.maxWidth=(document.body.clientWidth-75)+"px";c=e.addElement(f,"div",{id:"MathJax_ConfigWarning",style:a.style},[["div",{style:{position:"absolute",overflow:"hidden",top:".1em",right:".1em",border:"1px outset",width:"1em",height:"1em","text-align":"center",cursor:"pointer","background-color":"#EEEEEE",color:"#606060","border-radius":".5em","-webkit-border-radius":".5em","-moz-border-radius":".5em","-khtml-border-radius":".5em"},onclick:function(){c.style.display="none"}},[["span",{style:{position:"relative",bottom:".2em"}},["x"]]]],"MathJax no longer loads a default configuration file; you must specify such files explicitly. This page seems to use the older default ",["code",{},["config/MathJax.js"]]," file, and so needs to be updated. This is explained further at",["p",{style:{"text-align":"center"}},[["a",{href:"http://www.mathjax.org/help/configuration"},["http://www.mathjax.org/help/configuration"]]]]])})})(MathJax.Hub,MathJax.HTML);MathJax.Ajax.loadComplete("[MathJax]/extensions/v1.0-warning.js");
-
diff --git a/unpacked/MathJax.js b/unpacked/MathJax.js
@@ -33,7 +33,7 @@ if (!window.MathJax) {window.MathJax= {}}
if (!MathJax.Hub) { // skip if already loaded
MathJax.version = "2.1";
-MathJax.fileversion = "2.1.3";
+MathJax.fileversion = "2.1.4";
/**********************************************************/
@@ -1249,7 +1249,6 @@ MathJax.Hub = {
// set to "configured" to delay startup until MathJax.Hub.Configured() is called
// set to a Callback to wait for before continuing with the startup
skipStartupTypeset: false, // set to true to skip PreProcess and Process during startup
- "v1.0-compatible": true, // set to false to prevent message about configuration change
elements: [], // array of elements to process when none is given explicitly
positionToHash: true, // after initial typeset pass, position to #hash location?
@@ -1794,14 +1793,12 @@ MathJax.Hub.Startup = {
// Run the deprecated configuration script, if any (ignoring return value)
// Wait for the startup delay signal
// Run the mathjax-config blocks
- // Handle the default configuration (v1.0 compatible)
// Load the files in the configuration's config array
//
if (this.script.match(/\S/)) {this.queue.Push(this.script+";\n1;")}
this.queue.Push(
["ConfigDelay",this],
["ConfigBlocks",this],
- ["ConfigDefault",this],
[function (THIS) {return THIS.loadArray(MathJax.Hub.config.config,"config",null,true)},this],
["Post",this.signal,"End Config"]
);
@@ -1830,15 +1827,6 @@ MathJax.Hub.Startup = {
}
return last;
},
- //
- // Check for v1.0 no-configuration and put up a warning message.
- //
- ConfigDefault: function () {
- var CONFIG = MathJax.Hub.config;
- if (CONFIG["v1.0-compatible"] && (CONFIG.jax||[]).length === 0 &&
- !this.params.config && (CONFIG.config||[]).length === 0)
- {return MathJax.Ajax.Require(this.URL("extensions","v1.0-warning.js"))}
- },
//
// Read cookie and set up menu defaults
diff --git a/unpacked/extensions/v1.0-warning.js b/unpacked/extensions/v1.0-warning.js
@@ -1,92 +0,0 @@
-/*************************************************************
- *
- * MathJax/extensions/v1.0-warning.js
- *
- * This extension file is loaded when no jax are configured
- * as a backward-compatible measure to help people convert to the
- * new configuration process.
- *
- * ---------------------------------------------------------------------
- *
- * Copyright (c) 2011-2012 Design Science, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-(function (HUB,HTML) {
- var VERSION = "2.1";
-
- var CONFIG = {
- style: {
- position:"fixed", bottom:"4em", left:"3em", width:"40em",
- border: "3px solid #880000", "background-color": "#E0E0E0", color: "black",
- padding: "1em", "font-size":"small", "white-space":"normal",
-
- "border-radius": ".75em", // Opera 10.5 and IE9
- "-webkit-border-radius": ".75em", // Safari and Chrome
- "-moz-border-radius": ".75em", // Firefox
- "-khtml-border-radius": ".75em", // Konqueror
-
- "box-shadow": "4px 4px 10px #AAAAAA", // Opera 10.5 and IE9
- "-webkit-box-shadow": "4px 4px 10px #AAAAAA", // Safari 3 and Chrome
- "-moz-box-shadow": "4px 4px 10px #AAAAAA", // Forefox 3.5
- "-khtml-box-shadow": "4px 4px 10px #AAAAAA", // Konqueror
- filter: "progid:DXImageTransform.Microsoft.dropshadow(OffX=3, OffY=3, Color='gray', Positive='true')" // IE
- }
- };
- if (HUB.Browser.isIE9 && document.documentMode >= 9) {delete CONFIG.style.filter}
-
- var DIV;
-
- HUB.Register.StartupHook("onLoad",function () {
- var frame = document.body;
- if (HUB.Browser.isMSIE) {
- MathJax.Message.Init(); // make sure MathJax_MSIE_frame exists
- frame = document.getElementById("MathJax_MSIE_frame") || frame; // in IE8 and 9 it may not anyway
- CONFIG.style.position = "absolute";
- } else {delete CONFIG.style.filter}
- CONFIG.style.maxWidth = (document.body.clientWidth-75) + "px";
- DIV = HTML.addElement(frame,"div",{id:"MathJax_ConfigWarning",style:CONFIG.style},[
- [
- "div",{
- style: {
- position:"absolute", overflow:"hidden", top:".1em", right:".1em",
- border: "1px outset", width:"1em", height:"1em",
- "text-align": "center", cursor: "pointer",
- "background-color": "#EEEEEE", color:"#606060",
-
- "border-radius": ".5em", // Opera 10.5
- "-webkit-border-radius": ".5em", // Safari and Chrome
- "-moz-border-radius": ".5em", // Firefox
- "-khtml-border-radius": ".5em" // Konqueror
- },
- onclick: function () {DIV.style.display = "none"}
- },
- [["span",{style:{position:"relative", bottom:".2em"}},["x"]]]
- ],
- "MathJax no longer loads a default configuration file; " +
- "you must specify such files explicitly. " +
- "This page seems to use the older default ",["code",{},["config/MathJax.js"]],
- " file, and so needs to be updated. This is explained further at",
- ["p",{style:{"text-align":"center"}},[
- ["a",
- {href:"http://www.mathjax.org/help/configuration"},
- ["http://www.mathjax.org/help/configuration"]
- ]
- ]]
- ]);
- });
-
-})(MathJax.Hub,MathJax.HTML);
-
-MathJax.Ajax.loadComplete("[MathJax]/extensions/v1.0-warning.js");
