Merge branch 'issue971' into develop. Issue #971.

This commit is contained in:
Davide P. Cervone 2014-12-07 07:09:27 -05:00
commit e33e00bfaf
2 changed files with 7 additions and 6 deletions

View File

@ -61,9 +61,8 @@ MathJax.Hub.Register.LoadHook("[MathJax]/jax/element/mml/jax.js",function () {
if (this.type === "mstyle") {defaults = MML.math.prototype.defaults}
for (var id in defaults) {if (!skip[id] && !copy[id] && defaults.hasOwnProperty(id)) {
if (this[id] != null && this[id] !== defaults[id]) {
var value = this[id]; delete this[id];
if (this.Get(id) !== value) {attr.push(id+'="'+this.toMathMLattribute(value)+'"')}
this[id] = value;
if (this.Get(id,null,1) !== this[id])
attr.push(id+'="'+this.toMathMLattribute(this[id])+'"');
}
}}
}

View File

@ -296,9 +296,11 @@ MathJax.ElementJax.mml.Augment({
while (parent && parent.notParent) {parent = parent.parent}
return parent;
},
Get: function (name,nodefault) {
if (this[name] != null) {return this[name]}
if (this.attr && this.attr[name] != null) {return this.attr[name]}
Get: function (name,nodefault,noself) {
if (!noself) {
if (this[name] != null) {return this[name]}
if (this.attr && this.attr[name] != null) {return this.attr[name]}
}
// FIXME: should cache these values and get from cache
// (clear cache when appended to a new object?)
var parent = this.Parent();