Skip to content

殷洪（管理员） / raphael

Go to a project
Commit 2d5839be by Dmitry Baranovskiy
Options

IE7 bugfix

parent c9efb352
Showing with 12 additions and 14 deletions
raphael.js
/* /*
* Raphael 0.6 - JavaScript Vector Library * Raphael 0.6.1 - JavaScript Vector Library
* *
* Copyright (c) 2008 Dmitry Baranovskiy (http://raphaeljs.com) * Copyright (c) 2008 Dmitry Baranovskiy (http://raphaeljs.com)
* Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license. * Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license.
...@@ -8,7 +8,7 @@ var Raphael = (function (type) { ...@@ -8,7 +8,7 @@ var Raphael = (function (type) {
var r = function () { var r = function () {
return r._create.apply(r, arguments); return r._create.apply(r, arguments);
}; };
r.version = "0.6"; r.version = "0.6.1";
r.type = type; r.type = type;
var availableAttrs = {cx: 0, cy: 0, fill: "#fff", "fill-opacity": 1, font: '16px "Arial"', "font-family": '"Arial"', "font-size": "16", gradient: 0, height: 0, opacity: 1, path: "M0,0", r: 0, rotation: 0, rx: 0, ry: 0, scale: "1 1", stroke: "#000", "stroke-dasharray": "", "stroke-linecap": "butt", "stroke-linejoin": "butt", "stroke-miterlimit": 0, "stroke-opacity": 1, "stroke-width": 1, translation: "0 0", width: 0, x: 0, y: 0}, var availableAttrs = {cx: 0, cy: 0, fill: "#fff", "fill-opacity": 1, font: '16px "Arial"', "font-family": '"Arial"', "font-size": "16", gradient: 0, height: 0, opacity: 1, path: "M0,0", r: 0, rotation: 0, rx: 0, ry: 0, scale: "1 1", stroke: "#000", "stroke-dasharray": "", "stroke-linecap": "butt", "stroke-linejoin": "butt", "stroke-miterlimit": 0, "stroke-opacity": 1, "stroke-width": 1, translation: "0 0", width: 0, x: 0, y: 0},
availableAnimAttrs = {cx: "number", cy: "number", fill: "colour", "fill-opacity": "number", "font-size": "number", height: "number", opacity: "number", path: "path", r: "number", rotation: "number", rx: "number", ry: "number", scale: "csv", stroke: "colour", "stroke-opacity": "number", "stroke-width": "number", translation: "csv", width: "number", x: "number", y: "number"}, availableAnimAttrs = {cx: "number", cy: "number", fill: "colour", "fill-opacity": "number", "font-size": "number", height: "number", opacity: "number", path: "path", r: "number", rotation: "number", rx: "number", ry: "number", scale: "csv", stroke: "colour", "stroke-opacity": "number", "stroke-width": "number", translation: "csv", width: "number", x: "number", y: "number"},
...@@ -273,7 +273,7 @@ var Raphael = (function (type) { ...@@ -273,7 +273,7 @@ var Raphael = (function (type) {
params["font"] && (s.font = params["font"]); params["font"] && (s.font = params["font"]);
params["font-weight"] && (s.fontWeight = params["font-weight"]); params["font-weight"] && (s.fontWeight = params["font-weight"]);
if (typeof params.opacity != "undefined" || typeof params["stroke-width"] != "undefined" || typeof params.fill != "undefined" || typeof params.stroke != "undefined") { if (typeof params.opacity != "undefined" || typeof params["stroke-width"] != "undefined" || typeof params.fill != "undefined" || typeof params.stroke != "undefined") {
o = o.shape || o[0]; o = o.shape || o.node;
var fill = (o.getElementsByTagName("fill") && o.getElementsByTagName("fill")[0]) || document.createElement("rvml:fill"); var fill = (o.getElementsByTagName("fill") && o.getElementsByTagName("fill")[0]) || document.createElement("rvml:fill");
if ("fill-opacity" in params || "opacity" in params) { if ("fill-opacity" in params || "opacity" in params) {
fill.opacity = ((params["fill-opacity"] + 1 || 2) - 1) * ((params.opacity + 1 || 2) - 1); fill.opacity = ((params["fill-opacity"] + 1 || 2) - 1) * ((params.opacity + 1 || 2) - 1);
...@@ -437,11 +437,15 @@ var Raphael = (function (type) { ...@@ -437,11 +437,15 @@ var Raphael = (function (type) {
this.textpath.v = ["m", Math.round(attr.x), ", ", Math.round(attr.y - 2), "l", Math.round(attr.x) + 1, ", ", Math.round(attr.y - 2)].join(""); this.textpath.v = ["m", Math.round(attr.x), ", ", Math.round(attr.y - 2), "l", Math.round(attr.x) + 1, ", ", Math.round(attr.y - 2)].join("");
return; return;
case "path": case "path":
var dim = Raphael.pathDimensions(this.attrs.path), if (!this.attrs.path) {
x = dim.x; x = y = w = h = 0;
y = dim.y; } else {
w = dim.width; var dim = Raphael.pathDimensions(this.attrs.path),
h = dim.height; x = dim.x;
y = dim.y;
w = dim.width;
h = dim.height;
}
break; break;
default: default:
x = 0; x = 0;
...@@ -1456,12 +1460,6 @@ var Raphael = (function (type) { ...@@ -1456,12 +1460,6 @@ var Raphael = (function (type) {
C.group = function () { C.group = function () {
return theGroup(this); return theGroup(this);
}; };
C.linerect = function (x, y, w, h, r) {
if (r && parseInt(r, 10)) {
return this.path({stroke: "#000"}).moveTo(x + r, y).lineTo(x + w - r, y).addRoundedCorner(r, "rd").lineTo(x + w, y + h - r).addRoundedCorner(r, "dl").lineTo(x + r, y + h).addRoundedCorner(r, "lu").lineTo(x, y + r).addRoundedCorner(r, "ur").andClose();
}
return this.path({stroke: "#000"}).moveTo(x, y).lineTo(x + w, y).lineTo(x + w, y + h).lineTo(x, y + h).andClose();
};
C.drawGrid = function (x, y, w, h, wv, hv, color) { C.drawGrid = function (x, y, w, h, wv, hv, color) {
color = color || "#000"; color = color || "#000";
var p = this.path({stroke: color, "stroke-width": 1}) var p = this.path({stroke: color, "stroke-width": 1})
......
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