Separated core from optional libraries

diff --git a/Rakefile b/Rakefile
index 289849dd45792a82f9df8e7489bf16f87ef9bfb8..5d3dc72556d9a9f8cb55e020bd86cfe1fcf77034 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -1,12 +1,19 @@
 SVGJS_VERSION = '0.1a'
 
-CORE_MODULES = %w[ svg container element clip doc defs shape rect circle ellipse path image group ]
+# all available modules in the correct loading order
+ALL = %w[ svg container element arrange clip doc defs shape rect circle ellipse path image group sugar ]
 
-OPTIONAL_MODULES = %w[ sugar ]
+# required modules to make the library operational
+CORE = %w[ circle container defs doc element ellipse image path rect shape svg ]
 
-DEFAULT_MODULES = CORE_MODULES + OPTIONAL_MODULES
+# optional modules
+OPTIONAL = %w[ clip group arrange sugar ]
 
-KILO = 1024   # how many bytes in a "kilobyte"
+# modules used in the curren build
+MODULES = CORE.concat(OPTIONAL).sort { |a,b| ALL.index(a) <=> ALL.index(b) }
+
+# how many bytes in a "kilobyte"
+KILO = 1024
 
 task :default => :dist
 
@@ -38,7 +45,7 @@ class BuildTask < Rake::FileTask
   
 end
 
-BuildTask.define_task 'dist/svg.js' => DEFAULT_MODULES.map {|m| "src/#{ m }.js" } do |task|
+BuildTask.define_task 'dist/svg.js' => MODULES.map {|m| "src/#{ m }.js" } do |task|
   mkdir_p 'dist', :verbose => false
   
   svgjs = ''
