Skip to content

殷洪（管理员） / raphael

Go to a project
Commit 6d658f96 by Tomas Alabes
Options

Merge branch 'v2.1.1' 

* v2.1.1:
  v2.1.1
  Dragging Text under iOS By @vitorhsb
  Dev folder
  Fix to make IE9 display tooltips when setting the title attribute on an element. By @samcrang
  Fix Wrong position after scale path in IE. By @sarvaje
  isPointInside incorrectly caches the path used to calculate its value. By @lvanderbijl
  Raphael.path2curve does not honor original shape. By @timo22345
  IsPointInside fix for transformed paths
parents 75144eba e0dd2aeb
Showing with 98 additions and 30 deletions
.gitignore
node_modules node_modules
raphael.pro-min.js raphael.pro-min.js
raphael.pro.js raphael.pro.js
/.idea
\ No newline at end of file
README.markdown
...@@ -26,8 +26,6 @@ define([ "path/to/raphael" ], function( Raphael ) { ...@@ -26,8 +26,6 @@ define([ "path/to/raphael" ], function( Raphael ) {
At the moment we have 4 milestones: At the moment we have 4 milestones:
### v2.1.1
Milestone for bug fixes contributed by the community.
### v2.2.0 ### v2.2.0
Milestone for enhancements from contributors pull requests. Milestone for enhancements from contributors pull requests.
### v2.2.1 ### v2.2.1
...@@ -42,7 +40,8 @@ We are organizing the current issues between this milestones, setting the ground ...@@ -42,7 +40,8 @@ We are organizing the current issues between this milestones, setting the ground
All changes in code must go to `raphael.core`, `raphael.svg` or `raphael.vml`. `raphael.js` is a generated file. All changes in code must go to `raphael.core`, `raphael.svg` or `raphael.vml`. `raphael.js` is a generated file.
After adding your changes, execute `grunt`, the minified version will be created, commit and you are ready to make a pull request! After changing the core/vml/svg files, execute `grunt` in the dev folder to generate the minified version, commit and you are ready to make a pull request!
Remember that if you want to add a functionality it must be present in the vml and svg versions, *no svg-only features will be accepted.*
## Found an issue? ## Found an issue?
......
Gruntfile.js → dev/Gruntfile.js
...@@ -16,7 +16,7 @@ module.exports = function(grunt) { ...@@ -16,7 +16,7 @@ module.exports = function(grunt) {
}, },
dist: { dist: {
src: "<%= build.dist.dest %>", src: "<%= build.dist.dest %>",
dest: "<%= pkg.name %>-min.js" dest: "../raphael-min.js"
} }
}, },
build: { build: {
...@@ -24,9 +24,9 @@ module.exports = function(grunt) { ...@@ -24,9 +24,9 @@ module.exports = function(grunt) {
banner: "<%= banner %>" banner: "<%= banner %>"
}, },
dist: { dist: {
dest: "raphael.js", dest: "../raphael.js",
src: [ src: [
"./eve/eve.js", "../eve/eve.js",
"raphael.core.js", "raphael.core.js",
"raphael.svg.js", "raphael.svg.js",
"raphael.vml.js" "raphael.vml.js"
......
package.json → dev/package.json
{ {
"name": "raphael", "name": "raphael",
"version": "2.1.0", "version": "2.1.1",
"description": "JavaScript Vector Library", "description": "JavaScript Vector Library",
"main": "raphael.js", "main": "raphael.js",
"scripts": { "scripts": {
......
raphael.core.js → dev/raphael.core.js
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
// AMD support // AMD support
if (typeof define === "function" && define.amd) { if (typeof define === "function" && define.amd) {
// Define as an anonymous module // Define as an anonymous module
define(["eve"], function( eve ) { define(["."], function( eve ) {
return factory(glob, eve); return factory(glob, eve);
}); });
} else { } else {
...@@ -1997,13 +1997,25 @@ ...@@ -1997,13 +1997,25 @@
path = ["C"][concat](a2c[apply](0, [d.x, d.y][concat](path.slice(1)))); path = ["C"][concat](a2c[apply](0, [d.x, d.y][concat](path.slice(1))));
break; break;
case "S": case "S":
nx = d.x + (d.x - (d.bx || d.x)); if (pcom == "C" || pcom == "S") { // In "S" case we have to take into account, if the previous command is C/S.
ny = d.y + (d.y - (d.by || d.y)); nx = d.x * 2 - d.bx; // And reflect the previous
ny = d.y * 2 - d.by; // command's control point relative to the current point.
}
else { // or some else or nothing
nx = d.x;
ny = d.y;
}
path = ["C", nx, ny][concat](path.slice(1)); path = ["C", nx, ny][concat](path.slice(1));
break; break;
case "T": case "T":
d.qx = d.x + (d.x - (d.qx || d.x)); if (pcom == "Q" || pcom == "T") { // In "T" case we have to take into account, if the previous command is Q/T.
d.qy = d.y + (d.y - (d.qy || d.y)); d.qx = d.x * 2 - d.qx; // And make a reflection similar
d.qy = d.y * 2 - d.qy; // to case "S".
}
else { // or something else or nothing
d.qx = d.x;
d.qy = d.y;
}
path = ["C"][concat](q2c(d.x, d.y, d.qx, d.qy, path[1], path[2])); path = ["C"][concat](q2c(d.x, d.y, d.qx, d.qy, path[1], path[2]));
break; break;
case "Q": case "Q":
...@@ -3193,11 +3205,25 @@ ...@@ -3193,11 +3205,25 @@
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();
var scrollY = g.doc.documentElement.scrollTop || g.doc.body.scrollTop, var x = e.clientX,
y = e.clientY,
scrollY = g.doc.documentElement.scrollTop || g.doc.body.scrollTop,
scrollX = g.doc.documentElement.scrollLeft || g.doc.body.scrollLeft; scrollX = g.doc.documentElement.scrollLeft || g.doc.body.scrollLeft;
this._drag.x = e.clientX + scrollX;
this._drag.y = e.clientY + scrollY;
this._drag.id = e.identifier; this._drag.id = e.identifier;
if (supportsTouch && e.touches) {
var i = e.touches.length, touch;
while (i--) {
touch = e.touches[i];
this._drag.id = touch.identifier;
if (touch.identifier == this._drag.id) {
x = touch.clientX;
y = touch.clientY;
break;
}
}
}
this._drag.x = x + scrollX;
this._drag.y = y + scrollY;
!drag.length && R.mousemove(dragMove).mouseup(dragUp); !drag.length && R.mousemove(dragMove).mouseup(dragUp);
drag.push({el: this, move_scope: move_scope, start_scope: start_scope, end_scope: end_scope}); drag.push({el: this, move_scope: move_scope, start_scope: start_scope, end_scope: end_scope});
onstart && eve.on("raphael.drag.start." + this.id, onstart); onstart && eve.on("raphael.drag.start." + this.id, onstart);
...@@ -3658,7 +3684,10 @@ ...@@ -3658,7 +3684,10 @@
= (boolean) `true` if point inside the shape = (boolean) `true` if point inside the shape
\*/ \*/
elproto.isPointInside = function (x, y) { elproto.isPointInside = function (x, y) {
var rp = this.realPath = this.realPath || getPath[this.type](this); var rp = this.realPath = getPath[this.type](this);
if (this.attr('transform') && this.attr('transform').length) {
rp = R.transformPath(rp, this.attr('transform'));
}
return R.isPointInsidePath(rp, x, y); return R.isPointInsidePath(rp, x, y);
}; };
/*\ /*\
......
raphael.svg.js → dev/raphael.svg.js
...@@ -324,6 +324,11 @@ window.Raphael && window.Raphael.svg && function(R) { ...@@ -324,6 +324,11 @@ window.Raphael && window.Raphael.svg && function(R) {
break; break;
case "href": case "href":
case "title": case "title":
var hl = $("title");
var val = R._g.doc.createTextNode(value);
hl.appendChild(val);
node.appendChild(hl);
break;
case "target": case "target":
var pn = node.parentNode; var pn = node.parentNode;
if (pn.tagName.toLowerCase() != "a") { if (pn.tagName.toLowerCase() != "a") {
......
raphael.vml.js → dev/raphael.vml.js
...@@ -474,7 +474,7 @@ window.Raphael && window.Raphael.vml && function(R) { ...@@ -474,7 +474,7 @@ window.Raphael && window.Raphael.vml && function(R) {
split, split,
isGrad = ~Str(this.attrs.fill).indexOf("-"), isGrad = ~Str(this.attrs.fill).indexOf("-"),
isPatt = !Str(this.attrs.fill).indexOf("url("); isPatt = !Str(this.attrs.fill).indexOf("url(");
matrix.translate(-.5, -.5); matrix.translate(1, 1);
if (isPatt || isGrad || this.type == "image") { if (isPatt || isGrad || this.type == "image") {
skew.matrix = "1 0 0 1"; skew.matrix = "1 0 0 1";
skew.offset = "0 0"; skew.offset = "0 0";
......
raphaelTest.html → dev/raphaelTest.html
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<!--<script type="text/javascript" src="raphael-min.js"></script>--> <!--<script type="text/javascript" src="raphael-min.js"></script>-->
<!-- To work with dev versions --> <!-- To work with dev versions -->
<script type="text/javascript" src=" ./eve/eve.js"></script> <script type="text/javascript" src="../eve/eve.js"></script>
<script type="text/javascript" src="raphael.core.js"></script> <script type="text/javascript" src="raphael.core.js"></script>
<script type="text/javascript" src="raphael.svg.js"></script> <script type="text/javascript" src="raphael.svg.js"></script>
<script type="text/javascript" src="raphael.vml.js"></script> <script type="text/javascript" src="raphael.vml.js"></script>
......
raphael-min.js
This source diff could not be displayed because it is too large. You can view the blob instead.
raphael.js
// ┌────────────────────────────────────────────────────────────────────┐ \\ // ┌────────────────────────────────────────────────────────────────────┐ \\
// │ Raphaël 2.1.0 - JavaScript Vector Library │ \\ // │ Raphaël 2.1.1 - JavaScript Vector Library │ \\
// ├────────────────────────────────────────────────────────────────────┤ \\ // ├────────────────────────────────────────────────────────────────────┤ \\
// │ Copyright © 2008-2012 Dmitry Baranovskiy (http://raphaeljs.com) │ \\ // │ Copyright © 2008-2012 Dmitry Baranovskiy (http://raphaeljs.com) │ \\
// │ Copyright © 2008-2012 Sencha Labs (http://sencha.com) │ \\ // │ Copyright © 2008-2012 Sencha Labs (http://sencha.com) │ \\
...@@ -389,7 +389,7 @@ ...@@ -389,7 +389,7 @@
// AMD support // AMD support
if (typeof define === "function" && define.amd) { if (typeof define === "function" && define.amd) {
// Define as an anonymous module // Define as an anonymous module
define(["eve"], function( eve ) { define(["."], function( eve ) {
return factory(glob, eve); return factory(glob, eve);
}); });
} else { } else {
...@@ -2376,13 +2376,25 @@ ...@@ -2376,13 +2376,25 @@
path = ["C"][concat](a2c[apply](0, [d.x, d.y][concat](path.slice(1)))); path = ["C"][concat](a2c[apply](0, [d.x, d.y][concat](path.slice(1))));
break; break;
case "S": case "S":
nx = d.x + (d.x - (d.bx || d.x)); if (pcom == "C" || pcom == "S") { // In "S" case we have to take into account, if the previous command is C/S.
ny = d.y + (d.y - (d.by || d.y)); nx = d.x * 2 - d.bx; // And reflect the previous
ny = d.y * 2 - d.by; // command's control point relative to the current point.
}
else { // or some else or nothing
nx = d.x;
ny = d.y;
}
path = ["C", nx, ny][concat](path.slice(1)); path = ["C", nx, ny][concat](path.slice(1));
break; break;
case "T": case "T":
d.qx = d.x + (d.x - (d.qx || d.x)); if (pcom == "Q" || pcom == "T") { // In "T" case we have to take into account, if the previous command is Q/T.
d.qy = d.y + (d.y - (d.qy || d.y)); d.qx = d.x * 2 - d.qx; // And make a reflection similar
d.qy = d.y * 2 - d.qy; // to case "S".
}
else { // or something else or nothing
d.qx = d.x;
d.qy = d.y;
}
path = ["C"][concat](q2c(d.x, d.y, d.qx, d.qy, path[1], path[2])); path = ["C"][concat](q2c(d.x, d.y, d.qx, d.qy, path[1], path[2]));
break; break;
case "Q": case "Q":
...@@ -3106,7 +3118,6 @@ ...@@ -3106,7 +3118,6 @@
return fn.call(element, e, pos.x, pos.y); return fn.call(element, e, pos.x, pos.y);
}; };
obj.addEventListener(touchMap[type], _f, false); obj.addEventListener(touchMap[type], _f, false);
} }
...@@ -3573,11 +3584,25 @@ ...@@ -3573,11 +3584,25 @@
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();
var scrollY = g.doc.documentElement.scrollTop || g.doc.body.scrollTop, var x = e.clientX,
y = e.clientY,
scrollY = g.doc.documentElement.scrollTop || g.doc.body.scrollTop,
scrollX = g.doc.documentElement.scrollLeft || g.doc.body.scrollLeft; scrollX = g.doc.documentElement.scrollLeft || g.doc.body.scrollLeft;
this._drag.x = e.clientX + scrollX;
this._drag.y = e.clientY + scrollY;
this._drag.id = e.identifier; this._drag.id = e.identifier;
if (supportsTouch && e.touches) {
var i = e.touches.length, touch;
while (i--) {
touch = e.touches[i];
this._drag.id = touch.identifier;
if (touch.identifier == this._drag.id) {
x = touch.clientX;
y = touch.clientY;
break;
}
}
}
this._drag.x = x + scrollX;
this._drag.y = y + scrollY;
!drag.length && R.mousemove(dragMove).mouseup(dragUp); !drag.length && R.mousemove(dragMove).mouseup(dragUp);
drag.push({el: this, move_scope: move_scope, start_scope: start_scope, end_scope: end_scope}); drag.push({el: this, move_scope: move_scope, start_scope: start_scope, end_scope: end_scope});
onstart && eve.on("raphael.drag.start." + this.id, onstart); onstart && eve.on("raphael.drag.start." + this.id, onstart);
...@@ -4038,7 +4063,10 @@ ...@@ -4038,7 +4063,10 @@
= (boolean) `true` if point inside the shape = (boolean) `true` if point inside the shape
\*/ \*/
elproto.isPointInside = function (x, y) { elproto.isPointInside = function (x, y) {
var rp = this.realPath = this.realPath || getPath[this.type](this); var rp = this.realPath = getPath[this.type](this);
if (this.attr('transform') && this.attr('transform').length) {
rp = R.transformPath(rp, this.attr('transform'));
}
return R.isPointInsidePath(rp, x, y); return R.isPointInsidePath(rp, x, y);
}; };
/*\ /*\
...@@ -6052,6 +6080,11 @@ ...@@ -6052,6 +6080,11 @@
break; break;
case "href": case "href":
case "title": case "title":
var hl = $("title");
var val = R._g.doc.createTextNode(value);
hl.appendChild(val);
node.appendChild(hl);
break;
case "target": case "target":
var pn = node.parentNode; var pn = node.parentNode;
if (pn.tagName.toLowerCase() != "a") { if (pn.tagName.toLowerCase() != "a") {
...@@ -7568,7 +7601,7 @@ ...@@ -7568,7 +7601,7 @@
split, split,
isGrad = ~Str(this.attrs.fill).indexOf("-"), isGrad = ~Str(this.attrs.fill).indexOf("-"),
isPatt = !Str(this.attrs.fill).indexOf("url("); isPatt = !Str(this.attrs.fill).indexOf("url(");
matrix.translate(-.5, -.5); matrix.translate(1, 1);
if (isPatt || isGrad || this.type == "image") { if (isPatt || isGrad || this.type == "image") {
skew.matrix = "1 0 0 1"; skew.matrix = "1 0 0 1";
skew.offset = "0 0"; skew.offset = "0 0";
......
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