Skip to content

殷洪（管理员） / raphael

Go to a project
Commit 3c49587c by Dmitry Baranovskiy
Options

Final small fixes…

parent 6b3fa145
Showing with 30 additions and 10 deletions
raphael-min.js
This source diff could not be displayed because it is too large. You can view the blob instead.
raphael.core.js
...@@ -387,7 +387,7 @@ ...@@ -387,7 +387,7 @@
return o instanceof Array; return o instanceof Array;
} }
return (type == "null" && o === null) || return (type == "null" && o === null) ||
(type == typeof o) || (type == typeof o && o !== null) ||
(type == "object" && o === Object(o)) || (type == "object" && o === Object(o)) ||
(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;
...@@ -3483,7 +3483,9 @@ ...@@ -3483,7 +3483,9 @@
t = e.t, t = e.t,
that = e.el, that = e.el,
set = {}, set = {},
now; now,
init = {},
key;
if (e.initstatus) { if (e.initstatus) {
time = (e.initstatus * e.anim.top - e.prev) / (e.percent - e.prev) * ms; time = (e.initstatus * e.anim.top - e.prev) / (e.percent - e.prev) * ms;
e.status = e.initstatus; e.status = e.initstatus;
...@@ -3574,6 +3576,10 @@ ...@@ -3574,6 +3576,10 @@
that.attr(to); that.attr(to);
animationElements.splice(l--, 1); animationElements.splice(l--, 1);
if (e.repeat > 1 && !e.next) { if (e.repeat > 1 && !e.next) {
for (key in to) if (to[has](key)) {
init[key] = e.totalOrigin[key];
}
e.el.attr(init);
runAnimation(e.anim, e.el, e.anim.percents[0], null, e.totalOrigin, e.repeat - 1); runAnimation(e.anim, e.el, e.anim.percents[0], null, e.totalOrigin, e.repeat - 1);
} }
if (e.next && !e.stop) { if (e.next && !e.stop) {
......
raphael.js
...@@ -473,7 +473,7 @@ ...@@ -473,7 +473,7 @@
return o instanceof Array; return o instanceof Array;
} }
return (type == "null" && o === null) || return (type == "null" && o === null) ||
(type == typeof o) || (type == typeof o && o !== null) ||
(type == "object" && o === Object(o)) || (type == "object" && o === Object(o)) ||
(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;
...@@ -2533,7 +2533,9 @@ ...@@ -2533,7 +2533,9 @@
t = e.t, t = e.t,
that = e.el, that = e.el,
set = {}, set = {},
now; now,
init = {},
key;
if (e.initstatus) { if (e.initstatus) {
time = (e.initstatus * e.anim.top - e.prev) / (e.percent - e.prev) * ms; time = (e.initstatus * e.anim.top - e.prev) / (e.percent - e.prev) * ms;
e.status = e.initstatus; e.status = e.initstatus;
...@@ -2624,6 +2626,10 @@ ...@@ -2624,6 +2626,10 @@
that.attr(to); that.attr(to);
animationElements.splice(l--, 1); animationElements.splice(l--, 1);
if (e.repeat > 1 && !e.next) { if (e.repeat > 1 && !e.next) {
for (key in to) if (to[has](key)) {
init[key] = e.totalOrigin[key];
}
e.el.attr(init);
runAnimation(e.anim, e.el, e.anim.percents[0], null, e.totalOrigin, e.repeat - 1); runAnimation(e.anim, e.el, e.anim.percents[0], null, e.totalOrigin, e.repeat - 1);
} }
if (e.next && !e.stop) { if (e.next && !e.stop) {
...@@ -4176,7 +4182,10 @@ window.Raphael.svg && function (R) { ...@@ -4176,7 +4182,10 @@ window.Raphael.svg && function (R) {
} else if (name != null && R.is(name, "object")) { } else if (name != null && R.is(name, "object")) {
params = name; params = name;
} }
for (var key in this.paper.customAttributes) if (this.paper.customAttributes[has](key) && params[has](key) && R.is(this.paper.customAttributes[key], "function")) { for (var key in params) {
eve("attr." + key + "." + this.id, this, params[key]);
}
for (key in this.paper.customAttributes) if (this.paper.customAttributes[has](key) && params[has](key) && R.is(this.paper.customAttributes[key], "function")) {
var par = this.paper.customAttributes[key].apply(this, [].concat(params[key])); var par = this.paper.customAttributes[key].apply(this, [].concat(params[key]));
this.attrs[key] = params[key]; this.attrs[key] = params[key];
for (var subkey in par) if (par[has](subkey)) { for (var subkey in par) if (par[has](subkey)) {
...@@ -4819,6 +4828,7 @@ window.Raphael.vml && function (R) { ...@@ -4819,6 +4828,7 @@ window.Raphael.vml && function (R) {
addGradientFill = function (o, gradient, fill) { addGradientFill = function (o, gradient, fill) {
o.attrs = o.attrs || {}; o.attrs = o.attrs || {};
var attrs = o.attrs, var attrs = o.attrs,
pow = Math.pow,
opacity, opacity,
oindex, oindex,
type = "linear", type = "linear",
...@@ -5092,11 +5102,11 @@ window.Raphael.vml && function (R) { ...@@ -5092,11 +5102,11 @@ window.Raphael.vml && function (R) {
} }
value == null && R.is(name, "object") && (params = name); value == null && R.is(name, "object") && (params = name);
for (var key in params) { for (var key in params) {
R.eve("attr." + key + "." + this.id, this, params[key]); eve("attr." + key + "." + this.id, this, params[key]);
} }
if (params) { if (params) {
for (key in this.paper.customAttributes) if (this.paper.customAttributes[has](key) && params[has](key) && R.is(this.paper.customAttributes[key], "function")) { for (key in this.paper.customAttributes) if (this.paper.customAttributes[has](key) && params[has](key) && R.is(this.paper.customAttributes[key], "function")) {
var par = this.paper.customAttributes[key].apply(this, [][concat](params[key])); var par = this.paper.customAttributes[key].apply(this, [].concat(params[key]));
this.attrs[key] = params[key]; this.attrs[key] = params[key];
for (var subkey in par) if (par[has](subkey)) { for (var subkey in par) if (par[has](subkey)) {
params[subkey] = par[subkey]; params[subkey] = par[subkey];
......
raphael.svg.js
...@@ -1026,7 +1026,10 @@ window.Raphael.svg && function (R) { ...@@ -1026,7 +1026,10 @@ window.Raphael.svg && function (R) {
} else if (name != null && R.is(name, "object")) { } else if (name != null && R.is(name, "object")) {
params = name; params = name;
} }
for (var key in this.paper.customAttributes) if (this.paper.customAttributes[has](key) && params[has](key) && R.is(this.paper.customAttributes[key], "function")) { for (var key in params) {
eve("attr." + key + "." + this.id, this, params[key]);
}
for (key in this.paper.customAttributes) if (this.paper.customAttributes[has](key) && params[has](key) && R.is(this.paper.customAttributes[key], "function")) {
var par = this.paper.customAttributes[key].apply(this, [].concat(params[key])); var par = this.paper.customAttributes[key].apply(this, [].concat(params[key]));
this.attrs[key] = params[key]; this.attrs[key] = params[key];
for (var subkey in par) if (par[has](subkey)) { for (var subkey in par) if (par[has](subkey)) {
......
raphael.vml.js
...@@ -370,6 +370,7 @@ window.Raphael.vml && function (R) { ...@@ -370,6 +370,7 @@ window.Raphael.vml && function (R) {
addGradientFill = function (o, gradient, fill) { addGradientFill = function (o, gradient, fill) {
o.attrs = o.attrs || {}; o.attrs = o.attrs || {};
var attrs = o.attrs, var attrs = o.attrs,
pow = Math.pow,
opacity, opacity,
oindex, oindex,
type = "linear", type = "linear",
...@@ -643,11 +644,11 @@ window.Raphael.vml && function (R) { ...@@ -643,11 +644,11 @@ window.Raphael.vml && function (R) {
} }
value == null && R.is(name, "object") && (params = name); value == null && R.is(name, "object") && (params = name);
for (var key in params) { for (var key in params) {
R.eve("attr." + key + "." + this.id, this, params[key]); eve("attr." + key + "." + this.id, this, params[key]);
} }
if (params) { if (params) {
for (key in this.paper.customAttributes) if (this.paper.customAttributes[has](key) && params[has](key) && R.is(this.paper.customAttributes[key], "function")) { for (key in this.paper.customAttributes) if (this.paper.customAttributes[has](key) && params[has](key) && R.is(this.paper.customAttributes[key], "function")) {
var par = this.paper.customAttributes[key].apply(this, [][concat](params[key])); var par = this.paper.customAttributes[key].apply(this, [].concat(params[key]));
this.attrs[key] = params[key]; this.attrs[key] = params[key];
for (var subkey in par) if (par[has](subkey)) { for (var subkey in par) if (par[has](subkey)) {
params[subkey] = par[subkey]; params[subkey] = par[subkey];
......
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