@@ -107,7 +114,7 @@ desc "List available modules"
 task :modules do
   Dir['src/**/*.js'].each do |file|
     name = file.gsub(/^src\//,'').gsub(/.js$/,'')
-    puts name + (DEFAULT_MODULES.include?(name) ? '*' : '')
+    puts name + (MODULES.include?(name) ? '*' : '')
   end
   puts "\n*included in default build"
 end

diff --git a/dist/svg.js b/dist/svg.js
index 1d6323c5598dadb21acda7945c040fee0db67b90..9358be1c5c4f35bc6856997ba23543f872a2f8f6 100644 (file)
--- a/dist/svg.js
+++ b/dist/svg.js
@@ -1,4 +1,4 @@
-/* svg.js 0.1a - svg container element clip doc defs shape rect circle ellipse path image group sugar - svgjs.com/license */
+/* svg.js 0.1a - svg container element arrange clip doc defs shape rect circle ellipse path image group sugar - svgjs.com/license */
 (function() {
 
   this.SVG = {
@@ -21,53 +21,23 @@
 
   SVG.Container = {
     
-    add: function(e) {
-      return this.addAt(e);
-    },
-    
-    addAt: function(e, i) {
-      if (!this.contains(e)) {
+    add: function(e, i) {
+      if (!this.has(e)) {
         i = i == null ? this.children().length : i;
         this.children().splice(i, 0, e);
-        this.node.insertBefore(e.node, this.node.childNodes[i + 1]);
+        this.node.insertBefore(e.node, this.node.childNodes[i]);
         e.parent = this;
       }
       
       return this;
     },
     
-    contains: function(e) {
+    has: function(e) {
       return Array.prototype.indexOf.call(this.children(), e) >= 0;
     },
     
     children: function() {
-      return this._children || [];
-    },
-    
-    sendBack: function(e) {
-      var i = this.children().indexOf(e);
-      if (i !== -1)
-        return this.remove(e).addAt(e, i - 1);
-    },
-    
-    bringForward: function(e) {
-      var i = this.children().indexOf(e);
-      if (i !== -1)
-        return this.remove(e).addAt(e, i + 1);
-    },
-    
-    bringToFront: function(e) {
-      if (this.contains(e))
-        this.remove(e).add(e);
-      
-      return this;
-    },
-    
-    sendToBottom: function(e) {
-      if (this.contains(e))
-        this.remove(e).addAt(e, 0);
-      
-      return this;
+      return this._children || (this._children = []);
     },
     
     remove: function(e) {
@@ -88,12 +58,20 @@
     defs: function() {
       if (this._defs == null) {
         this._defs = new SVG.Defs();
-        this.add(this._defs);
+        this.add(this._defs, 0);
       }
       
       return this._defs;
     },
     
+    levelDefs: function() {
+      var d = this.defs();
+      
+      this.remove(d).add(d, 0);
+      
+      return this;
+    },
+    
     group: function() {
       var e = new SVG.G();
       this.add(e);
@@ -175,16 +153,20 @@
     
     // move element to given x and y values
     move: function(x, y) {
-      this.attr('x', x);
-      this.attr('y', y);
+      this.attr({
+        x: x,
+        y: y
+      });
   
       return this;
     },
     
     // set element size to given width and height
     size: function(w, h) {
-      this.attr('width', w);
-      this.attr('height', h);
+      this.attr({
+        width: w,
+        height: h
+      });
   
       return this;
     },
@@ -193,14 +175,14 @@
     remove: function() {
       return this.parent != null ? this.parent.remove(this) : void 0;
     },
-  
+    
     // get parent document
     parentDoc: function() {
       return this._parent(SVG.Doc);
     },
   
     // get parent svg wrapper
-    parentSVG: function() {
+    mother: function() {
       return this.parentDoc();
     },
     
@@ -237,6 +219,7 @@
         for (var i = 0, s = l.length; i < s; i++)
           if (!r.test(l[i]))
             n.push(l[i]);
+        
       } else
         n = l;
       
@@ -257,19 +240,6 @@
       return b;
     },
     
-    // 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 + ')');
-    },
-  
     // private: find svg parent
     _parent: function(pt) {
       var e = this;
@@ -283,6 +253,58 @@
   });
 
 
+  SVG.extend(SVG.Element, {
+    
+    // get all siblings, including me
+    siblings: function() {
+      return this.mother().children();
+    },
+    
+    // send given element one step forwards
+    forward: function() {
+      var i = this.siblings().indexOf(this);
+      this.mother().remove(this).add(this, i + 1);
+      
+      return this;
+    },
+    
+    // send given element one step backwards
+    backward: function() {
+      var i, p = this.mother();
+      
+      p.levelDefs();
+      
+      i = this.siblings().indexOf(this);
+      
+      if (i > 1)
+        p.remove(this).add(this, i - 1);
+      
+      return this;
+    },
+    
+    // send given element all the way to the front
+    front: function() {
+      this.mother().remove(this).add(this);
+      
+      return this;
+    },
+    
+    // send given element all the way to the back
+    back: function() {
+      var i, p = this.mother();
+      
+      p.levelDefs();
+      
+      i = this.siblings().indexOf(this);
+      
+      if (i > 1)
+        p.remove(this).add(this, 0);
+      
+      return this;
+    }
+    
+  });
+
   var clipID = 0;
   
   SVG.Clip = function Clip() {
@@ -296,6 +318,24 @@
   
   // include the container object
   SVG.extend(SVG.Clip, SVG.Container);
+  
+  // add clipping functionality to element
+  SVG.extend(SVG.Element, {
+    
+    // clip element using another element
+    clip: function(block) {
+      var p = this.mother().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 + ')');
+    }
+    
+  });
 
 
   SVG.Doc = function Doc(e) {
@@ -305,6 +345,8 @@
     this.attr('version', '1.1');
     this.attr('xlink', SVG.xlink, SVG.ns);
     
+    this.defs();
+    
     if (typeof e == 'string')
       e = document.getElementById(e);
     
@@ -373,20 +415,20 @@
       return this;
     },
   
-    // custom size function
-    size: function(w, h) {
+    // custom size function (no height value here!)
+    size: function(w) {
       this.attr('r', w / 2);
       this.center();
   
       return this;
     },
   
-    // private: center 
-    center: function(cx, cy) {
+    // position element by its center
+    center: function(x, y) {
       var r = this.attrs.r || 0;
   
-      this.attr('cx', cx || ((this.attrs.x || 0) + r));
-      this.attr('cy', cy || ((this.attrs.y || 0) + r));
+      this.attr('cx', x || ((this.attrs.x || 0) + r));
+      this.attr('cy', y || ((this.attrs.y || 0) + r));
     }
     
   });
@@ -418,10 +460,11 @@
   
       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)));
+    
+    // position element by its center
+    center: function(x, y) {
+      this.attr('cx', x || ((this.attrs.x || 0) + (this.attrs.rx || 0)));
+      this.attr('cy', y || ((this.attrs.y || 0) + (this.attrs.ry || 0)));
     }
     
   });

diff --git a/dist/svg.min.js b/dist/svg.min.js
index 707a4f66149dc6509bae35bfb4a01780e5093fdd..8e23f037260820c7544b6ececd2557ef08d868b3 100644 (file)
--- a/dist/svg.min.js
+++ b/dist/svg.min.js
@@ -1,2 +1,2 @@
-/* svg.js 0.1a - svg container element clip doc defs shape rect circle ellipse path image group sugar - svgjs.com/license */
-(function(){this.SVG={ns:"http://www.w3.org/2000/svg",xlink:"http://www.w3.org/1999/xlink",create:function(e){return document.createElementNS(this.ns,e)},extend:function(e,t){for(var n in t)e.prototype[n]=t[n]}},this.svg=function(e){return new SVG.Doc(e)},SVG.Container={add:function(e){return this.addAt(e)},addAt:function(e,t){return this.contains(e)||(t=t==null?this.children().length:t,this.children().splice(t,0,e),this.node.insertBefore(e.node,this.node.childNodes[t+1]),e.parent=this),this},contains:function(e){return Array.prototype.indexOf.call(this.children(),e)>=0},children:function(){return this._children||[]},sendBack:function(e){var t=this.children().indexOf(e);if(t!==-1)return this.remove(e).addAt(e,t-1)},bringForward:function(e){var t=this.children().indexOf(e);if(t!==-1)return this.remove(e).addAt(e,t+1)},bringToFront:function(e){return this.contains(e)&&this.remove(e).add(e),this},sendToBottom:function(e){return this.contains(e)&&this.remove(e).addAt(e,0),this},remove:function(e){return this.removeAt(this.children().indexOf(e))},removeAt:function(e){if(0<=e&&e<this.children().length){var t=this.children()[e];this.children().splice(e,1),this.node.removeChild(t.node),t.parent=null}return this},defs:function(){return this._defs==null&&(this._defs=new SVG.Defs,this.add(this._defs)),this._defs},group:function(){var e=new SVG.G;return this.add(e),e},rect:function(e){return this.place(new SVG.Rect,e)},circle:function(e){var t;return e!=null&&(t={x:e.x,y:e.y},e.r||e.radius?t.width=t.height=(e.r||e.radius)*2:t.width=t.height=e.width||e.height),this.place(new SVG.Circle,t)},ellipse:function(e){var t;return e!=null&&(t={x:e.x,y:e.y},e.width&&(t.width=e.width),e.height&&(t.height=e.height),e.rx&&(t.width=e.rx*2),e.ry&&(t.height=e.ry*2)),this.place(new SVG.Ellipse,t)},path:function(e){return this.place(new SVG.Path,e)},image:function(e){return this.place(new SVG.Image,e)},place:function(e,t){return t!=null&&(t.x!=null&&t.y!=null&&e.move(t.x,t.y),t.width!=null&&t.height!=null&&e.size(t.width,t.height),t.data!=null&&e.data(t.data),t.src!=null&&e.load(t.src)),this.add(e),e}},SVG.Element=function(t){this.node=t,this.attrs={}},SVG.extend(SVG.Element,{move:function(e,t){return this.attr("x",e),this.attr("y",t),this},size:function(e,t){return this.attr("width",e),this.attr("height",t),this},remove:function(){return this.parent!=null?this.parent.remove(this):void 0},parentDoc:function(){return this._parent(SVG.Doc)},parentSVG:function(){return this.parentDoc()},attr:function(e,t,n){if(arguments.length<2){if(typeof e!="object")return this.attrs[e];for(t in e)this.attr(t,e[t])}else this.attrs[e]=t,n!=null?this.node.setAttributeNS(n,e,t):this.node.setAttribute(e,t);return this},transform:function(e,t){var n=[],r=this.attr("transform")||"",i=r.match(/([a-z]+\([^\)]+\))/g)||[];if(t===!0){var s=e.match(/^([A-Za-z\-]+)/)[1],o=new RegExp("^"+s);for(var u=0,r=i.length;u<r;u++)o.test(i[u])||n.push(i[u])}else n=i;return n.push(e),this.attr("transform",n.join(" ")),this},bbox:function(){var e=this.node.getBBox();return e.cx=e.x+e.width/2,e.cy=e.y+e.height/2,e},clip:function(e){var t=this.parentSVG().defs().clipPath();return e(t),this.clipTo(t)},clipTo:function(e){return this.attr("clip-path","url(#"+e.id+")")},_parent:function(e){var t=this;while(t!=null&&!(t instanceof e))t=t.parent;return t}});var e=0;SVG.Clip=function(){this.constructor.call(this,SVG.create("clipPath")),this.id="_"+e++,this.attr("id",this.id)},SVG.Clip.prototype=new SVG.Element,SVG.extend(SVG.Clip,SVG.Container),SVG.Doc=function(t){this.constructor.call(this,SVG.create("svg")),this.attr("xmlns",SVG.ns),this.attr("version","1.1"),this.attr("xlink",SVG.xlink,SVG.ns),typeof t=="string"&&(t=document.getElementById(t)),t.appendChild(this.node)},SVG.Doc.prototype=new SVG.Element,SVG.extend(SVG.Doc,SVG.Container),SVG.Defs=function(){this.constructor.call(this,SVG.create("defs"))},SVG.Defs.prototype=new SVG.Element,SVG.extend(SVG.Defs,SVG.Container),SVG.extend(SVG.Defs,{clipPath:function(){var e=new SVG.Clip;return this.add(e),e}}),SVG.Shape=function(t){this.constructor.call(this,t)},SVG.Shape.prototype=new SVG.Element,SVG.Rect=function(){this.constructor.call(this,SVG.create("rect"))},SVG.Rect.prototype=new SVG.Shape,SVG.Circle=function(){this.constructor.call(this,SVG.create("circle"))},SVG.Circle.prototype=new SVG.Shape,SVG.extend(SVG.Circle,{move:function(e,t){return this.attrs.x=e,this.attrs.y=t,this.center(),this},size:function(e,t){return this.attr("r",e/2),this.center(),this},center:function(e,t){var n=this.attrs.r||0;this.attr("cx",e||(this.attrs.x||0)+n),this.attr("cy",t||(this.attrs.y||0)+n)}}),SVG.Ellipse=function(){this.constructor.call(this,SVG.create("ellipse"))},SVG.Ellipse.prototype=new SVG.Shape,SVG.extend(SVG.Ellipse,{move:function(e,t){return this.attrs.x=e,this.attrs.y=t,this.center(),this},size:function(e,t){return this.attr("rx",e/2),this.attr("ry",t/2),this.center(),this},center:function(e,t){this.attr("cx",e||(this.attrs.x||0)+(this.attrs.rx||0)),this.attr("cy",t||(this.attrs.y||0)+(this.attrs.ry||0))}}),SVG.Path=function(){this.constructor.call(this,SVG.create("path"))},SVG.Path.prototype=new SVG.Shape,SVG.extend(SVG.Path,{data:function(e){return this.attr("d",e),this}}),SVG.Image=function(){this.constructor.call(this,SVG.create("image"))},SVG.Image.prototype=new SVG.Element,SVG.extend(SVG.Image,SVG.Container),SVG.extend(SVG.Image,{load:function(e){return this.attr("href",e,SVG.xlink),this}}),SVG.G=function(){this.constructor.call(this,SVG.create("g"))},SVG.G.prototype=new SVG.Element,SVG.extend(SVG.G,SVG.Container),SVG.extend(SVG.Shape,{fill:function(e){return e.color!=null&&this.attr("fill",e.color),e.opacity!=null&&this.attr("fill-opacity",e.opacity),this},stroke:function(e){e.color&&this.attr("stroke",e.color);var t="width opacity linecap linejoin miterlimit dasharray dashoffset".split(" ");for(var n=t.length-1;n>=0;n--)e[t[n]]!=null&&this.attr("stroke-"+t[n],e[t[n]]);return this}}),SVG.extend(SVG.Element,{rotate:function(e){var t=this.bbox();return e.x==null&&(e.x=t.cx),e.y==null&&(e.y=t.cy),this.transform("rotate("+(e.deg||0)+" "+e.x+" "+e.y+")",e.absolute),this}})}).call(this);
\ No newline at end of file
+/* svg.js 0.1a - svg container element arrange clip doc defs shape rect circle ellipse path image group sugar - svgjs.com/license */
+(function(){this.SVG={ns:"http://www.w3.org/2000/svg",xlink:"http://www.w3.org/1999/xlink",create:function(e){return document.createElementNS(this.ns,e)},extend:function(e,t){for(var n in t)e.prototype[n]=t[n]}},this.svg=function(e){return new SVG.Doc(e)},SVG.Container={add:function(e,t){return this.has(e)||(t=t==null?this.children().length:t,this.children().splice(t,0,e),this.node.insertBefore(e.node,this.node.childNodes[t]),e.parent=this),this},has:function(e){return Array.prototype.indexOf.call(this.children(),e)>=0},children:function(){return this._children||(this._children=[])},remove:function(e){return this.removeAt(this.children().indexOf(e))},removeAt:function(e){if(0<=e&&e<this.children().length){var t=this.children()[e];this.children().splice(e,1),this.node.removeChild(t.node),t.parent=null}return this},defs:function(){return this._defs==null&&(this._defs=new SVG.Defs,this.add(this._defs,0)),this._defs},levelDefs:function(){var e=this.defs();return this.remove(e).add(e,0),this},group:function(){var e=new SVG.G;return this.add(e),e},rect:function(e){return this.place(new SVG.Rect,e)},circle:function(e){var t;return e!=null&&(t={x:e.x,y:e.y},e.r||e.radius?t.width=t.height=(e.r||e.radius)*2:t.width=t.height=e.width||e.height),this.place(new SVG.Circle,t)},ellipse:function(e){var t;return e!=null&&(t={x:e.x,y:e.y},e.width&&(t.width=e.width),e.height&&(t.height=e.height),e.rx&&(t.width=e.rx*2),e.ry&&(t.height=e.ry*2)),this.place(new SVG.Ellipse,t)},path:function(e){return this.place(new SVG.Path,e)},image:function(e){return this.place(new SVG.Image,e)},place:function(e,t){return t!=null&&(t.x!=null&&t.y!=null&&e.move(t.x,t.y),t.width!=null&&t.height!=null&&e.size(t.width,t.height),t.data!=null&&e.data(t.data),t.src!=null&&e.load(t.src)),this.add(e),e}},SVG.Element=function(t){this.node=t,this.attrs={}},SVG.extend(SVG.Element,{move:function(e,t){return this.attr({x:e,y:t}),this},size:function(e,t){return this.attr({width:e,height:t}),this},remove:function(){return this.parent!=null?this.parent.remove(this):void 0},parentDoc:function(){return this._parent(SVG.Doc)},mother:function(){return this.parentDoc()},attr:function(e,t,n){if(arguments.length<2){if(typeof e!="object")return this.attrs[e];for(t in e)this.attr(t,e[t])}else this.attrs[e]=t,n!=null?this.node.setAttributeNS(n,e,t):this.node.setAttribute(e,t);return this},transform:function(e,t){var n=[],r=this.attr("transform")||"",i=r.match(/([a-z]+\([^\)]+\))/g)||[];if(t===!0){var s=e.match(/^([A-Za-z\-]+)/)[1],o=new RegExp("^"+s);for(var u=0,r=i.length;u<r;u++)o.test(i[u])||n.push(i[u])}else n=i;return n.push(e),this.attr("transform",n.join(" ")),this},bbox:function(){var e=this.node.getBBox();return e.cx=e.x+e.width/2,e.cy=e.y+e.height/2,e},_parent:function(e){var t=this;while(t!=null&&!(t instanceof e))t=t.parent;return t}}),SVG.extend(SVG.Element,{siblings:function(){return this.mother().children()},forward:function(){var e=this.siblings().indexOf(this);return this.mother().remove(this).add(this,e+1),this},backward:function(){var e,t=this.mother();return t.levelDefs(),e=this.siblings().indexOf(this),e>1&&t.remove(this).add(this,e-1),this},front:function(){return this.mother().remove(this).add(this),this},back:function(){var e,t=this.mother();return t.levelDefs(),e=this.siblings().indexOf(this),e>1&&t.remove(this).add(this,0),this}});var e=0;SVG.Clip=function(){this.constructor.call(this,SVG.create("clipPath")),this.id="_"+e++,this.attr("id",this.id)},SVG.Clip.prototype=new SVG.Element,SVG.extend(SVG.Clip,SVG.Container),SVG.extend(SVG.Element,{clip:function(e){var t=this.mother().defs().clipPath();return e(t),this.clipTo(t)},clipTo:function(e){return this.attr("clip-path","url(#"+e.id+")")}}),SVG.Doc=function(t){this.constructor.call(this,SVG.create("svg")),this.attr("xmlns",SVG.ns),this.attr("version","1.1"),this.attr("xlink",SVG.xlink,SVG.ns),this.defs(),typeof t=="string"&&(t=document.getElementById(t)),t.appendChild(this.node)},SVG.Doc.prototype=new SVG.Element,SVG.extend(SVG.Doc,SVG.Container),SVG.Defs=function(){this.constructor.call(this,SVG.create("defs"))},SVG.Defs.prototype=new SVG.Element,SVG.extend(SVG.Defs,SVG.Container),SVG.extend(SVG.Defs,{clipPath:function(){var e=new SVG.Clip;return this.add(e),e}}),SVG.Shape=function(t){this.constructor.call(this,t)},SVG.Shape.prototype=new SVG.Element,SVG.Rect=function(){this.constructor.call(this,SVG.create("rect"))},SVG.Rect.prototype=new SVG.Shape,SVG.Circle=function(){this.constructor.call(this,SVG.create("circle"))},SVG.Circle.prototype=new SVG.Shape,SVG.extend(SVG.Circle,{move:function(e,t){return this.attrs.x=e,this.attrs.y=t,this.center(),this},size:function(e){return this.attr("r",e/2),this.center(),this},center:function(e,t){var n=this.attrs.r||0;this.attr("cx",e||(this.attrs.x||0)+n),this.attr("cy",t||(this.attrs.y||0)+n)}}),SVG.Ellipse=function(){this.constructor.call(this,SVG.create("ellipse"))},SVG.Ellipse.prototype=new SVG.Shape,SVG.extend(SVG.Ellipse,{move:function(e,t){return this.attrs.x=e,this.attrs.y=t,this.center(),this},size:function(e,t){return this.attr("rx",e/2),this.attr("ry",t/2),this.center(),this},center:function(e,t){this.attr("cx",e||(this.attrs.x||0)+(this.attrs.rx||0)),this.attr("cy",t||(this.attrs.y||0)+(this.attrs.ry||0))}}),SVG.Path=function(){this.constructor.call(this,SVG.create("path"))},SVG.Path.prototype=new SVG.Shape,SVG.extend(SVG.Path,{data:function(e){return this.attr("d",e),this}}),SVG.Image=function(){this.constructor.call(this,SVG.create("image"))},SVG.Image.prototype=new SVG.Element,SVG.extend(SVG.Image,SVG.Container),SVG.extend(SVG.Image,{load:function(e){return this.attr("href",e,SVG.xlink),this}}),SVG.G=function(){this.constructor.call(this,SVG.create("g"))},SVG.G.prototype=new SVG.Element,SVG.extend(SVG.G,SVG.Container),SVG.extend(SVG.Shape,{fill:function(e){return e.color!=null&&this.attr("fill",e.color),e.opacity!=null&&this.attr("fill-opacity",e.opacity),this},stroke:function(e){e.color&&this.attr("stroke",e.color);var t="width opacity linecap linejoin miterlimit dasharray dashoffset".split(" ");for(var n=t.length-1;n>=0;n--)e[t[n]]!=null&&this.attr("stroke-"+t[n],e[t[n]]);return this}}),SVG.extend(SVG.Element,{rotate:function(e){var t=this.bbox();return e.x==null&&(e.x=t.cx),e.y==null&&(e.y=t.cy),this.transform("rotate("+(e.deg||0)+" "+e.x+" "+e.y+")",e.absolute),this}})}).call(this);
\ No newline at end of file

