Merge branch 'issue1036' into develop. Issue #1036.

This commit is contained in:
Davide P. Cervone 2015-04-21 16:42:03 -04:00
commit e22bcd1398

View File

@ -3063,8 +3063,8 @@ MathJax.Hub.Startup = {
} }
} }
CONFIG.root = scripts[i].src.replace(/(^|\/)[^\/]*(\?.*)?$/,'') CONFIG.root = scripts[i].src.replace(/(^|\/)[^\/]*(\?.*)?$/,'')
// convert rackspace to cdn.mathjax.org now that it supports https protocol // convert mathjax/latest to mathjax/x.y-latest so that all files are the same version
.replace(/^(https?:)\/\/[0-9a-f]+(-[0-9a-f]+)?.ssl.cf1.rackcdn.com\//,"$1//cdn.mathjax.org/"); .replace(/^(https?:\/\/cdn.mathjax.org\/mathjax\/)(latest)/,"$1"+BASE.version.split(/\./).slice(0,2).join(".")+"-$2");
BASE.Ajax.config.root = CONFIG.root; BASE.Ajax.config.root = CONFIG.root;
break; break;
} }