Fixed bug with clipPath having id and paper.use

master
baranovs 2014-08-04 08:59:28 +10:00
parent 9ff4c3f0df
commit 1ccc381f32
4 changed files with 11 additions and 9 deletions

File diff suppressed because one or more lines are too long

8
dist/snap.svg.js vendored
View File

@ -14,7 +14,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
// //
// build: 2014-07-31 // build: 2014-08-03
// Copyright (c) 2013 Adobe Systems Incorporated. All rights reserved. // Copyright (c) 2013 Adobe Systems Incorporated. All rights reserved.
// //
// Licensed under the Apache License, Version 2.0 (the "License"); // Licensed under the Apache License, Version 2.0 (the "License");
@ -3729,7 +3729,7 @@ Snap.plugin(function (Snap, Element, Paper, glob, Fragment) {
}); });
} }
$(this.node, { $(this.node, {
"clip-path": URL(clip.id) "clip-path": URL(clip.node.id || clip.id)
}); });
} }
})); }));
@ -4222,6 +4222,7 @@ Snap.plugin(function (Snap, Element, Paper, glob, Fragment) {
return this; return this;
}; };
}); });
// Copyright (c) 2013 Adobe Systems Incorporated. All rights reserved. // Copyright (c) 2013 Adobe Systems Incorporated. All rights reserved.
// //
// Licensed under the Apache License, Version 2.0 (the "License"); // Licensed under the Apache License, Version 2.0 (the "License");
@ -4680,7 +4681,7 @@ Snap.plugin(function (Snap, Element, Paper, glob, Fragment) {
\*/ \*/
proto.use = function (id) { proto.use = function (id) {
if (id != null) { if (id != null) {
var el = make("use", this.node); var el = Snap._.make("use", this.node);
if (id instanceof Element) { if (id instanceof Element) {
if (!id.attr("id")) { if (!id.attr("id")) {
id.attr({id: ID()}); id.attr({id: ID()});
@ -4997,6 +4998,7 @@ Snap.plugin(function (Snap, Element, Paper, glob, Fragment) {
}; };
}()); }());
}); });
// Copyright (c) 2013 Adobe Systems Incorporated. All rights reserved. // Copyright (c) 2013 Adobe Systems Incorporated. All rights reserved.
// //
// Licensed under the Apache License, Version 2.0 (the "License"); // Licensed under the Apache License, Version 2.0 (the "License");

View File

@ -63,7 +63,7 @@ Snap.plugin(function (Snap, Element, Paper, glob, Fragment) {
}); });
} }
$(this.node, { $(this.node, {
"clip-path": URL(clip.id) "clip-path": URL(clip.node.id || clip.id)
}); });
} }
})); }));
@ -408,4 +408,4 @@ Snap.plugin(function (Snap, Element, Paper, glob, Fragment) {
} }
eve.on("snap.util.getattr.fontSize", getFontSize)(-1); eve.on("snap.util.getattr.fontSize", getFontSize)(-1);
eve.on("snap.util.getattr.font-size", getFontSize)(-1); eve.on("snap.util.getattr.font-size", getFontSize)(-1);
}); });

View File

@ -367,7 +367,7 @@ Snap.plugin(function (Snap, Element, Paper, glob, Fragment) {
\*/ \*/
proto.use = function (id) { proto.use = function (id) {
if (id != null) { if (id != null) {
var el = make("use", this.node); var el = Snap._.make("use", this.node);
if (id instanceof Element) { if (id instanceof Element) {
if (!id.attr("id")) { if (!id.attr("id")) {
id.attr({id: ID()}); id.attr({id: ID()});