diff --git a/src/arrange.js b/src/arrange.js
new file mode 100644 (file)
index 0000000..d7fcb5f
--- /dev/null
+++ b/src/arrange.js
@@ -0,0 +1,53 @@
+
+// add backward / forward functionality to elements
+SVG.extend(SVG.Element, {
+  
+  // get all siblings, including me
+  siblings: function() {
+    return this.mother().children();
+  },
+  
+  // send given element one step forwards
+  forward: function() {
+    var i = this.siblings().indexOf(this);
+    this.mother().remove(this).add(this, i + 1);
+    
+    return this;
+  },
+  
+  // send given element one step backwards
+  backward: function() {
+    var i, p = this.mother();
+    
+    p.levelDefs();
+    
+    i = this.siblings().indexOf(this);
+    
+    if (i > 1)
+      p.remove(this).add(this, i - 1);
+    
+    return this;
+  },
+  
+  // send given element all the way to the front
+  front: function() {
+    this.mother().remove(this).add(this);
+    
+    return this;
+  },
+  
+  // send given element all the way to the back
+  back: function() {
+    var i, p = this.mother();
+    
+    p.levelDefs();
+    
+    i = this.siblings().indexOf(this);
+    
+    if (i > 1)
+      p.remove(this).add(this, 0);
+    
+    return this;
+  }
+  
+});
\ No newline at end of file

