Skip to content

殷洪（管理员） / raphael

Go to a project
Commit 95ebe5a2 by Tomas Alabes
Options

Allows Element.data() to be called with 0 params to get all associated data. By @AdamTReineke

parent 5423c26b
Showing with 50 additions and 40 deletions
raphael-min.js
This source diff could not be displayed because it is too large. You can view the blob instead.
raphael.core.js
......@@ -503,7 +503,7 @@
}
return value;
};
/*\
* Raphael.createUUID
[ method ]
......@@ -598,7 +598,7 @@
g /= 255;
b /= 255;
}
return [r, g, b];
},
packageRGB = function (r, g, b, o) {
......@@ -615,7 +615,7 @@
R.is(o, "finite") && (rgb.opacity = o);
return rgb;
};
/*\
* Raphael.color
[ method ]
......@@ -858,7 +858,7 @@
g.doc.body.appendChild(img);
img.src = src;
};
function clrToString() {
return this.hex;
}
......@@ -1090,7 +1090,7 @@
if (pth.arr) {
return pathClone(pth.arr);
}
var paramCounts = {a: 7, c: 6, h: 1, l: 2, m: 2, r: 4, q: 4, s: 4, t: 2, v: 1, z: 0},
data = [];
if (R.is(pathString, array) && R.is(pathString[0], array)) { // rough assumption
......@@ -1598,7 +1598,7 @@
return {x: 0, y: 0, width: 0, height: 0, x2: 0, y2: 0};
}
path = path2curve(path);
var x = 0,
var x = 0,
y = 0,
X = [],
Y = [],
......@@ -2650,7 +2650,7 @@
s.scalex = +s.scalex.toFixed(4);
s.scaley = +s.scaley.toFixed(4);
s.rotate = +s.rotate.toFixed(4);
return (s.dx || s.dy ? "t" + [s.dx, s.dy] : E) +
return (s.dx || s.dy ? "t" + [s.dx, s.dy] : E) +
(s.scalex != 1 || s.scaley != 1 ? "s" + [s.scalex, s.scaley, 0, 0] : E) +
(s.rotate ? "r" + [s.rotate, 0, 0] : E);
} else {
......@@ -2678,7 +2678,7 @@
} else {
paperproto.safari = fun;
}
var preventDefault = function () {
this.returnValue = false;
},
......@@ -2826,7 +2826,7 @@
- handler (function) #optional handler for the event
= (object) @Element
\*/
/*\
* Element.dblclick
[ method ]
......@@ -2845,7 +2845,7 @@
- handler (function) #optional handler for the event
= (object) @Element
\*/
/*\
* Element.mousedown
[ method ]
......@@ -2864,7 +2864,7 @@
- handler (function) #optional handler for the event
= (object) @Element
\*/
/*\
* Element.mousemove
[ method ]
......@@ -2883,7 +2883,7 @@
- handler (function) #optional handler for the event
= (object) @Element
\*/
/*\
* Element.mouseout
[ method ]
......@@ -2902,7 +2902,7 @@
- handler (function) #optional handler for the event
= (object) @Element
\*/
/*\
* Element.mouseover
[ method ]
......@@ -2921,7 +2921,7 @@
- handler (function) #optional handler for the event
= (object) @Element
\*/
/*\
* Element.mouseup
[ method ]
......@@ -2940,7 +2940,7 @@
- handler (function) #optional handler for the event
= (object) @Element
\*/
/*\
* Element.touchstart
[ method ]
......@@ -2959,7 +2959,7 @@
- handler (function) #optional handler for the event
= (object) @Element
\*/
/*\
* Element.touchmove
[ method ]
......@@ -2978,7 +2978,7 @@
- handler (function) #optional handler for the event
= (object) @Element
\*/
/*\
* Element.touchend
[ method ]
......@@ -2997,7 +2997,7 @@
- handler (function) #optional handler for the event
= (object) @Element
\*/
/*\
* Element.touchcancel
[ method ]
......@@ -3039,7 +3039,7 @@
};
})(events[i]);
}
/*\
* Element.data
[ method ]
......@@ -3053,6 +3053,8 @@
= (object) @Element
* or, if value is not specified:
= (any) value
* or, if key and value are not specified:
= (object) Key/value pairs for all the data associated with the element.
> Usage
| for (var i = 0, i < 5, i++) {
| paper.circle(10 + 15 * i, 10, 10)
......@@ -3065,6 +3067,9 @@
\*/
elproto.data = function (key, value) {
var data = eldata[this.id] = eldata[this.id] || {};
if (arguments.length == 0) {
return data;
}
if (arguments.length == 1) {
if (R.is(key, "object")) {
for (var i in key) if (key[has](i)) {
......@@ -4269,7 +4274,7 @@
**
= (object) new altered Animation object
\*/
Animation.prototype.repeat = function (times) {
Animation.prototype.repeat = function (times) {
var a = new Animation(this.anim, this.ms);
a.del = this.del;
a.times = math.floor(mmax(times, 0)) || 1;
......
raphael.js
......@@ -882,7 +882,7 @@
}
return value;
};
/*\
* Raphael.createUUID
[ method ]
......@@ -977,7 +977,7 @@
g /= 255;
b /= 255;
}
return [r, g, b];
},
packageRGB = function (r, g, b, o) {
......@@ -994,7 +994,7 @@
R.is(o, "finite") && (rgb.opacity = o);
return rgb;
};
/*\
* Raphael.color
[ method ]
......@@ -1237,7 +1237,7 @@
g.doc.body.appendChild(img);
img.src = src;
};
function clrToString() {
return this.hex;
}
......@@ -1469,7 +1469,7 @@
if (pth.arr) {
return pathClone(pth.arr);
}
var paramCounts = {a: 7, c: 6, h: 1, l: 2, m: 2, r: 4, q: 4, s: 4, t: 2, v: 1, z: 0},
data = [];
if (R.is(pathString, array) && R.is(pathString[0], array)) { // rough assumption
......@@ -1977,7 +1977,7 @@
return {x: 0, y: 0, width: 0, height: 0, x2: 0, y2: 0};
}
path = path2curve(path);
var x = 0,
var x = 0,
y = 0,
X = [],
Y = [],
......@@ -3029,7 +3029,7 @@
s.scalex = +s.scalex.toFixed(4);
s.scaley = +s.scaley.toFixed(4);
s.rotate = +s.rotate.toFixed(4);
return (s.dx || s.dy ? "t" + [s.dx, s.dy] : E) +
return (s.dx || s.dy ? "t" + [s.dx, s.dy] : E) +
(s.scalex != 1 || s.scaley != 1 ? "s" + [s.scalex, s.scaley, 0, 0] : E) +
(s.rotate ? "r" + [s.rotate, 0, 0] : E);
} else {
......@@ -3057,7 +3057,7 @@
} else {
paperproto.safari = fun;
}
var preventDefault = function () {
this.returnValue = false;
},
......@@ -3205,7 +3205,7 @@
- handler (function) #optional handler for the event
= (object) @Element
\*/
/*\
* Element.dblclick
[ method ]
......@@ -3224,7 +3224,7 @@
- handler (function) #optional handler for the event
= (object) @Element
\*/
/*\
* Element.mousedown
[ method ]
......@@ -3243,7 +3243,7 @@
- handler (function) #optional handler for the event
= (object) @Element
\*/
/*\
* Element.mousemove
[ method ]
......@@ -3262,7 +3262,7 @@
- handler (function) #optional handler for the event
= (object) @Element
\*/
/*\
* Element.mouseout
[ method ]
......@@ -3281,7 +3281,7 @@
- handler (function) #optional handler for the event
= (object) @Element
\*/
/*\
* Element.mouseover
[ method ]
......@@ -3300,7 +3300,7 @@
- handler (function) #optional handler for the event
= (object) @Element
\*/
/*\
* Element.mouseup
[ method ]
......@@ -3319,7 +3319,7 @@
- handler (function) #optional handler for the event
= (object) @Element
\*/
/*\
* Element.touchstart
[ method ]
......@@ -3338,7 +3338,7 @@
- handler (function) #optional handler for the event
= (object) @Element
\*/
/*\
* Element.touchmove
[ method ]
......@@ -3357,7 +3357,7 @@
- handler (function) #optional handler for the event
= (object) @Element
\*/
/*\
* Element.touchend
[ method ]
......@@ -3376,7 +3376,7 @@
- handler (function) #optional handler for the event
= (object) @Element
\*/
/*\
* Element.touchcancel
[ method ]
......@@ -3418,7 +3418,7 @@
};
})(events[i]);
}
/*\
* Element.data
[ method ]
......@@ -3432,6 +3432,8 @@
= (object) @Element
* or, if value is not specified:
= (any) value
* or, if key and value are not specified:
= (object) Key/value pairs for all the data associated with the element.
> Usage
| for (var i = 0, i < 5, i++) {
| paper.circle(10 + 15 * i, 10, 10)
......@@ -3444,6 +3446,9 @@
\*/
elproto.data = function (key, value) {
var data = eldata[this.id] = eldata[this.id] || {};
if (arguments.length == 0) {
return data;
}
if (arguments.length == 1) {
if (R.is(key, "object")) {
for (var i in key) if (key[has](i)) {
......@@ -4648,7 +4653,7 @@
**
= (object) new altered Animation object
\*/
Animation.prototype.repeat = function (times) {
Animation.prototype.repeat = function (times) {
var a = new Animation(this.anim, this.ms);
a.del = this.del;
a.times = math.floor(mmax(times, 0)) || 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment