diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/circle.js | 47 | ||||
| -rw-r--r-- | src/clip_path.js | 6 | ||||
| -rw-r--r-- | src/container.js | 4 | ||||
| -rw-r--r-- | src/defs.js | 24 | ||||
| -rw-r--r-- | src/document.js | 17 | ||||
| -rw-r--r-- | src/element.js | 194 | ||||
| -rw-r--r-- | src/ellipse.js | 45 | ||||
| -rw-r--r-- | src/group.js | 21 | ||||
| -rw-r--r-- | src/image.js | 21 | ||||
| -rw-r--r-- | src/object.js | 40 | ||||
| -rw-r--r-- | src/path.js | 17 | ||||
| -rw-r--r-- | src/rect.js | 2 | ||||
| -rw-r--r-- | src/shape.js | 53 | ||||
| -rw-r--r-- | src/svg.js | 12 | ||||
| -rw-r--r-- | src/utils.js | 10 |
15 files changed, 296 insertions, 217 deletions
diff --git a/src/circle.js b/src/circle.js index f2549c7..890d1d3 100644 --- a/src/circle.js +++ b/src/circle.js @@ -1,32 +1,37 @@ SVG.Circle = function Circle() { - this.constructor.call(this, SVG.createElement('circle')); + this.constructor.call(this, SVG.create('circle')); }; // inherit from SVG.Shape SVG.Circle.prototype = new SVG.Shape(); -// custom move function -SVG.Circle.prototype.move = function(x, y) { - this.attributes.x = x; - this.attributes.y = y; - this.center(); +// Add circle-specific functions +SVG.Utils.merge(SVG.Circle, { - return this; -}; + // custom move function + move: function(x, y) { + this.attrs.x = x; + this.attrs.y = y; + this.center(); -// custom size function -SVG.Circle.prototype.size = function(w, h) { - this.setAttribute('r', w / 2); - this.center(); - - return this; -}; + return this; + }, + + // custom size function + size: function(w, h) { + this.attr('r', w / 2); + this.center(); + + return this; + }, + + // private: center + center: function(cx, cy) { + var r = this.attrs.r || 0; -// private: center -SVG.Circle.prototype.center = function(cx, cy) { - var r = this.attributes.r || 0; + this.attr('cx', cx || ((this.attrs.x || 0) + r)); + this.attr('cy', cy || ((this.attrs.y || 0) + r)); + } - this.setAttribute('cx', cx || ((this.attributes.x || 0) + r)); - this.setAttribute('cy', cy || ((this.attributes.y || 0) + r)); -};
\ No newline at end of file +});
\ No newline at end of file diff --git a/src/clip_path.js b/src/clip_path.js index 2eece49..57bff82 100644 --- a/src/clip_path.js +++ b/src/clip_path.js @@ -2,13 +2,13 @@ var clipID = 0; SVG.ClipPath = function ClipPath() { - this.constructor.call(this, SVG.createElement('clipPath')); + this.constructor.call(this, SVG.create('clipPath')); this.id = '_' + (clipID++); - this.setAttribute('id', this.id); + this.attr('id', this.id); }; // inherit from SVG.Element SVG.ClipPath.prototype = new SVG.Element(); // include the container object -SVG.ClipPath.include(SVG.Container);
\ No newline at end of file +SVG.Utils.merge(SVG.ClipPath, SVG.Container);
\ No newline at end of file diff --git a/src/container.js b/src/container.js index 9f13282..cc2fd4f 100644 --- a/src/container.js +++ b/src/container.js @@ -9,7 +9,7 @@ SVG.Container = { if (!this.contains(e)) { i = i == null ? this.children().length : i; this.children().splice(i, 0, e); - this.svgElement.insertBefore(e.svgElement, this.svgElement.childNodes[i + 1]); + this.node.insertBefore(e.node, this.node.childNodes[i + 1]); e.parent = this; } @@ -58,7 +58,7 @@ SVG.Container = { if (0 <= i && i < this.children().length) { var e = this.children()[i]; this.children().splice(i, 1); - this.svgElement.removeChild(e.svgElement); + this.node.removeChild(e.node); e.parent = null; } diff --git a/src/defs.js b/src/defs.js index 4661a54..4c252a5 100644 --- a/src/defs.js +++ b/src/defs.js @@ -1,17 +1,23 @@ + SVG.Defs = function Defs() { - this.constructor.call(this, SVG.createElement('defs')); + this.constructor.call(this, SVG.create('defs')); }; // inherit from SVG.Element SVG.Defs.prototype = new SVG.Element(); -// define clippath -SVG.Defs.prototype.clipPath = function() { - var e = new SVG.ClipPath(); - this.add(e); +// include the container object +SVG.Utils.merge(SVG.Defs, SVG.Container); + +// Add def-specific functions +SVG.Utils.merge(SVG.Defs, { - return e; -}; + // define clippath + clipPath: function() { + var e = new SVG.ClipPath(); + this.add(e); -// include the container object -SVG.Defs.include(SVG.Container);
\ No newline at end of file + return e; + } + +});
\ No newline at end of file diff --git a/src/document.js b/src/document.js index a510c44..32780c1 100644 --- a/src/document.js +++ b/src/document.js @@ -1,16 +1,19 @@ -SVG.Document = function Document(c) { - this.constructor.call(this, SVG.createElement('svg')); +SVG.Document = function Document(e) { + this.constructor.call(this, SVG.create('svg')); - this.setAttribute('xmlns', SVG.namespace); - this.setAttribute('version', '1.1'); - this.setAttribute('xlink', 'http://www.w3.org/1999/xlink', SVG.namespace); + this.attr('xmlns', SVG.ns); + this.attr('version', '1.1'); + this.attr('xlink', SVG.xlink, SVG.ns); - document.getElementById(c).appendChild(this.svgElement); + if (typeof e == 'string') + e = document.getElementById(e); + + e.appendChild(this.node); }; // inherit from SVG.Element SVG.Document.prototype = new SVG.Element(); // include the container object -SVG.Document.include(SVG.Container);
\ No newline at end of file +SVG.Utils.merge(SVG.Document, SVG.Container);
\ No newline at end of file diff --git a/src/element.js b/src/element.js index 3dcf785..7926e1f 100644 --- a/src/element.js +++ b/src/element.js @@ -1,99 +1,105 @@ -SVG.Element = function Element(svgElement) { - this.svgElement = svgElement; - this.attributes = {}; +SVG.Element = function Element(node) { + this.node = node; + this.attrs = {}; }; -//-D // inherit from SVG.Object -//-D SVG.Element.prototype = new SVG.Object(); - -// move element to given x and y values -SVG.Element.prototype.move = function(x, y) { - this.setAttribute('x', x); - this.setAttribute('y', y); - - return this; -}; - -// set element opacity -SVG.Element.prototype.opacity = function(o) { - return this.setAttribute('opacity', Math.max(0, Math.min(1, o))); -}; - -// set element size to given width and height -SVG.Element.prototype.size = function(w, h) { - this.setAttribute('width', w); - this.setAttribute('height', h); - - return this; -}; - -// clip element using another element -SVG.Element.prototype.clip = function(block) { - var p = this.parentSVG().defs().clipPath(); - block(p); - - return this.clipTo(p); -}; - -// distribute clipping path to svg element -SVG.Element.prototype.clipTo = function(p) { - return this.setAttribute('clip-path', 'url(#' + p.id + ')'); -}; - -// remove element -SVG.Element.prototype.destroy = function() { - return this.parent != null ? this.parent.remove(this) : void 0; -}; - -// get parent document -SVG.Element.prototype.parentDoc = function() { - return this._findParent(SVG.Document); -}; - -// get parent svg wrapper -SVG.Element.prototype.parentSVG = function() { - return this.parentDoc(); -}; - -// set svg element attribute -SVG.Element.prototype.setAttribute = function(a, v, ns) { - this.attributes[a] = v; +// Add element-specific functions +SVG.Utils.merge(SVG.Element, { - if (ns != null) - this.svgElement.setAttributeNS(ns, a, v); - else - this.svgElement.setAttribute(a, v); + // move element to given x and y values + move: function(x, y) { + this.attr('x', x); + this.attr('y', y); + + return this; + }, + + // set element opacity + opacity: function(o) { + return this.attr('opacity', Math.max(0, Math.min(1, o))); + }, + + // set element size to given width and height + size: function(w, h) { + this.attr('width', w); + this.attr('height', h); + + return this; + }, + + // clip element using another element + clip: function(block) { + var p = this.parentSVG().defs().clipPath(); + block(p); + + return this.clipTo(p); + }, + + // distribute clipping path to svg element + clipTo: function(p) { + return this.attr('clip-path', 'url(#' + p.id + ')'); + }, + + // remove element + destroy: function() { + return this.parent != null ? this.parent.remove(this) : void 0; + }, + + // get parent document + parentDoc: function() { + return this._parent(SVG.Document); + }, + + // get parent svg wrapper + parentSVG: function() { + return this.parentDoc(); + }, + + //_D // set svg element attribute + //_D setAttribute: function(a, v, ns) { + //_D this.attrs[a] = v; + //_D + //_D if (ns != null) + //_D this.node.setAttributeNS(ns, a, v); + //_D else + //_D this.node.setAttribute(a, v); + //_D + //_D return this; + //_D }, + + // set svg element attribute + attr: function(v) { + var a = arguments; + + this.attrs[a[0]] = a[1]; + + if (typeof v == 'object') + for (var k in v) + this.attr(k, v[k]); + + else if (a.length == 2) + this.node.setAttribute(a[0], a[1]); + + else if (a.length == 3) + this.node.setAttributeNS(a[2], a[0], a[1]); + + return this; + }, + + // get bounding box + bbox: function() { + return this.node.getBBox(); + }, + + // private: find svg parent + _parent: function(pt) { + var e = this; + + while (e != null && !(e instanceof pt)) + e = e.parent; + + return e; + } - return this; -}; - -// set svg element attribute -SVG.Element.prototype.attr = function(v) { - if (typeof v == 'object') - for (var k in v) - this.setAttribute(k, v[k]); - else if (arguments.length == 2) - this.setAttribute(arguments[0], arguments[1]); - - return this; -}; - -// get bounding box -SVG.Element.prototype.getBBox = function() { - return this.svgElement.getBBox(); -}; - -// private: find svg parent -SVG.Element.prototype._findParent = function(pt) { - var e = this; - - while (e != null && !(e instanceof pt)) - e = e.parent; - - return e; -}; - - - - +}); diff --git a/src/ellipse.js b/src/ellipse.js index 41443b9..1cfd0c1 100644 --- a/src/ellipse.js +++ b/src/ellipse.js @@ -1,30 +1,35 @@ SVG.Ellipse = function Ellipse() { - this.constructor.call(this, SVG.createElement('ellipse')); + this.constructor.call(this, SVG.create('ellipse')); }; // inherit from SVG.Shape SVG.Ellipse.prototype = new SVG.Shape(); -// custom move function -SVG.Ellipse.prototype.move = function(x, y) { - this.attributes.x = x; - this.attributes.y = y; - this.center(); +// Add ellipse-specific functions +SVG.Utils.merge(SVG.Ellipse, { - return this; -}; + // custom move function + move: function(x, y) { + this.attrs.x = x; + this.attrs.y = y; + this.center(); -// custom size function -SVG.Ellipse.prototype.size = function(w, h) { - this.setAttribute('rx', w / 2); - this.setAttribute('ry', h / 2); - this.center(); - - return this; -}; + return this; + }, -SVG.Ellipse.prototype.center = function(cx, cy) { - this.setAttribute('cx', cx || ((this.attributes.x || 0) + (this.attributes.rx || 0))); - this.setAttribute('cy', cy || ((this.attributes.y || 0) + (this.attributes.ry || 0))); -};
\ No newline at end of file + // custom size function + size: function(w, h) { + this.attr('rx', w / 2); + this.attr('ry', h / 2); + this.center(); + + return this; + }, + + center: function(cx, cy) { + this.attr('cx', cx || ((this.attrs.x || 0) + (this.attrs.rx || 0))); + this.attr('cy', cy || ((this.attrs.y || 0) + (this.attrs.ry || 0))); + } + +}); diff --git a/src/group.js b/src/group.js index e46035f..2236c09 100644 --- a/src/group.js +++ b/src/group.js @@ -1,16 +1,21 @@ SVG.Group = function Group() { - this.constructor.call(this, SVG.createElement("g")); + this.constructor.call(this, SVG.create('g')); }; // inherit from SVG.Element SVG.Group.prototype = new SVG.Element(); -// group rotation -SVG.Group.prototype.rotate = function(d) { - this.setAttribute('transform', 'rotate(' + d + ')'); - return this; -}; - // include the container object -SVG.Group.include(SVG.Container);
\ No newline at end of file +SVG.Utils.merge(SVG.Group, SVG.Container); + +// Add group-specific functions +SVG.Utils.merge(SVG.Group, { + + // group rotation + rotate: function(d) { + this.attr('transform', 'rotate(' + d + ')'); + return this; + } + +});
\ No newline at end of file diff --git a/src/image.js b/src/image.js index 3c60f2a..bc1dc60 100644 --- a/src/image.js +++ b/src/image.js @@ -1,16 +1,21 @@ SVG.Image = function Image() { - this.constructor.call(this, SVG.createElement('image')); + this.constructor.call(this, SVG.create('image')); }; // inherit from SVG.Element SVG.Image.prototype = new SVG.Element(); -// (re)load image -SVG.Image.prototype.load = function(url) { - this.setAttribute('href', url, SVG.xlink); - return this; -}; - // include the container object -SVG.Image.include(SVG.Container);
\ No newline at end of file +SVG.Utils.merge(SVG.Image, SVG.Container); + +// Add image-specific functions +SVG.Utils.merge(SVG.Image, { + + // (re)load image + load: function(u) { + this.attr('href', u, SVG.xlink); + return this; + } + +});
\ No newline at end of file diff --git a/src/object.js b/src/object.js index ecf43ee..1ec7ecc 100644 --- a/src/object.js +++ b/src/object.js @@ -1,11 +1,31 @@ -Object.prototype.include = function(module) { - - for (var key in module) - this.prototype[key] = module[key]; - - if (module.included != null) - module.included.apply(this); - - return this; -};
\ No newline at end of file +//SVG.Object = function Object() {}; +// +//Object.prototype.include = function(module) { +// +// for (var key in module) +// this.prototype[key] = module[key]; +// +// if (module.included != null) +// module.included.apply(this); +// +// return this; +//}; + +//SVG.Object = function Object() {}; +// +//SVG.Object.moduleKeywords = ['included', 'extended']; +// +//SVG.Object.include = function(module) { +// var key, value, _ref; +// for (key in module) { +// value = module[key]; +// if (Array.prototype.indexOf.call(this.moduleKeywords, key) < 0) { +// this.prototype[key] = value; +// } +// } +// if ((_ref = module.included) != null) { +// _ref.apply(this); +// } +// return this; +//};
\ No newline at end of file diff --git a/src/path.js b/src/path.js index c064a91..ee4484f 100644 --- a/src/path.js +++ b/src/path.js @@ -1,13 +1,18 @@ SVG.Path = function Path() { - this.constructor.call(this, SVG.createElement('path')); + this.constructor.call(this, SVG.create('path')); }; // inherit from SVG.Shape SVG.Path.prototype = new SVG.Shape(); -// set path data -SVG.Path.prototype.data = function(d) { - this.setAttribute('d', d); - return this; -};
\ No newline at end of file +// Add path-specific functions +SVG.Utils.merge(SVG.Path, { + + // set path data + data: function(d) { + this.attr('d', d); + return this; + } + +});
\ No newline at end of file diff --git a/src/rect.js b/src/rect.js index b08d68e..f286c5d 100644 --- a/src/rect.js +++ b/src/rect.js @@ -1,6 +1,6 @@ SVG.Rect = function Rect() { - this.constructor.call(this, SVG.createElement('rect')); + this.constructor.call(this, SVG.create('rect')); }; // inherit from SVG.Shape diff --git a/src/shape.js b/src/shape.js index 194ff84..a57b9f2 100644 --- a/src/shape.js +++ b/src/shape.js @@ -6,30 +6,35 @@ SVG.Shape = function Shape(element) { // inherit from SVG.Element SVG.Shape.prototype = new SVG.Element(); -// set fill color and opacity -SVG.Shape.prototype.fill = function(fill) { - if (fill.color != null) - this.setAttribute('fill', fill.color); +// Add shape-specific functions +SVG.Utils.merge(SVG.Shape, { - if (fill.opacity != null) - this.setAttribute('fill-opacity', fill.opacity); - - return this; -}; + // set fill color and opacity + fill: function(fill) { + if (fill.color != null) + this.attr('fill', fill.color); -// set stroke color and opacity -SVG.Shape.prototype.stroke = function(stroke) { - if (stroke.color != null) - this.setAttribute('stroke', stroke.color); - - if (stroke.width != null) - this.setAttribute('stroke-width', stroke.width); - - if (stroke.opacity != null) - this.setAttribute('stroke-opacity', stroke.opacity); - - if (this.attributes['fill-opacity'] == null) - this.fill({ opacity: 0 }); + if (fill.opacity != null) + this.attr('fill-opacity', fill.opacity); + + return this; + }, + + // set stroke color and opacity + stroke: function(stroke) { + if (stroke.color != null) + this.attr('stroke', stroke.color); + + if (stroke.width != null) + this.attr('stroke-width', stroke.width); + + if (stroke.opacity != null) + this.attr('stroke-opacity', stroke.opacity); + + if (this.attrs['fill-opacity'] == null) + this.fill({ opacity: 0 }); + + return this; + } - return this; -};
\ No newline at end of file +});
\ No newline at end of file @@ -1,9 +1,13 @@ this.SVG = { - namespace: "http://www.w3.org/2000/svg", - xlink: "http://www.w3.org/1999/xlink", + ns: 'http://www.w3.org/2000/svg', + xlink: 'http://www.w3.org/1999/xlink', - createElement: function(e) { - return document.createElementNS(this.namespace, e); + create: function(e) { + return document.createElementNS(this.ns, e); } +}; + +this.svg = function(e) { + return new SVG.Document(e); };
\ No newline at end of file diff --git a/src/utils.js b/src/utils.js new file mode 100644 index 0000000..5cf1bda --- /dev/null +++ b/src/utils.js @@ -0,0 +1,10 @@ + + +SVG.Utils = { + + merge: function(o, m) { + for (var k in m) + o.prototype[k] = m[k]; + } + +};
\ No newline at end of file |