diff --git a/src/circle.js b/src/circle.js
index 95765682d9d3524032271e13c2fdae9626f8b92d..1fe95e50ed2f3231ff569e2f373add0a6aaed0bf 100644 (file)
--- a/src/circle.js
+++ b/src/circle.js
@@ -18,20 +18,20 @@ SVG.extend(SVG.Circle, {
     return this;
   },
 
-  // custom size function
-  size: function(w, h) {
+  // custom size function (no height value here!)
+  size: function(w) {
     this.attr('r', w / 2);
     this.center();
 
     return this;
   },
 
-  // private: center 
-  center: function(cx, cy) {
+  // position element by its center
+  center: function(x, y) {
     var r = this.attrs.r || 0;
 
-    this.attr('cx', cx || ((this.attrs.x || 0) + r));
-    this.attr('cy', cy || ((this.attrs.y || 0) + r));
+    this.attr('cx', x || ((this.attrs.x || 0) + r));
+    this.attr('cy', y || ((this.attrs.y || 0) + r));
   }
   
 });
\ No newline at end of file

diff --git a/src/clip.js b/src/clip.js
index 189b62c35d0d7e8bb7d2f984e91299e234de20cd..2266adb2ac8960ff31a92cf6cb5f93cd8442bfde 100644 (file)
--- a/src/clip.js
+++ b/src/clip.js
@@ -13,3 +13,21 @@ SVG.Clip.prototype = new SVG.Element();
 
 // include the container object
 SVG.extend(SVG.Clip, SVG.Container);
+
+// add clipping functionality to element
+SVG.extend(SVG.Element, {
+  
+  // clip element using another element
+  clip: function(block) {
+    var p = this.mother().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 + ')');
+  }
+  
+});

diff --git a/src/container.js b/src/container.js
index 9d8b5af291f1fec3b211aed1b4b2a929fc81211c..46e8200941856c11a634eb9eac07aa32f17301b5 100644 (file)
--- a/src/container.js
+++ b/src/container.js
@@ -1,53 +1,23 @@
 
 SVG.Container = {
   
-  add: function(e) {
-    return this.addAt(e);
-  },
-  
-  addAt: function(e, i) {
-    if (!this.contains(e)) {
+  add: function(e, i) {
+    if (!this.has(e)) {
       i = i == null ? this.children().length : i;
       this.children().splice(i, 0, e);
-      this.node.insertBefore(e.node, this.node.childNodes[i + 1]);
+      this.node.insertBefore(e.node, this.node.childNodes[i]);
       e.parent = this;
     }
     
     return this;
   },
   
-  contains: function(e) {
+  has: function(e) {
     return Array.prototype.indexOf.call(this.children(), e) >= 0;
   },
   
   children: function() {
-    return this._children || [];
-  },
-  
-  sendBack: function(e) {
-    var i = this.children().indexOf(e);
-    if (i !== -1)
-      return this.remove(e).addAt(e, i - 1);
-  },
-  
-  bringForward: function(e) {
-    var i = this.children().indexOf(e);
-    if (i !== -1)
-      return this.remove(e).addAt(e, i + 1);
-  },
-  
-  bringToFront: function(e) {
-    if (this.contains(e))
-      this.remove(e).add(e);
-    
-    return this;
-  },
-  
-  sendToBottom: function(e) {
-    if (this.contains(e))
-      this.remove(e).addAt(e, 0);
-    
-    return this;
+    return this._children || (this._children = []);
   },
   
   remove: function(e) {
@@ -68,12 +38,20 @@ SVG.Container = {
   defs: function() {
     if (this._defs == null) {
       this._defs = new SVG.Defs();
-      this.add(this._defs);
+      this.add(this._defs, 0);
     }
     
     return this._defs;
   },
   
+  levelDefs: function() {
+    var d = this.defs();
+    
+    this.remove(d).add(d, 0);
+    
+    return this;
+  },
+  
   group: function() {
     var e = new SVG.G();
     this.add(e);

diff --git a/src/doc.js b/src/doc.js
index e361e29f3a403fff8c6e13c5fd384ed40ac515ff..e307d097e670926fd94d6712bbdec5ccaad7261f 100644 (file)
--- a/src/doc.js
+++ b/src/doc.js
@@ -6,6 +6,8 @@ SVG.Doc = function Doc(e) {
   this.attr('version', '1.1');
   this.attr('xlink', SVG.xlink, SVG.ns);
   
+  this.defs();
+  
   if (typeof e == 'string')
     e = document.getElementById(e);
   

diff --git a/src/element.js b/src/element.js
index 39bca21cdd8b558b489e64aceeb6cada49faf092..396d67ef77fb6ba15c43eaaa71128d8630528119 100644 (file)
--- a/src/element.js
+++ b/src/element.js
@@ -9,16 +9,20 @@ SVG.extend(SVG.Element, {
   
   // move element to given x and y values
   move: function(x, y) {
-    this.attr('x', x);
-    this.attr('y', y);
+    this.attr({
+      x: x,
+      y: y
+    });
 
     return this;
   },
   
   // set element size to given width and height
   size: function(w, h) {
-    this.attr('width', w);
-    this.attr('height', h);
+    this.attr({
+      width: w,
+      height: h
+    });
 
     return this;
   },
@@ -27,14 +31,14 @@ SVG.extend(SVG.Element, {
   remove: function() {
     return this.parent != null ? this.parent.remove(this) : void 0;
   },
-
+  
   // get parent document
   parentDoc: function() {
     return this._parent(SVG.Doc);
   },
 
   // get parent svg wrapper
-  parentSVG: function() {
+  mother: function() {
     return this.parentDoc();
   },
   
@@ -71,6 +75,7 @@ SVG.extend(SVG.Element, {
       for (var i = 0, s = l.length; i < s; i++)
         if (!r.test(l[i]))
           n.push(l[i]);
+      
     } else
       n = l;
     
@@ -91,19 +96,6 @@ SVG.extend(SVG.Element, {
     return b;
   },
   
-  // 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 + ')');
-  },
-
   // private: find svg parent
   _parent: function(pt) {
     var e = this;

diff --git a/src/ellipse.js b/src/ellipse.js
index f1638ee3c88b2185431a79db22d12bb8f68b5a9c..adc1fd639468fcfa46908a6407be2ea47e83c64b 100644 (file)
--- a/src/ellipse.js
+++ b/src/ellipse.js
@@ -26,10 +26,11 @@ SVG.extend(SVG.Ellipse, {
 
     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)));
+  
+  // position element by its center
+  center: function(x, y) {
+    this.attr('cx', x || ((this.attrs.x || 0) + (this.attrs.rx || 0)));
+    this.attr('cy', y || ((this.attrs.y || 0) + (this.attrs.ry || 0)));
   }
   
 });