Commit 89e3f477 by Dmitry Baranovskiy

Bug fixes & docs update

• documentation for Cufon fonts • fixed path2curve error • fixed setSize
and setViewBox
parent 68d4b8fb
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
S = " ", S = " ",
Str = String, Str = String,
split = "split", split = "split",
events = "click dblclick mousedown mousemove mouseout mouseover mouseup touchstart touchmove touchend orientationchange touchcancel gesturestart gesturechange gestureend".split(S), events = "click dblclick mousedown mousemove mouseout mouseover mouseup touchstart touchmove touchend touchcancel".split(S),
touchMap = { touchMap = {
mousedown: "touchstart", mousedown: "touchstart",
mousemove: "touchmove", mousemove: "touchmove",
...@@ -1109,16 +1109,20 @@ ...@@ -1109,16 +1109,20 @@
\*/ \*/
R.findDotsAtSegment = function (p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t) { R.findDotsAtSegment = function (p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t) {
var t1 = 1 - t, var t1 = 1 - t,
x = pow(t1, 3) * p1x + pow(t1, 2) * 3 * t * c1x + t1 * 3 * t * t * c2x + pow(t, 3) * p2x, t13 = pow(t1, 3),
y = pow(t1, 3) * p1y + pow(t1, 2) * 3 * t * c1y + t1 * 3 * t * t * c2y + pow(t, 3) * p2y, t12 = pow(t1, 2),
mx = p1x + 2 * t * (c1x - p1x) + t * t * (c2x - 2 * c1x + p1x), t2 = t * t,
my = p1y + 2 * t * (c1y - p1y) + t * t * (c2y - 2 * c1y + p1y), t3 = t2 * t,
nx = c1x + 2 * t * (c2x - c1x) + t * t * (p2x - 2 * c2x + c1x), x = t13 * p1x + t12 * 3 * t * c1x + t1 * 3 * t * t * c2x + t3 * p2x,
ny = c1y + 2 * t * (c2y - c1y) + t * t * (p2y - 2 * c2y + c1y), y = t13 * p1y + t12 * 3 * t * c1y + t1 * 3 * t * t * c2y + t3 * p2y,
ax = (1 - t) * p1x + t * c1x, mx = p1x + 2 * t * (c1x - p1x) + t2 * (c2x - 2 * c1x + p1x),
ay = (1 - t) * p1y + t * c1y, my = p1y + 2 * t * (c1y - p1y) + t2 * (c2y - 2 * c1y + p1y),
cx = (1 - t) * c2x + t * p2x, nx = c1x + 2 * t * (c2x - c1x) + t2 * (p2x - 2 * c2x + c1x),
cy = (1 - t) * c2y + t * p2y, ny = c1y + 2 * t * (c2y - c1y) + t2 * (p2y - 2 * c2y + c1y),
ax = t1 * p1x + t * c1x,
ay = t1 * p1y + t * c1y,
cx = t1 * c2x + t * p2x,
cy = t1 * c2y + t * p2y,
alpha = (90 - math.atan2(mx - nx, my - ny) * 180 / PI); alpha = (90 - math.atan2(mx - nx, my - ny) * 180 / PI);
(mx > nx || my < ny) && (alpha += 180); (mx > nx || my < ny) && (alpha += 180);
return { return {
...@@ -1491,7 +1495,7 @@ ...@@ -1491,7 +1495,7 @@
max: {x: mmax[apply](0, x), y: mmax[apply](0, y)} max: {x: mmax[apply](0, x), y: mmax[apply](0, y)}
}; };
}), }),
path2curve = cacher(function (path, path2) { path2curve = R._path2curve = cacher(function (path, path2) {
var p = pathToAbsolute(path), var p = pathToAbsolute(path),
p2 = path2 && pathToAbsolute(path2), p2 = path2 && pathToAbsolute(path2),
attrs = {x: 0, y: 0, bx: 0, by: 0, X: 0, Y: 0, qx: null, qy: null}, attrs = {x: 0, y: 0, bx: 0, by: 0, X: 0, Y: 0, qx: null, qy: null},
...@@ -2248,6 +2252,214 @@ ...@@ -2248,6 +2252,214 @@
| paper.circle(100, 100, 20).red(); | paper.circle(100, 100, 20).red();
\*/ \*/
elproto = R.el = {}; elproto = R.el = {};
/*\
* Element.click
[ method ]
**
* Adds event handler for click for the element.
> Parameters
- handler (function) handler for the event
= (object) @Element
\*/
/*\
* Element.unclick
[ method ]
**
* Removes event handler for click for the element.
> Parameters
- handler (function) handler for the event
= (object) @Element
\*/
/*\
* Element.dblclick
[ method ]
**
* Adds event handler for double click for the element.
> Parameters
- handler (function) handler for the event
= (object) @Element
\*/
/*\
* Element.undblclick
[ method ]
**
* Removes event handler for double click for the element.
> Parameters
- handler (function) handler for the event
= (object) @Element
\*/
/*\
* Element.mousedown
[ method ]
**
* Adds event handler for mousedown for the element.
> Parameters
- handler (function) handler for the event
= (object) @Element
\*/
/*\
* Element.unmousedown
[ method ]
**
* Removes event handler for mousedown for the element.
> Parameters
- handler (function) handler for the event
= (object) @Element
\*/
/*\
* Element.mousemove
[ method ]
**
* Adds event handler for mousemove for the element.
> Parameters
- handler (function) handler for the event
= (object) @Element
\*/
/*\
* Element.unmousemove
[ method ]
**
* Removes event handler for mousemove for the element.
> Parameters
- handler (function) handler for the event
= (object) @Element
\*/
/*\
* Element.mouseout
[ method ]
**
* Adds event handler for mouseout for the element.
> Parameters
- handler (function) handler for the event
= (object) @Element
\*/
/*\
* Element.unmouseout
[ method ]
**
* Removes event handler for mouseout for the element.
> Parameters
- handler (function) handler for the event
= (object) @Element
\*/
/*\
* Element.mouseover
[ method ]
**
* Adds event handler for mouseover for the element.
> Parameters
- handler (function) handler for the event
= (object) @Element
\*/
/*\
* Element.unmouseover
[ method ]
**
* Removes event handler for mouseover for the element.
> Parameters
- handler (function) handler for the event
= (object) @Element
\*/
/*\
* Element.mouseup
[ method ]
**
* Adds event handler for mouseup for the element.
> Parameters
- handler (function) handler for the event
= (object) @Element
\*/
/*\
* Element.unmouseup
[ method ]
**
* Removes event handler for mouseup for the element.
> Parameters
- handler (function) handler for the event
= (object) @Element
\*/
/*\
* Element.touchstart
[ method ]
**
* Adds event handler for touchstart for the element.
> Parameters
- handler (function) handler for the event
= (object) @Element
\*/
/*\
* Element.untouchstart
[ method ]
**
* Removes event handler for touchstart for the element.
> Parameters
- handler (function) handler for the event
= (object) @Element
\*/
/*\
* Element.touchmove
[ method ]
**
* Adds event handler for touchmove for the element.
> Parameters
- handler (function) handler for the event
= (object) @Element
\*/
/*\
* Element.untouchmove
[ method ]
**
* Removes event handler for touchmove for the element.
> Parameters
- handler (function) handler for the event
= (object) @Element
\*/
/*\
* Element.touchend
[ method ]
**
* Adds event handler for touchend for the element.
> Parameters
- handler (function) handler for the event
= (object) @Element
\*/
/*\
* Element.untouchend
[ method ]
**
* Removes event handler for touchend for the element.
> Parameters
- handler (function) handler for the event
= (object) @Element
\*/
/*\
* Element.touchcancel
[ method ]
**
* Adds event handler for touchcancel for the element.
> Parameters
- handler (function) handler for the event
= (object) @Element
\*/
/*\
* Element.untouchcancel
[ method ]
**
* Removes event handler for touchcancel for the element.
> Parameters
- handler (function) handler for the event
= (object) @Element
\*/
for (var i = events.length; i--;) { for (var i = events.length; i--;) {
(function (eventName) { (function (eventName) {
R[eventName] = elproto[eventName] = function (fn, scope) { R[eventName] = elproto[eventName] = function (fn, scope) {
...@@ -2638,7 +2850,9 @@ ...@@ -2638,7 +2850,9 @@
| ); | );
| st.attr({fill: "red"}); | st.attr({fill: "red"});
\*/ \*/
paperproto.setSize = R._engine.setSize; paperproto.setSize = function (width, height) {
return R._engine.setSize.call(this, width, height);
};
/*\ /*\
* Paper.setViewBox * Paper.setViewBox
[ method ] [ method ]
...@@ -2648,14 +2862,15 @@ ...@@ -2648,14 +2862,15 @@
** **
> Parameters > Parameters
** **
x, y, w, h, fit
- x (number) new x position, default is `0` - x (number) new x position, default is `0`
- y (number) new y position, default is `0` - y (number) new y position, default is `0`
- w (number) new width of the canvas - w (number) new width of the canvas
- h (number) new height of the canvas - h (number) new height of the canvas
- fit (boolean) `true` if you want graphics to fit into new boundary box - fit (boolean) `true` if you want graphics to fit into new boundary box
\*/ \*/
paperproto.setViewBox = R._engine.setViewBox; paperproto.setViewBox = function (x, y, w, h, fit) {
return R._engine.setViewBox.call(this, x, y, w, h, fit);
};
/*\ /*\
* Paper.top * Paper.top
[ property ] [ property ]
...@@ -3971,6 +4186,21 @@ ...@@ -3971,6 +4186,21 @@
return "Rapha\xebl\u2018s set"; return "Rapha\xebl\u2018s set";
}; };
/*\
* Raphael.registerFont
[ method ]
**
* Adds given font to the registered set of fonts for Raphaël. Should be used as an internal call from within Cufón’s font file.
* Returns original parameter, so it could be used with chaining.
# <a href="http://wiki.github.com/sorccu/cufon/about">More about Cufón and how to convert your font form TTF, OTF, etc to JavaScript file.</a>
**
> Parameters
**
- font (object) the font to register
= (object) the font you passed in
> Usage
| Cufon.registerFont(Raphael.registerFont({…}));
\*/
R.registerFont = function (font) { R.registerFont = function (font) {
if (!font.face) { if (!font.face) {
return font; return font;
...@@ -4010,6 +4240,22 @@ ...@@ -4010,6 +4240,22 @@
} }
return font; return font;
}; };
/*\
* Paper.getFont
[ method ]
**
* Finds font object in the registered fonts by given parameters. You could specify only one word from the font name, like “Myriad” for “Myriad Pro”.
**
> Parameters
**
- family (string) font family name or any word from it
- weight (string) #optional font weight
- style (string) #optional font style
- stretch (string) #optional font stretch
= (object) the font object
> Usage
| paper.print(100, 100, "Test string", paper.getFont("Times", 800), 30);
\*/
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";
...@@ -4038,6 +4284,28 @@ ...@@ -4038,6 +4284,28 @@
} }
return thefont; return thefont;
}; };
/*\
* Paper.print
[ method ]
**
* Creates set of shapes to represent given font at given position with given size.
* Result of the method is set object (see @Paper.set) which contains each letter as separate path object.
**
> Parameters
**
- x (number) x position of the text
- y (number) y position of the text
- text (string) text to print
- font (object) font object, see @Paper.getFont
- size (number) #optional size of the font, default is `16`
- origin (string) #optional could be `"baseline"` or `"middle"`, default is `"middle"`
- letter_spacing (number) #optional number in range `-1..1`, default is `0`
= (object) resulting set of letters
> Usage
| var txt = r.print(10, 50, "print", r.getFont("Museo"), 30).attr({fill: "#fff"});
| // following line will paint first letter in red
| txt[0].attr({fill: "#f00"});
\*/
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);
......
// ┌─────────────────────────────────────────────────────────────────────┐ \\ // ┌─────────────────────────────────────────────────────────────────────┐ \\
// │ "Raphaël 2.0" - JavaScript Vector Library │ \\ // │ Raphaël 2.0 - JavaScript Vector Library │ \\
// ├─────────────────────────────────────────────────────────────────────┤ \\ // ├─────────────────────────────────────────────────────────────────────┤ \\
// │ Copyright (c) 2008-2011 Dmitry Baranovskiy (http://raphaeljs.com) │ \\ // │ Copyright (c) 2008-2011 Dmitry Baranovskiy (http://raphaeljs.com) │ \\
// │ Copyright (c) 2008-2011 Sencha Labs (http://sencha.com) │ \\ // │ Copyright (c) 2008-2011 Sencha Labs (http://sencha.com) │ \\
...@@ -25,20 +25,7 @@ ...@@ -25,20 +25,7 @@
current_event, current_event,
stop, stop,
events = {n: {}}, events = {n: {}},
/*\
* eve
[ method ]
**
* Fires event with given `name`, given scope and other parameters.
**
> Arguments
**
- name (string) name of the event, dot (`.`) or slash (`/`) separated
- scope (object) context for the event handlers
- varargs (...) the rest of arguments will be sent to event handlers
**
= (object) array of returned values from the listeners
\*/
eve = function (name, scope) { eve = function (name, scope) {
var e = events, var e = events,
args = Array.prototype.slice.call(arguments, 2), args = Array.prototype.slice.call(arguments, 2),
...@@ -94,18 +81,7 @@ ...@@ -94,18 +81,7 @@
} }
return out.length ? out : null; return out.length ? out : null;
}; };
/*\
* eve.listeners
[ method ]
**
* Internal method which gives you array of all event handlers that will be triggered by the given `name`.
**
> Arguments
**
- name (string) name of the event, dot (`.`) or slash (`/`) separated
**
= (array) array of event handlers
\*/
eve.listeners = function (name) { eve.listeners = function (name) {
var names = name.split(separator), var names = name.split(separator),
e = events, e = events,
...@@ -138,29 +114,7 @@ ...@@ -138,29 +114,7 @@
return out; return out;
}; };
/*\
* eve.on
[ method ]
**
* Binds given event handler with a given name. You can use wildcards “`*`” for the names:
| eve.on("*.under.*", f);
| eve("mouse.under.floor"); // triggers f
* Use @eve to trigger the listener.
**
> Arguments
**
- name (string) name of the event, dot (`.`) or slash (`/`) separated, with optional wildcards
- f (function) event handler function
**
= (function) returned function accept one number parameter that represents z-index of the handler. It is optional feature and only used when you need to ensure that some subset of handlers will be invoked in a given order, despite of the order of assignment.
> Example:
| eve.on("mouse", eat)(2);
| eve.on("mouse", scream);
| eve.on("mouse", catch)(1);
* This will ensure that `catch` function will be called before `eat`.
* If you want to put you hadler before not indexed handlers specify negative value.
* Note: I assume most of the time you don’t need to worry about z-index, but it’s nice to have this feature “just in case”.
\*/
eve.on = function (name, f) { eve.on = function (name, f) {
var names = name.split(separator), var names = name.split(separator),
e = events; e = events;
...@@ -180,46 +134,18 @@ ...@@ -180,46 +134,18 @@
} }
}; };
}; };
/*\
* eve.stop
[ method ]
**
* Is used inside event handler to stop event
\*/
eve.stop = function () { eve.stop = function () {
stop = 1; stop = 1;
}; };
/*\
* eve.nt
[ method ]
**
* Could be used inside event handler to figure out actual name of the event.
**
> Arguments
**
- subname (string) #optional subname of the event
**
= (string) name of the event, if `subname` is not specified
* or
= (boolean) `true`, if current event’s name contains `subname`
\*/
eve.nt = function (subname) { eve.nt = function (subname) {
if (subname) { if (subname) {
return new RegExp("(?:\\.|\\/|^)" + subname + "(?:\\.|\\/|$)").test(current_event); return new RegExp("(?:\\.|\\/|^)" + subname + "(?:\\.|\\/|$)").test(current_event);
} }
return current_event; return current_event;
}; };
/*\
* eve.unbind
[ method ]
**
* Removes given function from the list of event listeners assigned to given name.
**
> Arguments
**
- name (string) name of the event, dot (`.`) or slash (`/`) separated, with optional wildcards
- f (function) event handler function
\*/
eve.unbind = function (name, f) { eve.unbind = function (name, f) {
var names = name.split(separator), var names = name.split(separator),
e, e,
...@@ -271,12 +197,7 @@ ...@@ -271,12 +197,7 @@
} }
} }
}; };
/*\
* eve.version
[ property (string) ]
**
* Current version of the library.
\*/
eve.version = version; eve.version = version;
eve.toString = function () { eve.toString = function () {
return "You are running Eve " + version; return "You are running Eve " + version;
...@@ -292,56 +213,7 @@ ...@@ -292,56 +213,7 @@
// │ Licensed under the MIT (http://raphaeljs.com/license.html) license. │ \\ // │ Licensed under the MIT (http://raphaeljs.com/license.html) license. │ \\
// └─────────────────────────────────────────────────────────────────────┘ \\ // └─────────────────────────────────────────────────────────────────────┘ \\
(function () { (function () {
/*\
* Raphael
[ method ]
**
* Creates a canvas object on which to draw.
* You must do this first, as all future calls to drawing methods
* from this instance will be bound to this canvas.
> Parameters
**
- container (HTMLElement|string) DOM element or its ID which is going to be a parent for drawing surface
- width (number)
- height (number)
- callback (function) #optional callback function which is going to be executed in the context of newly created paper
* or
- x (number)
- y (number)
- width (number)
- height (number)
- callback (function) #optional callback function which is going to be executed in the context of newly created paper
* or
- all (array) (first 3 or 4 elements in the array are equal to [containerID, width, height] or [x, y, width, height]. The rest are element descriptions in format {type: type, <attributes>})
- callback (function) #optional callback function which is going to be executed in the context of newly created paper
* or
- onReadyCallback (function) function that is going to be called on DOM ready event. You can also subscribe to this event via Eve’s “DOMLoad” event. In this case method returns `undefined`.
= (object) @Paper
> Usage
| // Each of the following examples create a canvas
| // that is 320px wide by 200px high.
| // Canvas is created at the viewport’s 10,50 coordinate.
| var paper = Raphael(10, 50, 320, 200);
| // Canvas is created at the top left corner of the #notepad element
| // (or its top right corner in dir="rtl" elements)
| var paper = Raphael(document.getElementById("notepad"), 320, 200);
| // Same as above
| var paper = Raphael("notepad", 320, 200);
| // Image dump
| var set = Raphael(["notepad", 320, 200, {
| type: "rect",
| x: 10,
| y: 10,
| width: 25,
| height: 25,
| stroke: "#f00"
| }, {
| type: "text",
| x: 30,
| y: 40,
| text: "Dump"
| }]);
\*/
function R(first) { function R(first) {
if (R.is(first, "function")) { if (R.is(first, "function")) {
return loaded ? first() : eve.on("DOMload", first); return loaded ? first() : eve.on("DOMload", first);
...@@ -395,7 +267,7 @@ ...@@ -395,7 +267,7 @@
S = " ", S = " ",
Str = String, Str = String,
split = "split", split = "split",
events = "click dblclick mousedown mousemove mouseout mouseover mouseup touchstart touchmove touchend orientationchange touchcancel gesturestart gesturechange gestureend".split(S), events = "click dblclick mousedown mousemove mouseout mouseover mouseup touchstart touchmove touchend touchcancel".split(S),
touchMap = { touchMap = {
mousedown: "touchstart", mousedown: "touchstart",
mousemove: "touchmove", mousemove: "touchmove",
...@@ -561,12 +433,7 @@ ...@@ -561,12 +433,7 @@
}; };
R._g = g; R._g = g;
/*\
* Raphael.type
[ property (string) ]
**
* Can be “SVG”, “VML” or empty, depending on browser support.
\*/
R.type = (g.win.SVGAngle || g.doc.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure", "1.1") ? "SVG" : "VML"); R.type = (g.win.SVGAngle || g.doc.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure", "1.1") ? "SVG" : "VML");
if (R.type == "VML") { if (R.type == "VML") {
var d = g.doc.createElement("div"), var d = g.doc.createElement("div"),
...@@ -579,85 +446,17 @@ ...@@ -579,85 +446,17 @@
} }
d = null; d = null;
} }
/*\
* Raphael.svg
[ property (boolean) ]
**
* `true` if browser supports SVG.
\*/
/*\
* Raphael.vml
[ property (boolean) ]
**
* `true` if browser supports VML.
\*/
R.svg = !(R.vml = R.type == "VML"); R.svg = !(R.vml = R.type == "VML");
R._Paper = Paper; R._Paper = Paper;
/*\
* Raphael.fn
[ property (object) ]
**
* You can add your own method to the canvas. For example if you want to draw a pie chart,
* you can create your own pie chart function and ship it as a Raphaël plugin. To do this
* you need to extend the `Raphael.fn` object. Please note that you can create your own namespaces
* inside the `fn` object — methods will be run in the context of canvas anyway. You should alter
* the `fn` object before a Raphaël instance is created, otherwise it will take no effect.
> Usage
| Raphael.fn.arrow = function (x1, y1, x2, y2, size) {
| return this.path( ... );
| };
| // or create namespace
| Raphael.fn.mystuff = {
| arrow: function () {…},
| star: function () {…},
| // etc…
| };
| var paper = Raphael(10, 10, 630, 480);
| // then use it
| paper.arrow(10, 10, 30, 30, 5).attr({fill: "#f00"});
| paper.mystuff.arrow();
| paper.mystuff.star();
\*/
R.fn = paperproto = Paper.prototype = R.prototype; R.fn = paperproto = Paper.prototype = R.prototype;
/*\
* Paper.customAttributes
[ property (object) ]
**
* If you have a set of attributes that you would like to represent
* as a function of some number you can do it easily with custom attributes:
> Usage
| paper.customAttributes.hue = function (num) {
| num = num % 1;
| return {fill: "hsb(" + num + ", .75, 1)"};
| };
| // Custom attribute “hue” will change fill
| // to be given hue with fixed saturation and brightness.
| // Now you can use it like this:
| var c = paper.circle(10, 10, 10).attr({hue: .45});
| // or even like this:
| c.animate({hue: 1}, 1e3);
|
| // You could also create custom attribute
| // with multiple parameters:
| paper.customAttributes.hsb = function (h, s, b) {
| return {fill: "hsb(" + [h, s, b].join(",") + ")"};
| };
| c.attr({hsb: ".5 .8 1"});
| c.animate({hsb: "1 0 .5"}, 1e3);
\*/
paperproto.customAttributes = {}; paperproto.customAttributes = {};
R._id = 0; R._id = 0;
R._oid = 0; R._oid = 0;
/*\
* Raphael.is
[ method ]
**
* Handfull replacement for `typeof` operator.
> Parameters
- o (…) any object or primitive
- type (string) name of the type, i.e. “string”, “function”, “number”, etc.
= (boolean) is given value is of given type
\*/
R.is = function (o, type) { R.is = function (o, type) {
type = lowerCase.call(type); type = lowerCase.call(type);
if (type == "finite") { if (type == "finite") {
...@@ -672,20 +471,7 @@ ...@@ -672,20 +471,7 @@
(type == "array" && Array.isArray && Array.isArray(o)) || (type == "array" && Array.isArray && Array.isArray(o)) ||
objectToString.call(o).slice(8, -1).toLowerCase() == type; objectToString.call(o).slice(8, -1).toLowerCase() == type;
}; };
/*\
* Raphael.angle
[ method ]
**
* Returns angle between two or three points
> Parameters
- x1 (number) x coord of first point
- y1 (number) y coord of first point
- x2 (number) x coord of second point
- y2 (number) y coord of second point
- x3 (number) #optional x coord of third point
- y3 (number) #optional y coord of third point
= (number) angle in degrees.
\*/
R.angle = function (x1, y1, x2, y2, x3, y3) { R.angle = function (x1, y1, x2, y2, x3, y3) {
if (x3 == null) { if (x3 == null) {
var x = x1 - x2, var x = x1 - x2,
...@@ -698,41 +484,15 @@ ...@@ -698,41 +484,15 @@
return R.angle(x1, y1, x3, y3) - R.angle(x2, y2, x3, y3); return R.angle(x1, y1, x3, y3) - R.angle(x2, y2, x3, y3);
} }
}; };
/*\
* Raphael.rad
[ method ]
**
* Transform angle to radians
> Parameters
- deg (number) angle in degrees
= (number) angle in radians.
\*/
R.rad = function (deg) { R.rad = function (deg) {
return deg % 360 * PI / 180; return deg % 360 * PI / 180;
}; };
/*\
* Raphael.deg
[ method ]
**
* Transform angle to degrees
> Parameters
- deg (number) angle in radians
= (number) angle in degrees.
\*/
R.deg = function (rad) { R.deg = function (rad) {
return rad * 180 / PI % 360; return rad * 180 / PI % 360;
}; };
/*\
* Raphael.snapTo
[ method ]
**
* Snaps given value to given grid.
> Parameters
- values (array|number) given array of values or step of the grid
- value (number) value to adjust
- tolerance (number) #optional tolerance for snapping. Default is `10`.
= (number) adjusted value.
\*/
R.snapTo = function (values, value, tolerance) { R.snapTo = function (values, value, tolerance) {
tolerance = R.is(tolerance, "finite") ? tolerance : 10; tolerance = R.is(tolerance, "finite") ? tolerance : 10;
if (R.is(values, array)) { if (R.is(values, array)) {
...@@ -763,14 +523,7 @@ ...@@ -763,14 +523,7 @@
return v.toString(16); return v.toString(16);
}); });
/*\
* Raphael.setWindow
[ method ]
**
* Used when you need to draw in `&lt;iframe>`. Switched window to the iframe one.
> Parameters
- newwin (window) new window object
\*/
R.setWindow = function (newwin) { R.setWindow = function (newwin) {
eve("setWindow", R, g.win, newwin); eve("setWindow", R, g.win, newwin);
g.win = newwin; g.win = newwin;
...@@ -860,26 +613,7 @@ ...@@ -860,26 +613,7 @@
return rgb; return rgb;
}; };
/*\
* Raphael.color
[ method ]
**
* Parses the color string and returns object with all values for the given color.
> Parameters
- clr (string) color string in one of the supported formats (see @Raphael.getRGB)
= (object) Combined RGB & HSB object in format:
o {
o r (number) red,
o g (number) green,
o b (number) blue,
o hex (string) color in HTML/CSS format: #••••••,
o error (boolean) `true` if string can’t be parsed,
o h (number) hue,
o s (number) saturation,
o v (number) value (brightness),
o l (number) lightness
o }
\*/
R.color = function (clr) { R.color = function (clr) {
var rgb; var rgb;
if (R.is(clr, "object") && "h" in clr && "s" in clr && "b" in clr) { if (R.is(clr, "object") && "h" in clr && "s" in clr && "b" in clr) {
...@@ -913,23 +647,7 @@ ...@@ -913,23 +647,7 @@
clr.toString = rgbtoString; clr.toString = rgbtoString;
return clr; return clr;
}; };
/*\
* Raphael.hsb2rgb
[ method ]
**
* Converts HSB values to RGB object.
> Parameters
- h (number) hue
- s (number) saturation
- v (number) value or brightness
= (object) RGB object in format:
o {
o r (number) red,
o g (number) green,
o b (number) blue,
o hex (string) color in HTML/CSS format: #••••••
o }
\*/
R.hsb2rgb = function (h, s, v, o) { R.hsb2rgb = function (h, s, v, o) {
if (this.is(h, "object") && "h" in h && "s" in h && "b" in h) { if (this.is(h, "object") && "h" in h && "s" in h && "b" in h) {
v = h.b; v = h.b;
...@@ -950,23 +668,7 @@ ...@@ -950,23 +668,7 @@
B += [0, 0, X, C, C, X][h]; B += [0, 0, X, C, C, X][h];
return packageRGB(R, G, B, o); return packageRGB(R, G, B, o);
}; };
/*\
* Raphael.hsl2rgb
[ method ]
**
* Converts HSL values to RGB object.
> Parameters
- h (number) hue
- s (number) saturation
- l (number) luminosity
= (object) RGB object in format:
o {
o r (number) red,
o g (number) green,
o b (number) blue,
o hex (string) color in HTML/CSS format: #••••••
o }
\*/
R.hsl2rgb = function (h, s, l, o) { R.hsl2rgb = function (h, s, l, o) {
if (this.is(h, "object") && "h" in h && "s" in h && "l" in h) { if (this.is(h, "object") && "h" in h && "s" in h && "l" in h) {
l = h.l; l = h.l;
...@@ -991,22 +693,7 @@ ...@@ -991,22 +693,7 @@
B += [0, 0, X, C, C, X][h]; B += [0, 0, X, C, C, X][h];
return packageRGB(R, G, B, o); return packageRGB(R, G, B, o);
}; };
/*\
* Raphael.rgb2hsb
[ method ]
**
* Converts RGB values to HSB object.
> Parameters
- r (number) red
- g (number) green
- b (number) blue
= (object) HSB object in format:
o {
o h (number) hue
o s (number) saturation
o b (number) brightness
o }
\*/
R.rgb2hsb = function (r, g, b) { R.rgb2hsb = function (r, g, b) {
b = prepareRGB(r, g, b); b = prepareRGB(r, g, b);
r = b[0]; r = b[0];
...@@ -1025,22 +712,7 @@ ...@@ -1025,22 +712,7 @@
S = C == 0 ? 0 : C / V; S = C == 0 ? 0 : C / V;
return {h: H, s: S, b: V, toString: hsbtoString}; return {h: H, s: S, b: V, toString: hsbtoString};
}; };
/*\
* Raphael.rgb2hsl
[ method ]
**
* Converts RGB values to HSL object.
> Parameters
- r (number) red
- g (number) green
- b (number) blue
= (object) HSL object in format:
o {
o h (number) hue
o s (number) saturation
o l (number) luminosity
o }
\*/
R.rgb2hsl = function (r, g, b) { R.rgb2hsl = function (r, g, b) {
b = prepareRGB(r, g, b); b = prepareRGB(r, g, b);
r = b[0]; r = b[0];
...@@ -1107,33 +779,7 @@ ...@@ -1107,33 +779,7 @@
return this.hex; return this.hex;
} }
/*\
* Raphael.getRGB
[ method ]
**
* Parses colour string as RGB object
> Parameters
- colour (string) colour string in one of formats:
# <ul>
# <li>Colour name (“<code>red</code>”, “<code>green</code>”, “<code>cornflowerblue</code>”, etc)</li>
# <li>#••• — shortened HTML colour: (“<code>#000</code>”, “<code>#fc0</code>”, etc)</li>
# <li>#•••••• — full length HTML colour: (“<code>#000000</code>”, “<code>#bd2300</code>”)</li>
# <li>rgb(•••, •••, •••) — red, green and blue channels’ values: (“<code>rgb(200,&nbsp;100,&nbsp;0)</code>”)</li>
# <li>rgb(•••%, •••%, •••%) — same as above, but in %: (“<code>rgb(100%,&nbsp;175%,&nbsp;0%)</code>”)</li>
# <li>hsb(•••, •••, •••) — hue, saturation and brightness values: (“<code>hsb(0.5,&nbsp;0.25,&nbsp;1)</code>”)</li>
# <li>hsb(•••%, •••%, •••%) — same as above, but in %</li>
# <li>hsl(•••, •••, •••) — same as hsb</li>
# <li>hsl(•••%, •••%, •••%) — same as hsb</li>
# </ul>
= (object) RGB object in format:
o {
o r (number) red,
o g (number) green,
o b (number) blue
o hex (string) color in HTML/CSS format: #••••••,
o error (boolean) true if string can’t be parsed
o }
\*/
R.getRGB = cacher(function (colour) { R.getRGB = cacher(function (colour) {
if (!colour || !!((colour = Str(colour)).indexOf("-") + 1)) { if (!colour || !!((colour = Str(colour)).indexOf("-") + 1)) {
return {r: -1, g: -1, b: -1, hex: "none", error: 1, toString: clrToString}; return {r: -1, g: -1, b: -1, hex: "none", error: 1, toString: clrToString};
...@@ -1205,57 +851,19 @@ ...@@ -1205,57 +851,19 @@
} }
return {r: -1, g: -1, b: -1, hex: "none", error: 1, toString: clrToString}; return {r: -1, g: -1, b: -1, hex: "none", error: 1, toString: clrToString};
}, R); }, R);
/*\
* Raphael.hsb
[ method ]
**
* Converts HSB values to hex representation of the colour.
> Parameters
- h (number) hue
- s (number) saturation
- b (number) value or brightness
= (string) hex representation of the colour.
\*/
R.hsb = cacher(function (h, s, b) { R.hsb = cacher(function (h, s, b) {
return R.hsb2rgb(h, s, b).hex; return R.hsb2rgb(h, s, b).hex;
}); });
/*\
* Raphael.hsl
[ method ]
**
* Converts HSL values to hex representation of the colour.
> Parameters
- h (number) hue
- s (number) saturation
- l (number) luminosity
= (string) hex representation of the colour.
\*/
R.hsl = cacher(function (h, s, l) { R.hsl = cacher(function (h, s, l) {
return R.hsl2rgb(h, s, l).hex; return R.hsl2rgb(h, s, l).hex;
}); });
/*\
* Raphael.rgb
[ method ]
**
* Converts RGB values to hex representation of the colour.
> Parameters
- r (number) red
- g (number) green
- b (number) blue
= (string) hex representation of the colour.
\*/
R.rgb = cacher(function (r, g, b) { R.rgb = cacher(function (r, g, b) {
return "#" + (16777216 | b | (g << 8) | (r << 16)).toString(16).slice(1); return "#" + (16777216 | b | (g << 8) | (r << 16)).toString(16).slice(1);
}); });
/*\
* Raphael.getColor
[ method ]
**
* On each call returns next colour in the spectrum. To reset it back to red call @Raphael.getColor.reset
> Parameters
- value (number) #optional brightness, default is `0.75`
= (string) hex representation of the colour.
\*/
R.getColor = function (value) { R.getColor = function (value) {
var start = this.getColor.start = this.getColor.start || {h: 0, s: 1, b: value || .75}, var start = this.getColor.start = this.getColor.start || {h: 0, s: 1, b: value || .75},
rgb = this.hsb2rgb(start.h, start.s, start.b); rgb = this.hsb2rgb(start.h, start.s, start.b);
...@@ -1267,27 +875,12 @@ ...@@ -1267,27 +875,12 @@
} }
return rgb.hex; return rgb.hex;
}; };
/*\
* Raphael.getColor.reset
[ method ]
**
* Resets spectrum position for @Raphael.getColor back to red.
\*/
R.getColor.reset = function () { R.getColor.reset = function () {
delete this.start; delete this.start;
}; };
/*\
* Raphael.parsePathString
[ method ]
**
* Utility method
**
* Parses given path string into an array of arrays of path segments.
> Parameters
- pathString (string|array) path string or array of segments (in the last case it will be returned straight away)
= (array) array of segments.
\*/
R.parsePathString = cacher(function (pathString) { R.parsePathString = cacher(function (pathString) {
if (!pathString) { if (!pathString) {
return null; return null;
...@@ -1320,17 +913,7 @@ ...@@ -1320,17 +913,7 @@
data.toString = R._path2string; data.toString = R._path2string;
return data; return data;
}); });
/*\
* Raphael.parseTransformString
[ method ]
**
* Utility method
**
* Parses given path string into an array of transformations.
> Parameters
- TString (string|array) transform string or array of transformations (in the last case it will be returned straight away)
= (array) array of transformations.
\*/
R.parseTransformString = cacher(function (TString) { R.parseTransformString = cacher(function (TString) {
if (!TString) { if (!TString) {
return null; return null;
...@@ -1353,58 +936,23 @@ ...@@ -1353,58 +936,23 @@
data.toString = R._path2string; data.toString = R._path2string;
return data; return data;
}); });
/*\
* Raphael.findDotsAtSegment
[ method ]
**
* Utility method
**
* Find dot coordinates on the given cubic bezier curve at the given t.
> Parameters
- p1x (number) x of the first point of the curve
- p1y (number) y of the first point of the curve
- c1x (number) x of the first anchor of the curve
- c1y (number) y of the first anchor of the curve
- c2x (number) x of the second anchor of the curve
- c2y (number) y of the second anchor of the curve
- p2x (number) x of the second point of the curve
- p2y (number) y of the second point of the curve
- t (number) position on the curve (0..1)
= (object) point information in format:
o {
o x: (number) x coordinate of the point
o y: (number) y coordinate of the point
o m: {
o x: (number) x coordinate of the left anchor
o y: (number) y coordinate of the left anchor
o }
o n: {
o x: (number) x coordinate of the right anchor
o y: (number) y coordinate of the right anchor
o }
o start: {
o x: (number) x coordinate of the start of the curve
o y: (number) y coordinate of the start of the curve
o }
o end: {
o x: (number) x coordinate of the end of the curve
o y: (number) y coordinate of the end of the curve
o }
o alpha: (number) angle of the curve derivative at the point
o }
\*/
R.findDotsAtSegment = function (p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t) { R.findDotsAtSegment = function (p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t) {
var t1 = 1 - t, var t1 = 1 - t,
x = pow(t1, 3) * p1x + pow(t1, 2) * 3 * t * c1x + t1 * 3 * t * t * c2x + pow(t, 3) * p2x, t13 = pow(t1, 3),
y = pow(t1, 3) * p1y + pow(t1, 2) * 3 * t * c1y + t1 * 3 * t * t * c2y + pow(t, 3) * p2y, t12 = pow(t1, 2),
mx = p1x + 2 * t * (c1x - p1x) + t * t * (c2x - 2 * c1x + p1x), t2 = t * t,
my = p1y + 2 * t * (c1y - p1y) + t * t * (c2y - 2 * c1y + p1y), t3 = t2 * t,
nx = c1x + 2 * t * (c2x - c1x) + t * t * (p2x - 2 * c2x + c1x), x = t13 * p1x + t12 * 3 * t * c1x + t1 * 3 * t * t * c2x + t3 * p2x,
ny = c1y + 2 * t * (c2y - c1y) + t * t * (p2y - 2 * c2y + c1y), y = t13 * p1y + t12 * 3 * t * c1y + t1 * 3 * t * t * c2y + t3 * p2y,
ax = (1 - t) * p1x + t * c1x, mx = p1x + 2 * t * (c1x - p1x) + t2 * (c2x - 2 * c1x + p1x),
ay = (1 - t) * p1y + t * c1y, my = p1y + 2 * t * (c1y - p1y) + t2 * (c2y - 2 * c1y + p1y),
cx = (1 - t) * c2x + t * p2x, nx = c1x + 2 * t * (c2x - c1x) + t2 * (p2x - 2 * c2x + c1x),
cy = (1 - t) * c2y + t * p2y, ny = c1y + 2 * t * (c2y - c1y) + t2 * (p2y - 2 * c2y + c1y),
ax = t1 * p1x + t * c1x,
ay = t1 * p1y + t * c1y,
cx = t1 * c2x + t * p2x,
cy = t1 * c2y + t * p2y,
alpha = (90 - math.atan2(mx - nx, my - ny) * 180 / PI); alpha = (90 - math.atan2(mx - nx, my - ny) * 180 / PI);
(mx > nx || my < ny) && (alpha += 180); (mx > nx || my < ny) && (alpha += 180);
return { return {
...@@ -1777,7 +1325,7 @@ ...@@ -1777,7 +1325,7 @@
max: {x: mmax[apply](0, x), y: mmax[apply](0, y)} max: {x: mmax[apply](0, x), y: mmax[apply](0, y)}
}; };
}), }),
path2curve = cacher(function (path, path2) { path2curve = R._path2curve = cacher(function (path, path2) {
var p = pathToAbsolute(path), var p = pathToAbsolute(path),
p2 = path2 && pathToAbsolute(path2), p2 = path2 && pathToAbsolute(path2),
attrs = {x: 0, y: 0, bx: 0, by: 0, X: 0, Y: 0, qx: null, qy: null}, attrs = {x: 0, y: 0, bx: 0, by: 0, X: 0, Y: 0, qx: null, qy: null},
...@@ -2095,47 +1643,12 @@ ...@@ -2095,47 +1643,12 @@
height: h height: h
}; };
}; };
/*\
* Raphael.pathToRelative
[ method ]
**
* Utility method
**
* Converts path to relative form
> Parameters
- pathString (string|array) path string or array of segments
= (array) array of segments.
\*/
R.pathToRelative = pathToRelative; R.pathToRelative = pathToRelative;
R._engine = {}; R._engine = {};
/*\
* Raphael.path2curve
[ method ]
**
* Utility method
**
* Converts path to a new path where all segments are cubic bezier curves.
> Parameters
- pathString (string|array) path string or array of segments
= (array) array of segments.
\*/
R.path2curve = path2curve; R.path2curve = path2curve;
/*\
* Raphael.matrix
[ method ]
**
* Utility method
**
* Returns matrix based on given parameters.
> Parameters
- a (number)
- b (number)
- c (number)
- d (number)
- e (number)
- f (number)
= (object) @Matrix
\*/
R.matrix = function (a, b, c, d, e, f) { R.matrix = function (a, b, c, d, e, f) {
return new Matrix(a, b, c, d, e, f); return new Matrix(a, b, c, d, e, f);
}; };
...@@ -2157,21 +1670,7 @@ ...@@ -2157,21 +1670,7 @@
} }
} }
(function (matrixproto) { (function (matrixproto) {
/*\
* Matrix.add
[ method ]
**
* Adds given matrix to existing one.
> Parameters
- a (number)
- b (number)
- c (number)
- d (number)
- e (number)
- f (number)
or
- matrix (object) @Matrix
\*/
matrixproto.add = function (a, b, c, d, e, f) { matrixproto.add = function (a, b, c, d, e, f) {
var out = [[], [], []], var out = [[], [], []],
m = [[this.a, this.c, this.e], [this.b, this.d, this.f], [0, 0, 1]], m = [[this.a, this.c, this.e], [this.b, this.d, this.f], [0, 0, 1]],
...@@ -2198,67 +1697,28 @@ ...@@ -2198,67 +1697,28 @@
this.e = out[0][2]; this.e = out[0][2];
this.f = out[1][2]; this.f = out[1][2];
}; };
/*\
* Matrix.invert
[ method ]
**
* Returns inverted version of the matrix
= (object) @Matrix
\*/
matrixproto.invert = function () { matrixproto.invert = function () {
var me = this, var me = this,
x = me.a * me.d - me.b * me.c; x = me.a * me.d - me.b * me.c;
return new Matrix(me.d / x, -me.b / x, -me.c / x, me.a / x, (me.c * me.f - me.d * me.e) / x, (me.b * me.e - me.a * me.f) / x); return new Matrix(me.d / x, -me.b / x, -me.c / x, me.a / x, (me.c * me.f - me.d * me.e) / x, (me.b * me.e - me.a * me.f) / x);
}; };
/*\
* Matrix.clone
[ method ]
**
* Returns copy of the matrix
= (object) @Matrix
\*/
matrixproto.clone = function () { matrixproto.clone = function () {
return new Matrix(this.a, this.b, this.c, this.d, this.e, this.f); return new Matrix(this.a, this.b, this.c, this.d, this.e, this.f);
}; };
/*\
* Matrix.translate
[ method ]
**
* Translate the matrix
> Parameters
- x (number)
- y (number)
\*/
matrixproto.translate = function (x, y) { matrixproto.translate = function (x, y) {
this.add(1, 0, 0, 1, x, y); this.add(1, 0, 0, 1, x, y);
}; };
/*\
* Matrix.scale
[ method ]
**
* Scales the matrix
> Parameters
- x (number)
- y (number) #optional
- cx (number) #optional
- cy (number) #optional
\*/
matrixproto.scale = function (x, y, cx, cy) { matrixproto.scale = function (x, y, cx, cy) {
y == null && (y = x); y == null && (y = x);
cx || cy && this.add(1, 0, 0, 1, cx, cy); cx || cy && this.add(1, 0, 0, 1, cx, cy);
this.add(x, 0, 0, y, 0, 0); this.add(x, 0, 0, y, 0, 0);
cx || cy && this.add(1, 0, 0, 1, -cx, -cy); cx || cy && this.add(1, 0, 0, 1, -cx, -cy);
}; };
/*\
* Matrix.rotate
[ method ]
**
* Rotates the matrix
> Parameters
- a (number)
- x (number)
- y (number)
\*/
matrixproto.rotate = function (a, x, y) { matrixproto.rotate = function (a, x, y) {
a = R.rad(a); a = R.rad(a);
x = x || 0; x = x || 0;
...@@ -2268,29 +1728,11 @@ ...@@ -2268,29 +1728,11 @@
this.add(cos, sin, -sin, cos, x, y); this.add(cos, sin, -sin, cos, x, y);
this.add(1, 0, 0, 1, -x, -y); this.add(1, 0, 0, 1, -x, -y);
}; };
/*\
* Matrix.x
[ method ]
**
* Return x coordinate for given point after transformation described by the matrix. See also @Matrix.y
> Parameters
- x (number)
- y (number)
= (number) x
\*/
matrixproto.x = function (x, y) { matrixproto.x = function (x, y) {
return x * this.a + y * this.c + this.e; return x * this.a + y * this.c + this.e;
}; };
/*\
* Matrix.y
[ method ]
**
* Return y coordinate for given point after transformation described by the matrix. See also @Matrix.x
> Parameters
- x (number)
- y (number)
= (number) y
\*/
matrixproto.y = function (x, y) { matrixproto.y = function (x, y) {
return x * this.b + y * this.d + this.f; return x * this.b + y * this.d + this.f;
}; };
...@@ -2318,20 +1760,7 @@ ...@@ -2318,20 +1760,7 @@
a[0] && (a[0] /= mag); a[0] && (a[0] /= mag);
a[1] && (a[1] /= mag); a[1] && (a[1] /= mag);
} }
/*\
* Matrix.split
[ method ]
**
* Splits matrix into primitive transformations
= (object) in format:
o dx (number) translation by x
o dy (number) translation by y
o scalex (number) scale by x
o scaley (number) scale by y
o shear (number) shear
o rotate (number) rotation in deg
o isSimple (boolean) could it be represented via simple transformations
\*/
matrixproto.split = function () { matrixproto.split = function () {
var out = {}; var out = {};
// translation // translation
...@@ -2367,13 +1796,7 @@ ...@@ -2367,13 +1796,7 @@
out.noRotation = !+out.shear.toFixed(9) && !out.rotate; out.noRotation = !+out.shear.toFixed(9) && !out.rotate;
return out; return out;
}; };
/*\
* Matrix.toTransformString
[ method ]
**
* Return transform string that represents given matrix
= (string) transform string
\*/
matrixproto.toTransformString = function () { matrixproto.toTransformString = function () {
var s = this.split(); var s = this.split();
if (s.isSimple) { if (s.isSimple) {
...@@ -2388,14 +1811,7 @@ ...@@ -2388,14 +1811,7 @@
var version = navigator.userAgent.match(/Version\/(.*?)\s/) || navigator.userAgent.match(/Chrome\/(\d+)/); var version = navigator.userAgent.match(/Version\/(.*?)\s/) || navigator.userAgent.match(/Chrome\/(\d+)/);
if ((navigator.vendor == "Apple Computer, Inc.") && (version && version[1] < 4 || navigator.platform.slice(0, 2) == "iP") || if ((navigator.vendor == "Apple Computer, Inc.") && (version && version[1] < 4 || navigator.platform.slice(0, 2) == "iP") ||
(navigator.vendor == "Google Inc." && version && version[1] < 8)) { (navigator.vendor == "Google Inc." && version && version[1] < 8)) {
/*\
* Paper.safari
[ method ]
**
* There is an inconvenient rendering bug in Safari (WebKit):
* sometimes the rendering should be forced.
* This method should help with dealing with this bug.
\*/
paperproto.safari = function () { paperproto.safari = function () {
var rect = this.rect(-99, -99, this.width + 99, this.height + 99).attr({stroke: "none"}); var rect = this.rect(-99, -99, this.width + 99, this.height + 99).attr({stroke: "none"});
setTimeout(function () {rect.remove();}); setTimeout(function () {rect.remove();});
...@@ -2519,21 +1935,40 @@ ...@@ -2519,21 +1935,40 @@
} }
drag = []; drag = [];
}, },
/*\
* Raphael.el
[ property (object) ]
**
* You can add your own method to elements. This is usefull when you want to hack default functionality or
* want to wrap some common transformation or attributes in one method. In difference to canvas methods,
* you can redefine element method at any time. Expending element methods wouldn’t affect set.
> Usage
| Raphael.el.red = function () {
| this.attr({fill: "#f00"});
| };
| // then use it
| paper.circle(100, 100, 20).red();
\*/
elproto = R.el = {}; elproto = R.el = {};
for (var i = events.length; i--;) { for (var i = events.length; i--;) {
(function (eventName) { (function (eventName) {
R[eventName] = elproto[eventName] = function (fn, scope) { R[eventName] = elproto[eventName] = function (fn, scope) {
...@@ -2557,29 +1992,7 @@ ...@@ -2557,29 +1992,7 @@
})(events[i]); })(events[i]);
} }
/*\
* Element.data
[ method ]
**
* Adds or retrieves given value asociated with given key.
**
* See also @Element.removeData
> Parameters
- key (string) key to store data
- value (any) #optional value to store
= (object) @Element
* or, if value is not specified:
= (any) value
> Usage
| for (var i = 0, i < 5, i++) {
| paper.circle(10 + 15 * i, 10, 10)
| .attr({fill: "#000"})
| .data("i", i)
| .click(function () {
| alert(this.data("i"));
| });
| }
\*/
elproto.data = function (key, value) { elproto.data = function (key, value) {
var data = eldata[this.id] = eldata[this.id] || {}; var data = eldata[this.id] = eldata[this.id] || {};
if (arguments.length == 1) { if (arguments.length == 1) {
...@@ -2596,16 +2009,7 @@ ...@@ -2596,16 +2009,7 @@
eve("data.set." + this.id, this, value, key); eve("data.set." + this.id, this, value, key);
return this; return this;
}; };
/*\
* Element.removeData
[ method ]
**
* Removes value associated with an element by given key.
* If key is not provided, removes all the data of the element.
> Parameters
- key (string) #optional key
= (object) @Element
\*/
elproto.removeData = function (key) { elproto.removeData = function (key) {
if (key == null) { if (key == null) {
eldata[this.id] = {}; eldata[this.id] = {};
...@@ -2614,64 +2018,15 @@ ...@@ -2614,64 +2018,15 @@
} }
return this; return this;
}; };
/*\
* Element.hover
[ method ]
**
* Adds event handlers for hover for the element.
> Parameters
- f_in (function) handler for hover in
- f_out (function) handler for hover out
- icontext (object) #optional context for hover in handler
- ocontext (object) #optional context for hover out handler
= (object) @Element
\*/
elproto.hover = function (f_in, f_out, scope_in, scope_out) { elproto.hover = function (f_in, f_out, scope_in, scope_out) {
return this.mouseover(f_in, scope_in).mouseout(f_out, scope_out || scope_in); return this.mouseover(f_in, scope_in).mouseout(f_out, scope_out || scope_in);
}; };
/*\
* Element.unhover
[ method ]
**
* Removes event handlers for hover for the element.
> Parameters
- f_in (function) handler for hover in
- f_out (function) handler for hover out
= (object) @Element
\*/
elproto.unhover = function (f_in, f_out) { elproto.unhover = function (f_in, f_out) {
return this.unmouseover(f_in).unmouseout(f_out); return this.unmouseover(f_in).unmouseout(f_out);
}; };
/*\
* Element.drag
[ method ]
**
* Adds event handlers for drag of the element.
> Parameters
- onmove (function) handler for moving
- onstart (function) handler for drag start
- onend (function) handler for drag end
- mcontext (object) #optional context for moving handler
- scontext (object) #optional context for drag start handler
- econtext (object) #optional context for drag end handler
* Additionaly following `drag` events will be triggered: `drag.start.<id>` on start,
* `drag.end.<id>` on end and `drag.move.<id>` on every move. When element will be dragged over another element
* `drag.over.<id>` will be fired as well.
*
* Start event and start handler will be called in specified context or in context of the element with following parameters:
o x (number) x position of the mouse
o y (number) y position of the mouse
o event (object) DOM event object
* Move event and move handler will be called in specified context or in context of the element with following parameters:
o dx (number) shift by x from the start point
o dy (number) shift by y from the start point
o x (number) x position of the mouse
o y (number) y position of the mouse
o event (object) DOM event object
* End event and end handler will be called in specified context or in context of the element with following parameters:
o event (object) DOM event object
= (object) @Element
\*/
elproto.drag = function (onmove, onstart, onend, move_scope, start_scope, end_scope) { elproto.drag = function (onmove, onstart, onend, move_scope, start_scope, end_scope) {
function start(e) { function start(e) {
(e.originalEvent || e).preventDefault(); (e.originalEvent || e).preventDefault();
...@@ -2691,23 +2046,11 @@ ...@@ -2691,23 +2046,11 @@
this.mousedown(start); this.mousedown(start);
return this; return this;
}; };
/*\
* Element.onDragOver
[ method ]
**
* Shortcut for assigning event handler for `drag.over.<id>` event, where id is id of the element (see @Element.id).
> Parameters
- f (function) handler for event
\*/
elproto.onDragOver = function (f) { elproto.onDragOver = function (f) {
f ? eve.on("drag.over." + this.id, f) : eve.unbind("drag.over." + this.id); f ? eve.on("drag.over." + this.id, f) : eve.unbind("drag.over." + this.id);
}; };
/*\
* Element.undrag
[ method ]
**
* Removes all drag event handlers from given element.
\*/
elproto.undrag = function () { elproto.undrag = function () {
var i = drag.length; var i = drag.length;
while (i--) if (drag[i].el == this) { while (i--) if (drag[i].el == this) {
...@@ -2717,250 +2060,72 @@ ...@@ -2717,250 +2060,72 @@
} }
!drag.length && R.unmousemove(dragMove).unmouseup(dragUp); !drag.length && R.unmousemove(dragMove).unmouseup(dragUp);
}; };
/*\
* Paper.circle
[ method ]
**
* Draws a circle.
**
> Parameters
**
- x (number) x coordinate of the centre
- y (number) y coordinate of the centre
- r (number) radius
= (object) Raphaël element object with type “circle”
**
> Usage
| var c = paper.circle(50, 50, 40);
\*/
paperproto.circle = function (x, y, r) { paperproto.circle = function (x, y, r) {
var out = R._engine.circle(this, x || 0, y || 0, r || 0); var out = R._engine.circle(this, x || 0, y || 0, r || 0);
this.__set__ && this.__set__.push(out); this.__set__ && this.__set__.push(out);
return out; return out;
}; };
/*\
* Paper.rect
[ method ]
*
* Draws a rectangle.
**
> Parameters
**
- x (number) x coordinate of the top left corner
- y (number) y coordinate of the top left corner
- width (number) width
- height (number) height
- r (number) #optional radius for rounded corners, default is 0
= (object) Raphaël element object with type “rect”
**
> Usage
| // regular rectangle
| var c = paper.rect(10, 10, 50, 50);
| // rectangle with rounded corners
| var c = paper.rect(40, 40, 50, 50, 10);
\*/
paperproto.rect = function (x, y, w, h, r) { paperproto.rect = function (x, y, w, h, r) {
var out = R._engine.rect(this, x || 0, y || 0, w || 0, h || 0, r || 0); var out = R._engine.rect(this, x || 0, y || 0, w || 0, h || 0, r || 0);
this.__set__ && this.__set__.push(out); this.__set__ && this.__set__.push(out);
return out; return out;
}; };
/*\
* Paper.ellipse
[ method ]
**
* Draws an ellipse.
**
> Parameters
**
- x (number) x coordinate of the centre
- y (number) y coordinate of the centre
- rx (number) horizontal radius
- ry (number) vertical radius
= (object) Raphaël element object with type “ellipse”
**
> Usage
| var c = paper.ellipse(50, 50, 40, 20);
\*/
paperproto.ellipse = function (x, y, rx, ry) { paperproto.ellipse = function (x, y, rx, ry) {
var out = R._engine.ellipse(this, x || 0, y || 0, rx || 0, ry || 0); var out = R._engine.ellipse(this, x || 0, y || 0, rx || 0, ry || 0);
this.__set__ && this.__set__.push(out); this.__set__ && this.__set__.push(out);
return out; return out;
}; };
/*\
* Paper.path
[ method ]
**
* Creates a path element by given path data string.
**
> Parameters
**
- pathString (string) path data in SVG path string format.
= (object) Raphaël element object with type “path”
# Details of a path's data attribute's format are described in the <a href="http://www.w3.org/TR/SVG/paths.html#PathData">SVG specification</a>.
**
> Usage
| var c = paper.path("M10 10L90 90");
| // draw a diagonal line:
| // move to 10,10, line to 90,90
\*/
paperproto.path = function (pathString) { paperproto.path = function (pathString) {
pathString && !R.is(pathString, string) && !R.is(pathString[0], array) && (pathString += E); pathString && !R.is(pathString, string) && !R.is(pathString[0], array) && (pathString += E);
var out = R._engine.path(R.format[apply](R, arguments), this); var out = R._engine.path(R.format[apply](R, arguments), this);
this.__set__ && this.__set__.push(out); this.__set__ && this.__set__.push(out);
return out; return out;
}; };
/*\
* Paper.image
[ method ]
**
* Embeds an image into the surface.
**
> Parameters
**
- src (string) URI of the source image
- x (number) x coordinate position
- y (number) y coordinate position
- width (number) width of the image
- height (number) height of the image
= (object) Raphaël element object with type “image”
**
> Usage
| var c = paper.image("apple.png", 10, 10, 80, 80);
\*/
paperproto.image = function (src, x, y, w, h) { paperproto.image = function (src, x, y, w, h) {
var out = R._engine.image(this, src || "about:blank", x || 0, y || 0, w || 0, h || 0); var out = R._engine.image(this, src || "about:blank", x || 0, y || 0, w || 0, h || 0);
this.__set__ && this.__set__.push(out); this.__set__ && this.__set__.push(out);
return out; return out;
}; };
/*\
* Paper.text
[ method ]
**
* Draws a text string. If you need line breaks, put “\n” in the string.
**
> Parameters
**
- x (number) x coordinate position
- y (number) y coordinate position
- text (string) The text string to draw
= (object) Raphaël element object with type “text”
**
> Usage
| var t = paper.text(50, 50, "Raphaël\nkicks\nbutt!");
\*/
paperproto.text = function (x, y, text) { paperproto.text = function (x, y, text) {
var out = R._engine.text(this, x || 0, y || 0, Str(text)); var out = R._engine.text(this, x || 0, y || 0, Str(text));
this.__set__ && this.__set__.push(out); this.__set__ && this.__set__.push(out);
return out; return out;
}; };
/*\
* Paper.set
[ method ]
**
* Creates array-like object to keep and operate several elements at once.
* Warning: it doesn’t create any elements for itself in the page, it just groups existing elements.
* Sets act as pseudo elements — all methods available to an element can be used on a set.
= (object) array-like object that represents set of elements
**
> Usage
| var st = paper.set();
| st.push(
| paper.circle(10, 10, 5),
| paper.circle(30, 10, 5)
| );
| st.attr({fill: "red"}); // changes the fill of both circles
\*/
paperproto.set = function (itemsArray) { paperproto.set = function (itemsArray) {
!R.is(itemsArray, "array") && (itemsArray = Array.prototype.splice.call(arguments, 0, arguments.length)); !R.is(itemsArray, "array") && (itemsArray = Array.prototype.splice.call(arguments, 0, arguments.length));
var out = new Set(itemsArray); var out = new Set(itemsArray);
this.__set__ && this.__set__.push(out); this.__set__ && this.__set__.push(out);
return out; return out;
}; };
/*\
* Paper.setStart
[ method ]
**
* Creates @Paper.set. All elements that will be created after calling this method and before calling
* @Paper.setFinish will be added to the set.
**
> Usage
| paper.setStart();
| paper.circle(10, 10, 5),
| paper.circle(30, 10, 5)
| var st = paper.setFinish();
| st.attr({fill: "red"}); // changes the fill of both circles
\*/
paperproto.setStart = function (set) { paperproto.setStart = function (set) {
this.__set__ = set || this.set(); this.__set__ = set || this.set();
}; };
/*\
* Paper.setFinish
[ method ]
**
* See @Paper.setStart. This method finishes catching and returns resulting set.
**
= (object) set
\*/
paperproto.setFinish = function (set) { paperproto.setFinish = function (set) {
var out = this.__set__; var out = this.__set__;
delete this.__set__; delete this.__set__;
return out; return out;
}; };
/*\
* Paper.setSize paperproto.setSize = function (width, height) {
[ method ] return R._engine.setSize.call(this, width, height);
** };
* If you need to change dimensions of the canvas call this method
** paperproto.setViewBox = function (x, y, w, h, fit) {
> Parameters return R._engine.setViewBox.call(this, x, y, w, h, fit);
** };
- width (number) new width of the canvas
- height (number) new height of the canvas
> Usage
| var st = paper.set();
| st.push(
| paper.circle(10, 10, 5),
| paper.circle(30, 10, 5)
| );
| st.attr({fill: "red"});
\*/
paperproto.setSize = R._engine.setSize;
/*\
* Paper.setViewBox
[ method ]
**
* Sets the view box of the paper. Practically it gives you ability to zoom and pan whole paper surface by
* specifying new boundaries.
**
> Parameters
**
x, y, w, h, fit
- x (number) new x position, default is `0`
- y (number) new y position, default is `0`
- w (number) new width of the canvas
- h (number) new height of the canvas
- fit (boolean) `true` if you want graphics to fit into new boundary box
\*/
paperproto.setViewBox = R._engine.setViewBox;
/*\
* Paper.top
[ property ]
**
* Points to the topmost element on the paper
\*/
/*\
* Paper.bottom
[ property ]
**
* Points to the bottom element on the paper
\*/
paperproto.top = paperproto.bottom = null; paperproto.top = paperproto.bottom = null;
/*\
* Paper.raphael
[ property ]
**
* Points to the @Raphael object/function
\*/
paperproto.raphael = R; paperproto.raphael = R;
var getOffset = function (elem) { var getOffset = function (elem) {
var box = elem.getBoundingClientRect(), var box = elem.getBoundingClientRect(),
...@@ -2975,20 +2140,7 @@ ...@@ -2975,20 +2140,7 @@
x: left x: left
}; };
}; };
/*\
* Paper.getElementByPoint
[ method ]
**
* Returns you topmost element under given point.
**
= (object) Raphaël element object
> Parameters
**
- x (number) x coordinate from the top left corner of the window
- y (number) y coordinate from the top left corner of the window
> Usage
| paper.getElementByPoint(mouseX, mouseY).attr({stroke: "#f00"});
\*/
paperproto.getElementByPoint = function (x, y) { paperproto.getElementByPoint = function (x, y) {
var paper = this, var paper = this,
svg = paper.canvas, svg = paper.canvas,
...@@ -3014,17 +2166,7 @@ ...@@ -3014,17 +2166,7 @@
target = target && target.raphael ? paper.getById(target.raphaelid) : null; target = target && target.raphael ? paper.getById(target.raphaelid) : null;
return target; return target;
}; };
/*\
* Paper.getById
[ method ]
**
* Returns you element by its internal ID.
**
> Parameters
**
- id (number) id
= (object) Raphaël element object
\*/
paperproto.getById = function (id) { paperproto.getById = function (id) {
var bot = this.bottom; var bot = this.bottom;
while (bot) { while (bot) {
...@@ -3035,20 +2177,7 @@ ...@@ -3035,20 +2177,7 @@
} }
return null; return null;
}; };
/*\
* Paper.forEach
[ method ]
**
* Executes given function for each element on the paper
*
* If callback function returns `false` it will stop loop running.
**
> Parameters
**
- callback (function) function to run
- thisArg (object) context object for the callback
= (object) Paper object
\*/
paperproto.forEach = function (callback, thisArg) { paperproto.forEach = function (callback, thisArg) {
var bot = this.bottom; var bot = this.bottom;
while (bot) { while (bot) {
...@@ -3065,23 +2194,7 @@ ...@@ -3065,23 +2194,7 @@
function x_y_w_h() { function x_y_w_h() {
return this.x + S + this.y + S + this.width + " \xd7 " + this.height; return this.x + S + this.y + S + this.width + " \xd7 " + this.height;
} }
/*\
* Element.getBBox
[ method ]
**
* Return bounding box for a given element
**
> Parameters
**
- isWithoutTransform (boolean) flag, `true` if you want to have bounding box before transformations. Default is `false`.
= (object) Bounding box object:
o {
o x: (number) top left corner x
o y: (number) top left corner y
o width: (number) width
o height: (number) height
o }
\*/
elproto.getBBox = function (isWithoutTransform) { elproto.getBBox = function (isWithoutTransform) {
if (this.removed) { if (this.removed) {
return {}; return {};
...@@ -3107,40 +2220,14 @@ ...@@ -3107,40 +2220,14 @@
} }
return _.bbox; return _.bbox;
}; };
/*\
* Element.clone
[ method ]
**
= (object) clone of a given element
**
\*/
elproto.clone = function () { elproto.clone = function () {
if (this.removed) { if (this.removed) {
return null; return null;
} }
return this.paper[this.type]().attr(this.attr()); return this.paper[this.type]().attr(this.attr());
}; };
/*\
* Element.glow
[ method ]
**
* Return set of elements that create glow-like effect around given element. See @Paper.set.
*
* Note: Glow is not connected to the element. If you change element attributes it won’t adjust itself.
**
> Parameters
**
- glow (object) #optional parameters object with all properties optional:
o {
o width (number) size of the glow, default is `10`
o fill (boolean) will it be filled, default is `false`
o opacity (number) opacity, default is `0.5`
o offsetx (number) horizontal offset, default is `0`
o offsety (number) vertical offset, default is `0`
o color (string) glow colour, default is `black`
o }
= (object) @Paper.set of elements that represents glow
\*/
elproto.glow = function (glow) { elproto.glow = function (glow) {
if (this.type == "text") { if (this.type == "text") {
return null; return null;
...@@ -3248,52 +2335,11 @@ ...@@ -3248,52 +2335,11 @@
var getTotalLength = getLengthFactory(1), var getTotalLength = getLengthFactory(1),
getPointAtLength = getLengthFactory(), getPointAtLength = getLengthFactory(),
getSubpathsAtLength = getLengthFactory(0, 1); getSubpathsAtLength = getLengthFactory(0, 1);
/*\
* Raphael.getTotalLength
[ method ]
**
* Returns length of the given path in pixels.
**
> Parameters
**
- path (string) SVG path string.
**
= (number) length.
\*/
R.getTotalLength = getTotalLength; R.getTotalLength = getTotalLength;
/*\
* Raphael.getPointAtLength
[ method ]
**
* Return coordinates of the point located at the given length on the given path.
**
> Parameters
**
- path (string) SVG path string
- length (number)
**
= (object) representation of the point:
o {
o x: (number) x coordinate
o y: (number) y coordinate
o alpha: (number) angle of derivative
o }
\*/
R.getPointAtLength = getPointAtLength; R.getPointAtLength = getPointAtLength;
/*\
* Raphael.getSubpath
[ method ]
**
* Return subpath of a given path from given length to given length.
**
> Parameters
**
- path (string) SVG path string
- from (number) position of the start of the segment
- to (number) position of the end of the segment
**
= (string) pathstring for the segment
\*/
R.getSubpath = function (path, from, to) { R.getSubpath = function (path, from, to) {
if (abs(this.getTotalLength(path) - to) < 1e-6) { if (abs(this.getTotalLength(path) - to) < 1e-6) {
return getSubpathsAtLength(path, from).end; return getSubpathsAtLength(path, from).end;
...@@ -3301,13 +2347,7 @@ ...@@ -3301,13 +2347,7 @@
var a = getSubpathsAtLength(path, to, 1); var a = getSubpathsAtLength(path, to, 1);
return from ? getSubpathsAtLength(a, from).end : a; return from ? getSubpathsAtLength(a, from).end : a;
}; };
/*\
* Element.getTotalLength
[ method ]
**
* Returns length of the path in pixels. Only works for element of “path” type.
= (number) length.
\*/
elproto.getTotalLength = function () { elproto.getTotalLength = function () {
if (this.type != "path") {return;} if (this.type != "path") {return;}
if (this.node.getTotalLength) { if (this.node.getTotalLength) {
...@@ -3315,61 +2355,17 @@ ...@@ -3315,61 +2355,17 @@
} }
return getTotalLength(this.attrs.path); return getTotalLength(this.attrs.path);
}; };
/*\
* Element.getPointAtLength
[ method ]
**
* Return coordinates of the point located at the given length on the given path. Only works for element of “path” type.
**
> Parameters
**
- length (number)
**
= (object) representation of the point:
o {
o x: (number) x coordinate
o y: (number) y coordinate
o alpha: (number) angle of derivative
o }
\*/
elproto.getPointAtLength = function (length) { elproto.getPointAtLength = function (length) {
if (this.type != "path") {return;} if (this.type != "path") {return;}
return getPointAtLength(this.attrs.path, length); return getPointAtLength(this.attrs.path, length);
}; };
/*\
* Element.getSubpath
[ method ]
**
* Return subpath of a given element from given length to given length. Only works for element of “path” type.
**
> Parameters
**
- from (number) position of the start of the segment
- to (number) position of the end of the segment
**
= (string) pathstring for the segment
\*/
elproto.getSubpath = function (from, to) { elproto.getSubpath = function (from, to) {
if (this.type != "path") {return;} if (this.type != "path") {return;}
return R.getSubpath(this.attrs.path, from, to); return R.getSubpath(this.attrs.path, from, to);
}; };
/*\
* Raphael.easing_formulas
[ property ]
**
* Object that contains easing formulas for animation. You could extend it with your own. By default it has following list of easing:
# <ul>
# <li>“linear”</li>
# <li>“&lt;” or “easeIn” or “ease-in”</li>
# <li>“>” or “easeOut” or “ease-out”</li>
# <li>“&lt;>” or “easeInOut” or “ease-in-out”</li>
# <li>“backIn” or “back-in”</li>
# <li>“backOut” or “back-out”</li>
# <li>“elastic”</li>
# <li>“bounce”</li>
# </ul>
# <p>See also <a href="http://raphaeljs.com/easing.html">Easing demo</a>.</p>
\*/
var ef = R.easing_formulas = { var ef = R.easing_formulas = {
linear: function (n) { linear: function (n) {
return n; return n;
...@@ -3564,23 +2560,7 @@ ...@@ -3564,23 +2560,7 @@
upto255 = function (color) { upto255 = function (color) {
return color > 255 ? 255 : color < 0 ? 0 : color; return color > 255 ? 255 : color < 0 ? 0 : color;
}; };
/*\
* Element.animateWith
[ method ]
**
* Acts similar to @Element.animate, but ensure that given animation runs in sync with another given element.
**
> Parameters
**
- params (object) final attributes for the element, see also @Element.attr
- ms (number) number of milliseconds for animation to run
- easing (string) #optional easing type. Accept on of @Raphael.easing_formulas or CSS format: `cubic&#x2010;bezier(XX,&#160;XX,&#160;XX,&#160;XX)`
- callback (function) #optional callback function. Will be called at the end of animation.
* or
- animation (object) animation object, see @Raphael.animation
**
= (object) original element
\*/
elproto.animateWith = function (element, params, ms, easing, callback) { elproto.animateWith = function (element, params, ms, easing, callback) {
this.animate(params, ms, easing, callback); this.animate(params, ms, easing, callback);
var start, el; var start, el;
...@@ -3664,36 +2644,14 @@ ...@@ -3664,36 +2644,14 @@
this.top = percents[percents.length - 1]; this.top = percents[percents.length - 1];
this.percents = percents; this.percents = percents;
} }
/*\
* Animation.delay
[ method ]
**
* Creates a copy of existing animation object with given delay.
**
> Parameters
**
- delay (number) number of ms to pass between animation start and actual animation
**
= (object) new altered Animation object
\*/
Animation.prototype.delay = function (delay) { Animation.prototype.delay = function (delay) {
var a = new Animation(this.anim, this.ms); var a = new Animation(this.anim, this.ms);
a.times = this.times; a.times = this.times;
a.del = +delay || 0; a.del = +delay || 0;
return a; return a;
}; };
/*\
* Animation.repeat
[ method ]
**
* Creates a copy of existing animation object with given repetition.
**
> Parameters
**
- repeat (number) number iterations of animation. For infinite animation pass `Infinity`
**
= (object) new altered Animation object
\*/
Animation.prototype.repeat = function (times) { Animation.prototype.repeat = function (times) {
var a = new Animation(this.anim, this.ms); var a = new Animation(this.anim, this.ms);
a.del = this.del; a.del = this.del;
...@@ -3903,22 +2861,7 @@ ...@@ -3903,22 +2861,7 @@
} }
eve("anim.start." + element.id, element, anim); eve("anim.start." + element.id, element, anim);
} }
/*\
* Raphael.animation
[ method ]
**
* Creates an animation object that can be passed to the @Element.animate or @Element.animateWith methods.
* See also @Animation.delay and @Animation.repeat methods.
**
> Parameters
**
- params (object) final attributes for the element, see also @Element.attr
- ms (number) number of milliseconds for animation to run
- easing (string) #optional easing type. Accept one of @Raphael.easing_formulas or CSS format: `cubic&#x2010;bezier(XX,&#160;XX,&#160;XX,&#160;XX)`
- callback (function) #optional callback function. Will be called at the end of animation.
**
= (object) @Animation
\*/
R.animation = function (params, ms, easing, callback) { R.animation = function (params, ms, easing, callback) {
if (R.is(easing, "function") || !easing) { if (R.is(easing, "function") || !easing) {
callback = callback || easing || null; callback = callback || easing || null;
...@@ -3941,23 +2884,7 @@ ...@@ -3941,23 +2884,7 @@
return new Animation({100: p}, ms); return new Animation({100: p}, ms);
} }
}; };
/*\
* Element.animate
[ method ]
**
* Creates and starts animation for given element.
**
> Parameters
**
- params (object) final attributes for the element, see also @Element.attr
- ms (number) number of milliseconds for animation to run
- easing (string) #optional easing type. Accept one of @Raphael.easing_formulas or CSS format: `cubic&#x2010;bezier(XX,&#160;XX,&#160;XX,&#160;XX)`
- callback (function) #optional callback function. Will be called at the end of animation.
* or
- animation (object) animation object, see @Raphael.animation
**
= (object) original element
\*/
elproto.animate = function (params, ms, easing, callback) { elproto.animate = function (params, ms, easing, callback) {
var element = this; var element = this;
if (element.removed) { if (element.removed) {
...@@ -3968,49 +2895,14 @@ ...@@ -3968,49 +2895,14 @@
runAnimation(anim, element, anim.percents[0], null, element.attr()); runAnimation(anim, element, anim.percents[0], null, element.attr());
return element; return element;
}; };
/*\
* Element.setTime
[ method ]
**
* Sets the status of animation of the element in milliseconds. Similar to @Element.status method.
**
> Parameters
**
- anim (object) animation object
- value (number) number of milliseconds from the beginning of the animation
**
= (object) original element if `value` is specified
* Note, that during animation following events are triggered:
*
* On each animation frame event `anim.frame.<id>`, on start `anim.start.<id>` and on end `anim.finish.<id>`.
\*/
elproto.setTime = function (anim, value) { elproto.setTime = function (anim, value) {
if (anim && value != null) { if (anim && value != null) {
this.status(anim, mmin(value, anim.ms) / anim.ms); this.status(anim, mmin(value, anim.ms) / anim.ms);
} }
return this; return this;
}; };
/*\
* Element.status
[ method ]
**
* Gets or sets the status of animation of the element.
**
> Parameters
**
- anim (object) #optional animation object
- value (number) #optional 0 – 1. If specified, method works like a setter and sets the status of a given animation to the value. This will cause animation to jump to the given position.
**
= (number) status
* or
= (array) status if `anim` is not specified. Array of objects in format:
o {
o anim: (object) animation object
o status: (number) status
o }
* or
= (object) original element if `value` is specified
\*/
elproto.status = function (anim, value) { elproto.status = function (anim, value) {
var out = [], var out = [],
i = 0, i = 0,
...@@ -4036,18 +2928,7 @@ ...@@ -4036,18 +2928,7 @@
return out; return out;
} }
}; };
/*\
* Element.pause
[ method ]
**
* Stops animation of the element with ability to resume it later on.
**
> Parameters
**
- anim (object) #optional animation object
**
= (object) original element
\*/
elproto.pause = function (anim) { elproto.pause = function (anim) {
for (var i = 0; i < animationElements.length; i++) if (animationElements[i].el.id == this.id && (!anim || animationElements[i].anim == anim)) { for (var i = 0; i < animationElements.length; i++) if (animationElements[i].el.id == this.id && (!anim || animationElements[i].anim == anim)) {
if (eve("anim.pause." + this.id, this, animationElements[i].anim) !== false) { if (eve("anim.pause." + this.id, this, animationElements[i].anim) !== false) {
...@@ -4056,18 +2937,7 @@ ...@@ -4056,18 +2937,7 @@
} }
return this; return this;
}; };
/*\
* Element.resume
[ method ]
**
* Resumes animation if it was paused with @Element.pause method.
**
> Parameters
**
- anim (object) #optional animation object
**
= (object) original element
\*/
elproto.resume = function (anim) { elproto.resume = function (anim) {
for (var i = 0; i < animationElements.length; i++) if (animationElements[i].el.id == this.id && (!anim || animationElements[i].anim == anim)) { for (var i = 0; i < animationElements.length; i++) if (animationElements[i].el.id == this.id && (!anim || animationElements[i].anim == anim)) {
var e = animationElements[i]; var e = animationElements[i];
...@@ -4078,18 +2948,7 @@ ...@@ -4078,18 +2948,7 @@
} }
return this; return this;
}; };
/*\
* Element.stop
[ method ]
**
* Stops animation of the element.
**
> Parameters
**
- anim (object) #optional animation object
**
= (object) original element
\*/
elproto.stop = function (anim) { elproto.stop = function (anim) {
for (var i = 0; i < animationElements.length; i++) if (animationElements[i].el.id == this.id && (!anim || animationElements[i].anim == anim)) { for (var i = 0; i < animationElements.length; i++) if (animationElements[i].el.id == this.id && (!anim || animationElements[i].anim == anim)) {
if (eve("anim.stop." + this.id, this, animationElements[i].anim) !== false) { if (eve("anim.stop." + this.id, this, animationElements[i].anim) !== false) {
...@@ -4117,13 +2976,7 @@ ...@@ -4117,13 +2976,7 @@
} }
}, },
setproto = Set.prototype; setproto = Set.prototype;
/*\
* Set.push
[ method ]
**
* Adds each argument to the current set.
= (object) original element
\*/
setproto.push = function () { setproto.push = function () {
var item, var item,
len; len;
...@@ -4137,31 +2990,12 @@ ...@@ -4137,31 +2990,12 @@
} }
return this; return this;
}; };
/*\
* Set.pop
[ method ]
**
* Removes last element and returns it.
= (object) element
\*/
setproto.pop = function () { setproto.pop = function () {
this.length && delete this[this.length--]; this.length && delete this[this.length--];
return this.items.pop(); return this.items.pop();
}; };
/*\
* Set.forEach
[ method ]
**
* Executes given function for each element in the set.
*
* If function returns `false` it will stop loop running.
**
> Parameters
**
- callback (function) function to run
- thisArg (object) context object for the callback
= (object) Set object
\*/
setproto.forEach = function (callback, thisArg) { setproto.forEach = function (callback, thisArg) {
for (var i = 0, ii = this.items.length; i < ii; i++) { for (var i = 0, ii = this.items.length; i < ii; i++) {
if (callback.call(thisArg, this.items[i]) === false) { if (callback.call(thisArg, this.items[i]) === false) {
...@@ -4353,25 +3187,7 @@ ...@@ -4353,25 +3187,7 @@
return out; return out;
}; };
/*\
* Raphael.format
[ method ]
**
* Simple format function. Replaces construction of type “`{<number>}`” to the corresponding argument.
**
> Parameters
**
- token (string) string to format
- … (string) rest of arguments will be treated as parameters for replacement
= (string) formated string
> Usage
| var x = 10,
| y = 20,
| width = 40,
| height = 50;
| // this will draw a rectangular shape equivalent to "M10,20h40v50h-40z"
| paper.path(Raphael.format("M{1},{2}h{3}v{4}h{5}z", x, y, width, height, -width));
\*/
R.format = function (token, params) { R.format = function (token, params) {
var args = R.is(params, array) ? [0][concat](params) : arguments; var args = R.is(params, array) ? [0][concat](params) : arguments;
token && R.is(token, string) && args.length - 1 && (token = token.replace(formatrg, function (str, i) { token && R.is(token, string) && args.length - 1 && (token = token.replace(formatrg, function (str, i) {
...@@ -4379,29 +3195,7 @@ ...@@ -4379,29 +3195,7 @@
})); }));
return token || E; return token || E;
}; };
/*\
* Raphael.fullfill
[ method ]
**
* A little bit more advanced format function than @Raphael.format. Replaces construction of type “`{<name>}`” to the corresponding argument.
**
> Parameters
**
- token (string) string to format
- json (object) object which properties will be used as a replacement
= (string) formated string
> Usage
| // this will draw a rectangular shape equivalent to "M10,20h40v50h-40z"
| paper.path(Raphael.format("M{x},{y}h{dim.width}v{dim.height}h{dim['negative width']}z", {
| x: 10,
| y: 20,
| dim: {
| width: 40,
| height: 50,
| "negative width": -40
| }
| }));
\*/
R.fullfill = (function () { R.fullfill = (function () {
var tokenRegex = /\{([^\}]+)\}/g, var tokenRegex = /\{([^\}]+)\}/g,
objNotationRegex = /(?:(?:^|\.)(.+?)(?=\[|\.|$|\()|\[('|")(.+?)\2\])(\(\))?/g, // matches .xxxxx or ["xxxxx"] to run over object properties objNotationRegex = /(?:(?:^|\.)(.+?)(?=\[|\.|$|\()|\[('|")(.+?)\2\])(\(\))?/g, // matches .xxxxx or ["xxxxx"] to run over object properties
...@@ -4425,44 +3219,12 @@ ...@@ -4425,44 +3219,12 @@
}); });
}; };
})(); })();
/*\
* Raphael.ninja
[ method ]
**
* If you want to leave no trace of Raphaël (Well, Raphaël creates only one global variable `Raphael`, but anyway.) You can use `ninja` method.
* Beware, that in this case plugins could stop working, because they are depending on global variable existance.
**
= (object) Raphael object
> Usage
| (function (local_raphael) {
| var paper = local_raphael(10, 10, 320, 200);
| …
| })(Raphael.ninja());
\*/
R.ninja = function () { R.ninja = function () {
oldRaphael.was ? (g.win.Raphael = oldRaphael.is) : delete Raphael; oldRaphael.was ? (g.win.Raphael = oldRaphael.is) : delete Raphael;
return R; return R;
}; };
/*\
* Raphael.st
[ property (object) ]
**
* You can add your own method to elements and sets. It is wise to add a set method for each element method
* you added, so you will be able to call the same method on sets too.
**
* See also @Raphael.el.
> Usage
| Raphael.el.red = function () {
| this.attr({fill: "#f00"});
| };
| Raphael.st.red = function () {
| this.forEach(function () {
| this.red();
| });
| };
| // then use it
| paper.set(paper.circle(100, 100, 20), paper.circle(110, 100, 20)).red();
\*/
R.st = setproto; R.st = setproto;
// Firefox <3.6 fix: http://webreflection.blogspot.com/2009/11/195-chars-to-help-lazy-loading.html // Firefox <3.6 fix: http://webreflection.blogspot.com/2009/11/195-chars-to-help-lazy-loading.html
(function (doc, loaded, f) { (function (doc, loaded, f) {
...@@ -4506,7 +3268,8 @@ window.Raphael.svg && function (R) { ...@@ -4506,7 +3268,8 @@ window.Raphael.svg && function (R) {
pow = math.pow, pow = math.pow,
separator = /[, ]+/, separator = /[, ]+/,
eve = R.eve, eve = R.eve,
E = ""; E = "",
S = " ";
// SVG // SVG
var xlink = "http://www.w3.org/1999/xlink", var xlink = "http://www.w3.org/1999/xlink",
markers = { markers = {
...@@ -4773,36 +3536,38 @@ window.Raphael.svg && function (R) { ...@@ -4773,36 +3536,38 @@ window.Raphael.svg && function (R) {
} }
} }
}, },
dasharray = {
"": [0],
"none": [0],
"-": [3, 1],
".": [1, 1],
"-.": [3, 1, 1, 1],
"-..": [3, 1, 1, 1, 1, 1],
". ": [1, 3],
"- ": [4, 3],
"--": [8, 3],
"- .": [4, 3, 1, 3],
"--.": [8, 3, 1, 3],
"--..": [8, 3, 1, 3, 1, 3]
},
addDashes = function (o, value, params) {
value = dasharray[Str(value).toLowerCase()];
if (value) {
var width = o.attrs["stroke-width"] || "1",
butt = {round: width, square: width, butt: 0}[o.attrs["stroke-linecap"] || params["stroke-linecap"]] || 0,
dashes = [],
i = value.length;
while (i--) {
dashes[i] = value[i] * width + ((i % 2) ? 1 : -1) * butt;
}
$(o.node, {"stroke-dasharray": dashes.join(",")});
}
},
setFillAndStroke = function (o, params) { setFillAndStroke = function (o, params) {
var dasharray = { var node = o.node,
"": [0],
"none": [0],
"-": [3, 1],
".": [1, 1],
"-.": [3, 1, 1, 1],
"-..": [3, 1, 1, 1, 1, 1],
". ": [1, 3],
"- ": [4, 3],
"--": [8, 3],
"- .": [4, 3, 1, 3],
"--.": [8, 3, 1, 3],
"--..": [8, 3, 1, 3, 1, 3]
},
node = o.node,
attrs = o.attrs, attrs = o.attrs,
addDashes = function (o, value) { vis = node.style.visibility;
value = dasharray[Str(value).toLowerCase()]; node.style.visibility = "hidden";
if (value) {
var width = o.attrs["stroke-width"] || "1",
butt = {round: width, square: width, butt: 0}[o.attrs["stroke-linecap"] || params["stroke-linecap"]] || 0,
dashes = [],
i = value.length;
while (i--) {
dashes[i] = value[i] * width + ((i % 2) ? 1 : -1) * butt;
}
$(node, {"stroke-dasharray": dashes.join(",")});
}
};
for (var att in params) { for (var att in params) {
if (params[has](att)) { if (params[has](att)) {
if (!R._availableAttrs[has](att)) { if (!R._availableAttrs[has](att)) {
...@@ -4943,7 +3708,7 @@ window.Raphael.svg && function (R) { ...@@ -4943,7 +3708,7 @@ window.Raphael.svg && function (R) {
} }
node.setAttribute(att, value); node.setAttribute(att, value);
if (attrs["stroke-dasharray"]) { if (attrs["stroke-dasharray"]) {
addDashes(o, attrs["stroke-dasharray"]); addDashes(o, attrs["stroke-dasharray"], params);
} }
if (o._.arrows) { if (o._.arrows) {
"startString" in o._.arrows && addArrow(o, o._.arrows.startString); "startString" in o._.arrows && addArrow(o, o._.arrows.startString);
...@@ -4951,7 +3716,7 @@ window.Raphael.svg && function (R) { ...@@ -4951,7 +3716,7 @@ window.Raphael.svg && function (R) {
} }
break; break;
case "stroke-dasharray": case "stroke-dasharray":
addDashes(o, value); addDashes(o, value, params);
break; break;
case "fill": case "fill":
var isURL = Str(value).match(R._ISURL); var isURL = Str(value).match(R._ISURL);
...@@ -5042,6 +3807,8 @@ window.Raphael.svg && function (R) { ...@@ -5042,6 +3807,8 @@ window.Raphael.svg && function (R) {
} }
tuneText(o, params); tuneText(o, params);
node.style.visibility = vis;
console.log("new");
}, },
leading = 1.2, leading = 1.2,
tuneText = function (el, params) { tuneText = function (el, params) {
...@@ -5084,57 +3851,16 @@ window.Raphael.svg && function (R) { ...@@ -5084,57 +3851,16 @@ window.Raphael.svg && function (R) {
Element = function (node, svg) { Element = function (node, svg) {
var X = 0, var X = 0,
Y = 0; Y = 0;
/*\
* Element.node
[ property (object) ]
**
* Gives you a reference to the DOM object, so you can assign event handlers or just mess around.
**
* Note: Don’t mess with it.
> Usage
| // draw a circle at coordinate 10,10 with radius of 10
| var c = paper.circle(10, 10, 10);
| c.node.onclick = function () {
| c.attr("fill", "red");
| };
\*/
this[0] = this.node = node; this[0] = this.node = node;
/*\
* Element.raphael
[ property (object) ]
**
* Internal reference to @Raphael object. In case it is not available.
> Usage
| Raphael.el.red = function () {
| var hsb = this.paper.raphael.rgb2hsb(this.attr("fill"));
| hsb.h = 1;
| this.attr({fill: this.paper.raphael.hsb2rgb(hsb).hex});
| }
\*/
node.raphael = true; node.raphael = true;
/*\
* Element.id
[ property (number) ]
**
* Unique id of the element. Especially usesful when you want to listen to events of the element,
* because all events are fired in format `<module>.<action>.<id>`. Also useful for @Paper.getById method.
\*/
this.id = R._oid++; this.id = R._oid++;
node.raphaelid = this.id; node.raphaelid = this.id;
this.matrix = R.matrix(); this.matrix = R.matrix();
this.realPath = null; this.realPath = null;
/*\
* Element.paper
[ property (object) ]
**
* Internal reference to “paper” where object drawn. Mainly for use in plugins and element extensions.
> Usage
| Raphael.el.cross = function () {
| this.attr({fill: "red"});
| this.paper.path("M10,10L50,50M50,10L10,50")
| .attr({stroke: "red"});
| }
\*/
this.paper = svg; this.paper = svg;
this.attrs = this.attrs || {}; this.attrs = this.attrs || {};
this._ = { this._ = {
...@@ -5147,21 +3873,11 @@ window.Raphael.svg && function (R) { ...@@ -5147,21 +3873,11 @@ window.Raphael.svg && function (R) {
dirty: 1 dirty: 1
}; };
!svg.bottom && (svg.bottom = this); !svg.bottom && (svg.bottom = this);
/*\
* Element.prev
[ property (object) ]
**
* Reference to the previous element in the hierarchy.
\*/
this.prev = svg.top; this.prev = svg.top;
svg.top && (svg.top.next = this); svg.top && (svg.top.next = this);
svg.top = this; svg.top = this;
/*\
* Element.next
[ property (object) ]
**
* Reference to the next element in the hierarchy.
\*/
this.next = null; this.next = null;
}, },
elproto = R.el; elproto = R.el;
...@@ -5174,22 +3890,14 @@ window.Raphael.svg && function (R) { ...@@ -5174,22 +3890,14 @@ window.Raphael.svg && function (R) {
SVG.canvas && SVG.canvas.appendChild(el); SVG.canvas && SVG.canvas.appendChild(el);
var p = new Element(el, SVG); var p = new Element(el, SVG);
p.type = "path"; p.type = "path";
setFillAndStroke(p, {fill: "none", stroke: "#000", path: pathString}); setFillAndStroke(p, {
fill: "none",
stroke: "#000",
path: pathString
});
return p; return p;
}; };
/*\
* Element.rotate
[ method ]
**
* Adds rotation by given angle around given point to the list of
* transformations of the element.
> Parameters
- deg (number) angle in degrees
- cx (number) #optional x coordinate of the centre of rotation
- cy (number) #optional y coordinate of the centre of rotation
* If cx & cy aren’t specified centre of the shape is used as a point of rotation.
= (object) @Element
\*/
elproto.rotate = function (deg, cx, cy) { elproto.rotate = function (deg, cx, cy) {
if (this.removed) { if (this.removed) {
return this; return this;
...@@ -5209,20 +3917,7 @@ window.Raphael.svg && function (R) { ...@@ -5209,20 +3917,7 @@ window.Raphael.svg && function (R) {
this.transform(this._.transform.concat([["r", deg, cx, cy]])); this.transform(this._.transform.concat([["r", deg, cx, cy]]));
return this; return this;
}; };
/*\
* Element.scale
[ method ]
**
* Adds scale by given amount relative to given point to the list of
* transformations of the element.
> Parameters
- sx (number) horisontal scale amount
- sy (number) vertical scale amount
- cx (number) #optional x coordinate of the centre of scale
- cy (number) #optional y coordinate of the centre of scale
* If cx & cy aren’t specified centre of the shape is used instead.
= (object) @Element
\*/
elproto.scale = function (sx, sy, cx, cy) { elproto.scale = function (sx, sy, cx, cy) {
if (this.removed) { if (this.removed) {
return this; return this;
...@@ -5244,16 +3939,7 @@ window.Raphael.svg && function (R) { ...@@ -5244,16 +3939,7 @@ window.Raphael.svg && function (R) {
this.transform(this._.transform.concat([["s", sx, sy, cx, cy]])); this.transform(this._.transform.concat([["s", sx, sy, cx, cy]]));
return this; return this;
}; };
/*\
* Element.translate
[ method ]
**
* Adds translation by given amount to the list of transformations of the element.
> Parameters
- dx (number) horisontal shift
- dy (number) vertical shift
= (object) @Element
\*/
elproto.translate = function (dx, dy) { elproto.translate = function (dx, dy) {
if (this.removed) { if (this.removed) {
return this; return this;
...@@ -5267,41 +3953,7 @@ window.Raphael.svg && function (R) { ...@@ -5267,41 +3953,7 @@ window.Raphael.svg && function (R) {
this.transform(this._.transform.concat([["t", dx, dy]])); this.transform(this._.transform.concat([["t", dx, dy]]));
return this; return this;
}; };
/*\
* Element.transform
[ method ]
**
* Adds transformation to the element which is separate to other attributes,
* i.e. translation doesn’t change `x` or `y` of the rectange. The format
* of transformation string is similar to the path string syntax:
| "t100,100r30,100,100s2,2,100,100r45s1.5"
* Each letter is a command. There are four commands: `t` is for translate, `r` is for rotate, `s` is for
* scale and `m` is for matrix.
*
* So, the example line above could be read like “translate by 100, 100; rotate 30° around 100, 100; scale twice around 100, 100;
* rotate 45° around centre; scale 1.5 times relative to centre”. As you can see rotate and scale commands have origin
* coordinates as optional parameters, the default is the centre point of the element.
* Matrix accepts six parameters.
> Usage
| var el = paper.rect(10, 20, 300, 200);
| // translate 100, 100, rotate 45°, translate -100, 0
| el.transform("t100,100r45t-100,0");
| // if you want you can append or prepend transformations
| el.transform("...t50,50");
| el.transform("s2...");
| // or even wrap
| el.transform("t50,50...t-50-50");
| // to reset transformation call method with empty string
| el.transform("");
| // to get current value call it without parameters
| console.log(el.transform());
> Parameters
- tstr (string) #optional transformation string
* If tstr isn’t specified
= (string) current transformation string
* else
= (object) @Element
\*/
elproto.transform = function (tstr) { elproto.transform = function (tstr) {
var _ = this._; var _ = this._;
if (tstr == null) { if (tstr == null) {
...@@ -5320,34 +3972,17 @@ window.Raphael.svg && function (R) { ...@@ -5320,34 +3972,17 @@ window.Raphael.svg && function (R) {
return this; return this;
}; };
/*\
* Element.hide
[ method ]
**
* Makes element invisible. See @Element.show.
= (object) @Element
\*/
elproto.hide = function () { elproto.hide = function () {
!this.removed && this.paper.safari(this.node.style.display = "none"); !this.removed && this.paper.safari(this.node.style.display = "none");
return this; return this;
}; };
/*\
* Element.show
[ method ]
**
* Makes element visible. See @Element.hide.
= (object) @Element
\*/
elproto.show = function () { elproto.show = function () {
!this.removed && this.paper.safari(this.node.style.display = ""); !this.removed && this.paper.safari(this.node.style.display = "");
return this; return this;
}; };
/*\
* Element.remove
[ method ]
**
* Removes element form the paper.
\*/
elproto.remove = function () { elproto.remove = function () {
if (this.removed) { if (this.removed) {
return; return;
...@@ -5376,87 +4011,7 @@ window.Raphael.svg && function (R) { ...@@ -5376,87 +4011,7 @@ window.Raphael.svg && function (R) {
hide && this.hide(); hide && this.hide();
return bbox; return bbox;
}; };
/*\
* Element.attr
[ method ]
**
* Sets the attributes of the element.
> Parameters
- attrName (string) attribute’s name
- value (string) value
* or
- params (object) object of name/value pairs
* or
- attrName (string) attribute’s name
* or
- attrNames (array) in this case method returns array of current values for given attribute names
= (object) @Element if attrsName & value or params are passed in.
= (...) value of the attribute if only attrsName is passed in.
= (array) array of values of the attribute if attrsNames is passed in.
= (object) object of attributes if nothing is passed in.
> Possible parameters
# <p>Please refer to the <a href="http://www.w3.org/TR/SVG/" title="The W3C Recommendation for the SVG language describes these properties in detail.">SVG specification</a> for an explanation of these parameters.</p>
o arrow-end (string) arrowhead on the end of the path. The format for string is `<type>[-<width>[-<length>]]`. Possible types: `classic`, `block`, `open`, `oval`, `diamond`, `none`, width: `wide`, `narrow`, `midium`, length: `long`, `short`, `midium`.
o clip-rect (string) comma or space separated values: x, y, width and height
o cursor (string) CSS type of the cursor
o cx (number)
o cy (number)
o fill (string) colour, gradient or image
o fill-opacity (number)
o font (string)
o font-family (string)
o font-size (number) font size in pixels
o font-weight (string)
o height (number)
o href (string) URL, if specified element behaves as hyperlink
o opacity (number)
o path (string) SVG path string format
o r (number)
o rx (number)
o ry (number)
o src (string) image URL, only works for @Element.image element
o stroke (string) stroke colour
o stroke-dasharray (string) [“”, “`-`”, “`.`”, “`-.`”, “`-..`”, “`. `”, “`- `”, “`--`”, “`- .`”, “`--.`”, “`--..`”]
o stroke-linecap (string) [“`butt`”, “`square`”, “`round`”]
o stroke-linejoin (string) [“`bevel`”, “`round`”, “`miter`”]
o stroke-miterlimit (number)
o stroke-opacity (number)
o stroke-width (number) stroke width in pixels, default is '1'
o target (string) used with href
o text (string) contents of the text element. Use `\n` for multiline text
o text-anchor (string) [“`start`”, “`middle`”, “`end`”], default is “`middle`”
o title (string) will create tooltip with a given text
o transform (string) see @Element.transform
o width (number)
o x (number)
o y (number)
> Gradients
* Linear gradient format: “`‹angle›-‹colour›[-‹colour›[:‹offset›]]*-‹colour›`”, example: “`90-#fff-#000`” – 90°
* gradient from white to black or “`0-#fff-#f00:20-#000`” – 0° gradient from white via red (at 20%) to black.
*
* radial gradient: “`r[(‹fx›, ‹fy›)]‹colour›[-‹colour›[:‹offset›]]*-‹colour›`”, example: “`r#fff-#000`” –
* gradient from white to black or “`r(0.25, 0.75)#fff-#000`” – gradient from white to black with focus point
* at 0.25, 0.75. Focus point coordinates are in 0..1 range. Radial gradients can only be applied to circles and ellipses.
> Path String
# <p>Please refer to <a href="http://www.w3.org/TR/SVG/paths.html#PathData" title="Details of a path’s data attribute’s format are described in the SVG specification.">SVG documentation regarding path string</a>. Raphaël fully supports it.</p>
> Colour Parsing
# <ul>
# <li>Colour name (“<code>red</code>”, “<code>green</code>”, “<code>cornflowerblue</code>”, etc)</li>
# <li>#••• — shortened HTML colour: (“<code>#000</code>”, “<code>#fc0</code>”, etc)</li>
# <li>#•••••• — full length HTML colour: (“<code>#000000</code>”, “<code>#bd2300</code>”)</li>
# <li>rgb(•••, •••, •••) — red, green and blue channels’ values: (“<code>rgb(200,&nbsp;100,&nbsp;0)</code>”)</li>
# <li>rgb(•••%, •••%, •••%) — same as above, but in %: (“<code>rgb(100%,&nbsp;175%,&nbsp;0%)</code>”)</li>
# <li>rgba(•••, •••, •••, •••) — red, green and blue channels’ values: (“<code>rgba(200,&nbsp;100,&nbsp;0, .5)</code>”)</li>
# <li>rgba(•••%, •••%, •••%, •••%) — same as above, but in %: (“<code>rgba(100%,&nbsp;175%,&nbsp;0%, 50%)</code>”)</li>
# <li>hsb(•••, •••, •••) — hue, saturation and brightness values: (“<code>hsb(0.5,&nbsp;0.25,&nbsp;1)</code>”)</li>
# <li>hsb(•••%, •••%, •••%) — same as above, but in %</li>
# <li>hsba(•••, •••, •••, •••) — same as above, but with opacity</li>
# <li>hsl(•••, •••, •••) — almost the same as hsb, see <a href="http://en.wikipedia.org/wiki/HSL_and_HSV" title="HSL and HSV - Wikipedia, the free encyclopedia">Wikipedia page</a></li>
# <li>hsl(•••%, •••%, •••%) — same as above, but in %</li>
# <li>hsla(•••, •••, •••) — same as above, but with opacity</li>
# <li>Optionally for hsb and hsl you could specify hue as a degree: “<code>hsl(240deg,&nbsp;1,&nbsp;.5)</code>” or, if you want to go fancy, “<code>hsl(240°,&nbsp;1,&nbsp;.5)</code>”</li>
# </ul>
\*/
elproto.attr = function (name, value) { elproto.attr = function (name, value) {
if (this.removed) { if (this.removed) {
return this; return this;
...@@ -5514,13 +4069,7 @@ window.Raphael.svg && function (R) { ...@@ -5514,13 +4069,7 @@ window.Raphael.svg && function (R) {
setFillAndStroke(this, params); setFillAndStroke(this, params);
return this; return this;
}; };
/*\
* Element.toFront
[ method ]
**
* Moves the element so it is the closest to the viewer’s eyes, on top of other elements.
= (object) @Element
\*/
elproto.toFront = function () { elproto.toFront = function () {
if (this.removed) { if (this.removed) {
return this; return this;
...@@ -5530,13 +4079,7 @@ window.Raphael.svg && function (R) { ...@@ -5530,13 +4079,7 @@ window.Raphael.svg && function (R) {
svg.top != this && R._tofront(this, svg); svg.top != this && R._tofront(this, svg);
return this; return this;
}; };
/*\
* Element.toBack
[ method ]
**
* Moves the element so it is the furthest from the viewer’s eyes, behind other elements.
= (object) @Element
\*/
elproto.toBack = function () { elproto.toBack = function () {
if (this.removed) { if (this.removed) {
return this; return this;
...@@ -5548,13 +4091,7 @@ window.Raphael.svg && function (R) { ...@@ -5548,13 +4091,7 @@ window.Raphael.svg && function (R) {
} }
return this; return this;
}; };
/*\
* Element.insertAfter
[ method ]
**
* Inserts current object after the given one.
= (object) @Element
\*/
elproto.insertAfter = function (element) { elproto.insertAfter = function (element) {
if (this.removed) { if (this.removed) {
return this; return this;
...@@ -5568,13 +4105,7 @@ window.Raphael.svg && function (R) { ...@@ -5568,13 +4105,7 @@ window.Raphael.svg && function (R) {
R._insertafter(this, element, this.paper); R._insertafter(this, element, this.paper);
return this; return this;
}; };
/*\
* Element.insertBefore
[ method ]
**
* Inserts current object before the given one.
= (object) @Element
\*/
elproto.insertBefore = function (element) { elproto.insertBefore = function (element) {
if (this.removed) { if (this.removed) {
return this; return this;
...@@ -5748,16 +4279,7 @@ window.Raphael.svg && function (R) { ...@@ -5748,16 +4279,7 @@ window.Raphael.svg && function (R) {
this._viewBox = [x, y, w, h, !!fit]; this._viewBox = [x, y, w, h, !!fit];
return this; return this;
}; };
/*\
* Paper.renderfix
[ method ]
**
* Fixes the issue of Firefox and IE9 regarding subpixel rendering. If paper is dependant
* on other elements after reflow it could shift half pixel which cause for lines to lost their crispness.
* This method fixes the issue.
**
Special thanks to Mariusz Nowak (http://www.medikoo.com/) for this method.
\*/
R.prototype.renderfix = function () { R.prototype.renderfix = function () {
var cnvs = this.canvas, var cnvs = this.canvas,
s = cnvs.style, s = cnvs.style,
...@@ -5775,12 +4297,7 @@ window.Raphael.svg && function (R) { ...@@ -5775,12 +4297,7 @@ window.Raphael.svg && function (R) {
} }
} }
}; };
/*\
* Paper.clear
[ method ]
**
* Clears the paper, i.e. removes all the elements.
\*/
R.prototype.clear = function () { R.prototype.clear = function () {
R.eve("clear", this); R.eve("clear", this);
var c = this.canvas; var c = this.canvas;
...@@ -5792,12 +4309,7 @@ window.Raphael.svg && function (R) { ...@@ -5792,12 +4309,7 @@ window.Raphael.svg && function (R) {
c.appendChild(this.desc); c.appendChild(this.desc);
c.appendChild(this.defs = $("defs")); c.appendChild(this.defs = $("defs"));
}; };
/*\
* Paper.remove
[ method ]
**
* Removes the paper from the DOM.
\*/
R.prototype.remove = function () { R.prototype.remove = function () {
eve("remove", this); eve("remove", this);
this.canvas.parentNode && this.canvas.parentNode.removeChild(this.canvas); this.canvas.parentNode && this.canvas.parentNode.removeChild(this.canvas);
...@@ -5853,7 +4365,7 @@ window.Raphael.vml && function (R) { ...@@ -5853,7 +4365,7 @@ window.Raphael.vml && function (R) {
path2vml = function (path) { path2vml = function (path) {
var total = /[ahqstv]/ig, var total = /[ahqstv]/ig,
command = R._pathToAbsolute; command = R._pathToAbsolute;
Str(path).match(total) && (command = path2curve); Str(path).match(total) && (command = R._path2curve);
total = /[clmz]/g; total = /[clmz]/g;
if (command == R._pathToAbsolute && !Str(path).match(total)) { if (command == R._pathToAbsolute && !Str(path).match(total)) {
var res = Str(path).replace(bites, function (all, command, args) { var res = Str(path).replace(bites, function (all, command, args) {
...@@ -6153,7 +4665,7 @@ window.Raphael.vml && function (R) { ...@@ -6153,7 +4665,7 @@ window.Raphael.vml && function (R) {
var brect = span.getBoundingClientRect(); var brect = span.getBoundingClientRect();
res.W = a.w = (brect.right - brect.left) / m; res.W = a.w = (brect.right - brect.left) / m;
res.H = a.h = (brect.bottom - brect.top) / m; res.H = a.h = (brect.bottom - brect.top) / m;
res.paper.canvas.style.display = "none"; // res.paper.canvas.style.display = "none";
res.X = a.x; res.X = a.x;
res.Y = a.y + res.H / 2; res.Y = a.y + res.H / 2;
...@@ -6631,7 +5143,12 @@ window.Raphael.vml && function (R) { ...@@ -6631,7 +5143,12 @@ window.Raphael.vml && function (R) {
el.coordsize = zoom + S + zoom; el.coordsize = zoom + S + zoom;
el.coordorigin = "0 0"; el.coordorigin = "0 0";
var p = new Element(el, vml), var p = new Element(el, vml),
attr = {fill: "#000", stroke: "none", font: availableAttrs.font, text: text}; attr = {
fill: "#000",
stroke: "none",
font: R._availableAttrs.font,
text: text
};
p.shape = el; p.shape = el;
p.path = path; p.path = path;
p.textpath = o; p.textpath = o;
......
...@@ -18,7 +18,8 @@ window.Raphael.svg && function (R) { ...@@ -18,7 +18,8 @@ window.Raphael.svg && function (R) {
pow = math.pow, pow = math.pow,
separator = /[, ]+/, separator = /[, ]+/,
eve = R.eve, eve = R.eve,
E = ""; E = "",
S = " ";
// SVG // SVG
var xlink = "http://www.w3.org/1999/xlink", var xlink = "http://www.w3.org/1999/xlink",
markers = { markers = {
...@@ -285,36 +286,38 @@ window.Raphael.svg && function (R) { ...@@ -285,36 +286,38 @@ window.Raphael.svg && function (R) {
} }
} }
}, },
dasharray = {
"": [0],
"none": [0],
"-": [3, 1],
".": [1, 1],
"-.": [3, 1, 1, 1],
"-..": [3, 1, 1, 1, 1, 1],
". ": [1, 3],
"- ": [4, 3],
"--": [8, 3],
"- .": [4, 3, 1, 3],
"--.": [8, 3, 1, 3],
"--..": [8, 3, 1, 3, 1, 3]
},
addDashes = function (o, value, params) {
value = dasharray[Str(value).toLowerCase()];
if (value) {
var width = o.attrs["stroke-width"] || "1",
butt = {round: width, square: width, butt: 0}[o.attrs["stroke-linecap"] || params["stroke-linecap"]] || 0,
dashes = [],
i = value.length;
while (i--) {
dashes[i] = value[i] * width + ((i % 2) ? 1 : -1) * butt;
}
$(o.node, {"stroke-dasharray": dashes.join(",")});
}
},
setFillAndStroke = function (o, params) { setFillAndStroke = function (o, params) {
var dasharray = { var node = o.node,
"": [0],
"none": [0],
"-": [3, 1],
".": [1, 1],
"-.": [3, 1, 1, 1],
"-..": [3, 1, 1, 1, 1, 1],
". ": [1, 3],
"- ": [4, 3],
"--": [8, 3],
"- .": [4, 3, 1, 3],
"--.": [8, 3, 1, 3],
"--..": [8, 3, 1, 3, 1, 3]
},
node = o.node,
attrs = o.attrs, attrs = o.attrs,
addDashes = function (o, value) { vis = node.style.visibility;
value = dasharray[Str(value).toLowerCase()]; node.style.visibility = "hidden";
if (value) {
var width = o.attrs["stroke-width"] || "1",
butt = {round: width, square: width, butt: 0}[o.attrs["stroke-linecap"] || params["stroke-linecap"]] || 0,
dashes = [],
i = value.length;
while (i--) {
dashes[i] = value[i] * width + ((i % 2) ? 1 : -1) * butt;
}
$(node, {"stroke-dasharray": dashes.join(",")});
}
};
for (var att in params) { for (var att in params) {
if (params[has](att)) { if (params[has](att)) {
if (!R._availableAttrs[has](att)) { if (!R._availableAttrs[has](att)) {
...@@ -455,7 +458,7 @@ window.Raphael.svg && function (R) { ...@@ -455,7 +458,7 @@ window.Raphael.svg && function (R) {
} }
node.setAttribute(att, value); node.setAttribute(att, value);
if (attrs["stroke-dasharray"]) { if (attrs["stroke-dasharray"]) {
addDashes(o, attrs["stroke-dasharray"]); addDashes(o, attrs["stroke-dasharray"], params);
} }
if (o._.arrows) { if (o._.arrows) {
"startString" in o._.arrows && addArrow(o, o._.arrows.startString); "startString" in o._.arrows && addArrow(o, o._.arrows.startString);
...@@ -463,7 +466,7 @@ window.Raphael.svg && function (R) { ...@@ -463,7 +466,7 @@ window.Raphael.svg && function (R) {
} }
break; break;
case "stroke-dasharray": case "stroke-dasharray":
addDashes(o, value); addDashes(o, value, params);
break; break;
case "fill": case "fill":
var isURL = Str(value).match(R._ISURL); var isURL = Str(value).match(R._ISURL);
...@@ -554,6 +557,7 @@ window.Raphael.svg && function (R) { ...@@ -554,6 +557,7 @@ window.Raphael.svg && function (R) {
} }
tuneText(o, params); tuneText(o, params);
node.style.visibility = vis;
}, },
leading = 1.2, leading = 1.2,
tuneText = function (el, params) { tuneText = function (el, params) {
...@@ -686,7 +690,11 @@ window.Raphael.svg && function (R) { ...@@ -686,7 +690,11 @@ window.Raphael.svg && function (R) {
SVG.canvas && SVG.canvas.appendChild(el); SVG.canvas && SVG.canvas.appendChild(el);
var p = new Element(el, SVG); var p = new Element(el, SVG);
p.type = "path"; p.type = "path";
setFillAndStroke(p, {fill: "none", stroke: "#000", path: pathString}); setFillAndStroke(p, {
fill: "none",
stroke: "#000",
path: pathString
});
return p; return p;
}; };
/*\ /*\
...@@ -965,7 +973,7 @@ window.Raphael.svg && function (R) { ...@@ -965,7 +973,7 @@ window.Raphael.svg && function (R) {
# <li>hsba(•••, •••, •••, •••) — same as above, but with opacity</li> # <li>hsba(•••, •••, •••, •••) — same as above, but with opacity</li>
# <li>hsl(•••, •••, •••) — almost the same as hsb, see <a href="http://en.wikipedia.org/wiki/HSL_and_HSV" title="HSL and HSV - Wikipedia, the free encyclopedia">Wikipedia page</a></li> # <li>hsl(•••, •••, •••) — almost the same as hsb, see <a href="http://en.wikipedia.org/wiki/HSL_and_HSV" title="HSL and HSV - Wikipedia, the free encyclopedia">Wikipedia page</a></li>
# <li>hsl(•••%, •••%, •••%) — same as above, but in %</li> # <li>hsl(•••%, •••%, •••%) — same as above, but in %</li>
# <li>hsla(•••, •••, •••) — same as above, but with opacity</li> # <li>hsla(•••, •••, •••, •••) — same as above, but with opacity</li>
# <li>Optionally for hsb and hsl you could specify hue as a degree: “<code>hsl(240deg,&nbsp;1,&nbsp;.5)</code>” or, if you want to go fancy, “<code>hsl(240°,&nbsp;1,&nbsp;.5)</code>”</li> # <li>Optionally for hsb and hsl you could specify hue as a degree: “<code>hsl(240deg,&nbsp;1,&nbsp;.5)</code>” or, if you want to go fancy, “<code>hsl(240°,&nbsp;1,&nbsp;.5)</code>”</li>
# </ul> # </ul>
\*/ \*/
......
...@@ -33,7 +33,7 @@ window.Raphael.vml && function (R) { ...@@ -33,7 +33,7 @@ window.Raphael.vml && function (R) {
path2vml = function (path) { path2vml = function (path) {
var total = /[ahqstv]/ig, var total = /[ahqstv]/ig,
command = R._pathToAbsolute; command = R._pathToAbsolute;
Str(path).match(total) && (command = path2curve); Str(path).match(total) && (command = R._path2curve);
total = /[clmz]/g; total = /[clmz]/g;
if (command == R._pathToAbsolute && !Str(path).match(total)) { if (command == R._pathToAbsolute && !Str(path).match(total)) {
var res = Str(path).replace(bites, function (all, command, args) { var res = Str(path).replace(bites, function (all, command, args) {
...@@ -333,7 +333,7 @@ window.Raphael.vml && function (R) { ...@@ -333,7 +333,7 @@ window.Raphael.vml && function (R) {
var brect = span.getBoundingClientRect(); var brect = span.getBoundingClientRect();
res.W = a.w = (brect.right - brect.left) / m; res.W = a.w = (brect.right - brect.left) / m;
res.H = a.h = (brect.bottom - brect.top) / m; res.H = a.h = (brect.bottom - brect.top) / m;
res.paper.canvas.style.display = "none"; // res.paper.canvas.style.display = "none";
res.X = a.x; res.X = a.x;
res.Y = a.y + res.H / 2; res.Y = a.y + res.H / 2;
...@@ -811,7 +811,12 @@ window.Raphael.vml && function (R) { ...@@ -811,7 +811,12 @@ window.Raphael.vml && function (R) {
el.coordsize = zoom + S + zoom; el.coordsize = zoom + S + zoom;
el.coordorigin = "0 0"; el.coordorigin = "0 0";
var p = new Element(el, vml), var p = new Element(el, vml),
attr = {fill: "#000", stroke: "none", font: availableAttrs.font, text: text}; attr = {
fill: "#000",
stroke: "none",
font: R._availableAttrs.font,
text: text
};
p.shape = el; p.shape = el;
p.path = path; p.path = path;
p.textpath = o; p.textpath = o;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
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