Skip to content

殷洪（管理员） / raphael

Go to a project
Commit d8f7740f by Dmitry Baranovskiy
Options

Fixes for VML missing methods 

Split issues
parent 68cabfae
Showing with 7 additions and 10 deletions
raphael-min.js
This source diff could not be displayed because it is too large. You can view the blob instead.
raphael.core.js
...@@ -493,7 +493,6 @@ ...@@ -493,7 +493,6 @@
initWin(g.win); initWin(g.win);
} }
}; };
// colour utilities
var toHex = function (color) { var toHex = function (color) {
if (R.vml) { if (R.vml) {
// http://dean.edwards.name/weblog/2009/10/convert-any-colour-value-to-hex-in-msie/ // http://dean.edwards.name/weblog/2009/10/convert-any-colour-value-to-hex-in-msie/
...@@ -2122,7 +2121,6 @@ ...@@ -2122,7 +2121,6 @@
paperproto.safari = fun; paperproto.safari = fun;
} }
// Events
var preventDefault = function () { var preventDefault = function () {
this.returnValue = false; this.returnValue = false;
}, },
......
raphael.js
...@@ -532,7 +532,6 @@ ...@@ -532,7 +532,6 @@
initWin(g.win); initWin(g.win);
} }
}; };
// colour utilities
var toHex = function (color) { var toHex = function (color) {
if (R.vml) { if (R.vml) {
// http://dean.edwards.name/weblog/2009/10/convert-any-colour-value-to-hex-in-msie/ // http://dean.edwards.name/weblog/2009/10/convert-any-colour-value-to-hex-in-msie/
...@@ -1820,7 +1819,6 @@ ...@@ -1820,7 +1819,6 @@
paperproto.safari = fun; paperproto.safari = fun;
} }
// Events
var preventDefault = function () { var preventDefault = function () {
this.returnValue = false; this.returnValue = false;
}, },
...@@ -3091,6 +3089,7 @@ ...@@ -3091,6 +3089,7 @@
return "Rapha\xebl\u2018s set"; return "Rapha\xebl\u2018s set";
}; };
R.registerFont = function (font) { R.registerFont = function (font) {
if (!font.face) { if (!font.face) {
return font; return font;
...@@ -3130,6 +3129,7 @@ ...@@ -3130,6 +3129,7 @@
} }
return font; return font;
}; };
paperproto.getFont = function (family, weight, style, stretch) { paperproto.getFont = function (family, weight, style, stretch) {
stretch = stretch || "normal"; stretch = stretch || "normal";
style = style || "normal"; style = style || "normal";
...@@ -3158,6 +3158,7 @@ ...@@ -3158,6 +3158,7 @@
} }
return thefont; return thefont;
}; };
paperproto.print = function (x, y, string, font, size, origin, letter_spacing) { paperproto.print = function (x, y, string, font, size, origin, letter_spacing) {
origin = origin || "middle"; // baseline|middle origin = origin || "middle"; // baseline|middle
letter_spacing = mmax(mmin(letter_spacing || 0, 1), -1); letter_spacing = mmax(mmin(letter_spacing || 0, 1), -1);
...@@ -3270,7 +3271,6 @@ window.Raphael.svg && function (R) { ...@@ -3270,7 +3271,6 @@ window.Raphael.svg && function (R) {
eve = R.eve, eve = R.eve,
E = "", E = "",
S = " "; S = " ";
// SVG
var xlink = "http://www.w3.org/1999/xlink", var xlink = "http://www.w3.org/1999/xlink",
markers = { markers = {
block: "M5,0 0,2.5 5,5z", block: "M5,0 0,2.5 5,5z",
...@@ -3808,7 +3808,6 @@ window.Raphael.svg && function (R) { ...@@ -3808,7 +3808,6 @@ window.Raphael.svg && function (R) {
tuneText(o, params); tuneText(o, params);
node.style.visibility = vis; node.style.visibility = vis;
console.log("new");
}, },
leading = 1.2, leading = 1.2,
tuneText = function (el, params) { tuneText = function (el, params) {
...@@ -4988,7 +4987,7 @@ window.Raphael.vml && function (R) { ...@@ -4988,7 +4987,7 @@ window.Raphael.vml && function (R) {
}; };
elproto.toFront = function () { elproto.toFront = function () {
!this.removed && this.node.parentNode.appendChild(this.node); !this.removed && this.node.parentNode.appendChild(this.node);
this.paper && this.paper.top != this && tofront(this, this.paper); this.paper && this.paper.top != this && R._tofront(this, this.paper);
return this; return this;
}; };
elproto.toBack = function () { elproto.toBack = function () {
...@@ -4997,7 +4996,7 @@ window.Raphael.vml && function (R) { ...@@ -4997,7 +4996,7 @@ window.Raphael.vml && function (R) {
} }
if (this.node.parentNode.firstChild != this.node) { if (this.node.parentNode.firstChild != this.node) {
this.node.parentNode.insertBefore(this.node, this.node.parentNode.firstChild); this.node.parentNode.insertBefore(this.node, this.node.parentNode.firstChild);
toback(this, this.paper); R._toback(this, this.paper);
} }
return this; return this;
}; };
......
raphael.vml.js
...@@ -656,7 +656,7 @@ window.Raphael.vml && function (R) { ...@@ -656,7 +656,7 @@ window.Raphael.vml && function (R) {
}; };
elproto.toFront = function () { elproto.toFront = function () {
!this.removed && this.node.parentNode.appendChild(this.node); !this.removed && this.node.parentNode.appendChild(this.node);
this.paper && this.paper.top != this && tofront(this, this.paper); this.paper && this.paper.top != this && R._tofront(this, this.paper);
return this; return this;
}; };
elproto.toBack = function () { elproto.toBack = function () {
...@@ -665,7 +665,7 @@ window.Raphael.vml && function (R) { ...@@ -665,7 +665,7 @@ window.Raphael.vml && function (R) {
} }
if (this.node.parentNode.firstChild != this.node) { if (this.node.parentNode.firstChild != this.node) {
this.node.parentNode.insertBefore(this.node, this.node.parentNode.firstChild); this.node.parentNode.insertBefore(this.node, this.node.parentNode.firstChild);
toback(this, this.paper); R._toback(this, this.paper);
} }
return this; return this;
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment