diff options
author | wout <wout@impinc.co.uk> | 2013-03-24 19:19:06 +0100 |
---|---|---|
committer | wout <wout@impinc.co.uk> | 2013-03-24 19:19:06 +0100 |
commit | 67d367e0d74b3287956130da0077e42c6483dd2f (patch) | |
tree | bb2d23315e39c89b79cb8c52e7a5db54636e08ad | |
parent | ff09596144c3fd6770d1dc64178a10c2432396ca (diff) | |
download | svg.js-67d367e0d74b3287956130da0077e42c6483dd2f.tar.gz svg.js-67d367e0d74b3287956130da0077e42c6483dd2f.zip |
Bumped to v0.11
- removed SVG.Wrap on SVG.Polyline, SVG.Polygon and SVG.Path
- added delay on SVG.FX module
- made x(), y(), cx() and cy() as getters
- added SGB.get() method, to get elements by a DOM id
- fixed bug in remove() method on container elements
- added jasmine test suite to repo
45 files changed, 5905 insertions, 832 deletions
@@ -50,13 +50,19 @@ if (SVG.supported) { ### ViewBox -The `viewBox` attribute of an `<svg>` element can be managed with the `viewbox()` method. When supplied with arguments it will act as a setter: +The `viewBox` attribute of an `<svg>` element can be managed with the `viewbox()` method. When supplied with four arguments it will act as a setter: ```javascript draw.viewbox(0, 0, 297, 210) ``` -Without any attributes an instance of `SVG.ViewBox` will be returned: +Alternatively you can also supply an object as the first argument: + +```javascript +draw.viewbox({ x: 0, y: 0, width: 297, height: 210 }) +``` + +Without any arguments an instance of `SVG.ViewBox` will be returned: ```javascript var box = draw.viewbox() @@ -185,6 +191,15 @@ text.font({ }) ``` +## Referencing elements +If you want to get an element created by svg.js by its id, you can use the `SVG.get()` method: + +```javascript +var element = SVG.get('my_element') + +element.fill('#f06) +``` + ## Manipulating elements @@ -267,6 +282,14 @@ rect.transform({ }) ``` +Note that you can also apply transformations directly using the `attr()` method: + +```javascript +rect.attr('transform', 'matrix(1,0.5,0.5,1,0,0)') +``` + +Although that would mean you can't use the `transform()` method because it would overwrite any manually applied transformations. You should only go down this route if you know exactly what you are doing and you want to achieve an effect that is not achievable with the `transform()` method. + ### Style With the `style()` method the `style` attribute can be managed like attributes with `attr`: @@ -323,6 +346,20 @@ rect.attr({ x: 20, y: 60 }) Although `move()` is much more convenient because it will always use the upper left corner as the position reference, whereas with using `attr()` the `x` and `y` reference differ between element types. For example, rect uses the upper left corner with the `x` and `y` attributes, circle and ellipse use their center with the `cx` and `cy` attributes and thereby simply ignoring the `x` and `y` values you might assign. +The `text` element has one optional argument: + +```javascript +// move(x, y, anchor) +rect.move(200, 350, true) +``` + +The third argument can be used to move the text element by its anchor point rather than the calculated left top position. This can also be used on the individual axes: + +```javascript +rect.x(200, true).y(350, true) +``` + + ### Center This is an extra method to move an element by its center: @@ -336,6 +373,20 @@ This will have the same effect as: rect.cx(150).cy(150) ``` +The `text` element has one optional argument: + +```javascript +// center(x, y, anchor) +rect.center(150, 150, true) +``` + +The third argument can be used to center the text element by its anchor point rather than the calculated center position. This can also be used on the individual axes: + +```javascript +rect.cx(150, true).cy(150, true) +``` + + ### Size Set the size of an element by a given `width` and `height`: @@ -393,7 +444,7 @@ As opposed to the native `getBBox()` method any translations used with the `tran ### Iterating over all children -If you would iterate over all the `children()` of the svg document, you might notice also the `<defs>` and `<g>` elements will be included. To iterate the shapes only, you can use the `each()` method: +If you would iterate over all the `children` of the svg document, you might notice also the `<defs>` and `<g>` elements will be included. To iterate the shapes only, you can use the `each()` method: ```javascript draw.each(function(i, children) { @@ -423,10 +474,16 @@ Animating elements is very much the same as manipulating elements, the only diff rect.animate().move(150, 150) ``` -The `animate()` method will take two arguments. The first is `milliseconds`, the second `ease`: +The `animate()` method will take three arguments. The first is `milliseconds`, the second `ease` and the third `delay`: ```javascript -rect.animate(2000, '>').attr({ fill: '#f03' }) +rect.animate(2000, '>', 1000).attr({ fill: '#f03' }) +``` + +Alternatively you can pass an object as the first argument: + +```javascript +rect.animate({ ease: '<', delay: 1500 }).attr({ fill: '#f03' }) ``` By default `milliseconds` will be set to `1000`, `ease` will be set to `<>`. @@ -908,10 +965,8 @@ The SVG document can be extended by using: ```javascript SVG.extend(SVG.Doc, { paintAllPink: function() { - var children = this.children() - - for (var i = 0, l = children.length; i < l; i++) { - children[i].fill({ color: 'pink' }) + for (var i = 0, l = this.children.length; i < l; i++) { + this.children[i].fill({ color: 'pink' }) } return this @@ -1,7 +1,7 @@ -SVGJS_VERSION = '0.10' +SVGJS_VERSION = '0.11' # all available modules in the correct loading order -MODULES = %w[ svg regex default color viewbox bbox element container fx event group arrange defs mask pattern gradient doc shape wrap rect ellipse line poly path image text nested sugar ] +MODULES = %w[ svg regex default color viewbox bbox element container fx event group arrange defs mask clip pattern gradient doc shape rect ellipse line poly path plotable image text nested sugar ] # how many bytes in a "kilobyte" KILO = 1024 diff --git a/dist/svg.js b/dist/svg.js index da992fe..89aa45d 100644 --- a/dist/svg.js +++ b/dist/svg.js @@ -1,4 +1,4 @@ -/* svg.js v0.10-1-g4bd21ec - svg regex default color viewbox bbox element container fx event group arrange defs mask pattern gradient doc shape wrap rect ellipse line poly path image text nested sugar - svgjs.com/license */ +/* svg.js v0.11 - svg regex default color viewbox bbox element container fx event group arrange defs mask clip pattern gradient doc shape rect ellipse line poly path plotable image text nested sugar - svgjs.com/license */ ;(function() { this.SVG = function(element) { @@ -21,7 +21,7 @@ // Get next named element id SVG.eid = function(name) { - return 'Svgjs' + name.charAt(0).toUpperCase() + name.slice(1) + 'Element' + (SVG.did++) + return 'Svgjs' + name.charAt(0).toUpperCase() + name.slice(1) + (SVG.did++) } // Method for element creation @@ -35,7 +35,7 @@ return element } - // Method for extending objects + // Method for extending objects SVG.extend = function() { var modules, methods, key, i @@ -51,6 +51,12 @@ modules[i].prototype[key] = methods[key] } + // Method for getting an eleemnt by id + SVG.get = function(id) { + var node = document.getElementById(id) + if (node) return node.instance + } + // svg support test SVG.supported = (function() { return !! document.createElementNS && @@ -60,8 +66,13 @@ if (!SVG.supported) return false SVG.regex = { + /* test a given value */ + test: function(value, test) { + return this[test].test(value) + } + /* parse unit value */ - unit: /^([\d\.]+)([a-z%]{0,2})$/ + , unit: /^([\d\.]+)([a-z%]{0,2})$/ /* parse hex value */ , hex: /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i @@ -90,6 +101,9 @@ /* test for blank string */ , isBlank: /^(\s+)?$/ + /* test for numeric string */ + , isNumber: /^-?[\d\.]+$/ + } SVG.default = { @@ -97,28 +111,28 @@ matrix: '1,0,0,1,0,0' // Default attribute values - , attrs: function() { - return { - /* fill and stroke */ - 'fill-opacity': 1 - , 'stroke-opacity': 1 - , 'stroke-width': 0 - , fill: '#000' - , stroke: '#000' - , opacity: 1 - /* position */ - , x: 0 - , y: 0 - , cx: 0 - , cy: 0 - /* size */ - , width: 0 - , height: 0 - /* radius */ - , r: 0 - , rx: 0 - , ry: 0 - } + , attrs: { + /* fill and stroke */ + 'fill-opacity': 1 + , 'stroke-opacity': 1 + , 'stroke-width': 0 + , fill: '#000' + , stroke: '#000' + , opacity: 1 + /* position */ + , x: 0 + , y: 0 + , cx: 0 + , cy: 0 + /* size */ + , width: 0 + , height: 0 + /* radius */ + , r: 0 + , rx: 0 + , ry: 0 + /* gradient */ + , offset: 0 } // Default transformation values @@ -304,12 +318,12 @@ // Test if given value is a rgb object SVG.Color.isRgb = function(color) { - return typeof color.r == 'number' + return color && typeof color.r == 'number' } // Test if given value is a hsb object SVG.Color.isHsb = function(color) { - return typeof color.h == 'number' + return color && typeof color.h == 'number' } SVG.ViewBox = function(element) { @@ -363,19 +377,19 @@ this.x = box.x + element.trans.x this.y = box.y + element.trans.y - /* add the center */ - this.cx = this.x + box.width / 2 - this.cy = this.x + box.height / 2 - /* plain width and height */ - this.width = box.width - this.height = box.height + this.width = box.width * element.trans.scaleX + this.height = box.height * element.trans.scaleY + + /* add the center */ + this.cx = this.x + this.width / 2 + this.cy = this.y + this.height / 2 } SVG.Element = function(node) { - /* initialize attribute store with defaults */ - this.attrs = SVG.default.attrs() + /* make stroke value accessible dynamically */ + this._stroke = SVG.default.attrs.stroke /* initialize style store */ this.styles = {} @@ -386,28 +400,29 @@ /* keep reference to the element node */ if (this.node = node) { this.type = node.nodeName - this.attrs.id = node.getAttribute('id') + this.node.instance = this } - } // SVG.extend(SVG.Element, { // Move over x-axis x: function(x) { + if (x) x /= this.trans.scaleX return this.attr('x', x) } // Move over y-axis , y: function(y) { + if (y) y /= this.trans.scaleY return this.attr('y', y) } // Move by center over x-axis , cx: function(x) { - return this.x(x - this.bbox().width / 2) + return x == null ? this.bbox().cx : this.x(x - this.bbox().width / 2) } // Move by center over y-axis , cy: function(y) { - return this.y(y - this.bbox().height / 2) + return y == null ? this.bbox().cy : this.y(y - this.bbox().height / 2) } // Move element to given x and y values , move: function(x, y) { @@ -426,40 +441,30 @@ } // Clone element , clone: function() { - var clone - - /* if this is a wrapped shape */ - if (this instanceof SVG.Wrap) { - /* build new wrapped shape */ - clone = this.parent[this.child.node.nodeName]() - clone.attrs = this.attrs - - /* copy child attributes and transformations */ - clone.child.trans = this.child.trans - clone.child.attr(this.child.attrs).transform({}) - - /* re-plot shape */ - if (clone.plot) - clone.plot(this.child.attrs[this.child instanceof SVG.Path ? 'd' : 'points']) - - } else { - var name = this.node.nodeName - - /* invoke shape method with shape-specific arguments */ - clone = name == 'rect' ? - this.parent[name](this.attrs.width, this.attrs.height) : - name == 'ellipse' ? - this.parent[name](this.attrs.rx * 2, this.attrs.ry * 2) : - name == 'image' ? - this.parent[name](this.src) : - name == 'text' ? - this.parent[name](this.content) : - name == 'g' ? - this.parent.group() : - this.parent[name]() - - clone.attr(this.attrs) - } + var clone , attr + , type = this.type + + /* invoke shape method with shape-specific arguments */ + clone = type == 'rect' || type == 'ellipse' ? + this.parent[type](0,0) : + type == 'line' ? + this.parent[type](0,0,0,0) : + type == 'image' ? + this.parent[type](this.src) : + type == 'text' ? + this.parent[type](this.content) : + type == 'path' ? + this.parent[type](this.attr('d')) : + type == 'polyline' || type == 'polygon' ? + this.parent[type](this.attr('points')) : + type == 'g' ? + this.parent.group() : + this.parent[type]() + + /* apply attributes attributes */ + attr = this.attr() + delete attr.id + clone.attr(attr) /* copy transformations */ clone.trans = this.trans @@ -470,28 +475,36 @@ // Remove element , remove: function() { if (this.parent) - this.parent.remove(this) + this.parent.removeElement(this) return this } // Get parent document - , doc: function() { - return this._parent(SVG.Doc) - } - // Get parent nested document - , nested: function() { - return this._parent(SVG.Nested) + , doc: function(type) { + return this._parent(type || SVG.Doc) } // Set svg element attribute , attr: function(a, v, n) { - if (arguments.length < 2) { + if (a == null) { + /* get an object of attributes */ + a = {} + v = this.node.attributes + for (n = v.length - 1; n >= 0; n--) + a[v[n].nodeName] = v[n].nodeValue + + return a + + } else if (typeof a == 'object') { /* apply every attribute individually if an object is passed */ - if (typeof a == 'object') - for (v in a) - this.attr(v, a[v]) + for (v in a) this.attr(v, a[v]) + } else if (v === null) { + /* remove value */ + this.node.removeAttribute(a) + + } else if (v == null) { /* act as a getter for style attributes */ - else if (this._isStyle(a)) + if (this._isStyle(a)) { return a == 'text' ? this.content : a == 'leading' ? @@ -499,41 +512,38 @@ this.style(a) /* act as a getter if the first and only argument is not an object */ - else - return this.attrs[a] || this.node.getAttribute(a) + } else { + v = this.node.getAttribute(a) + return v == null ? + SVG.default.attrs[a] : + SVG.regex.test(v, 'isNumber') ? + parseFloat(v) : v + } - } else if (v === null) { - /* remove value */ - this.node.removeAttribute(a) - } else if (a == 'style') { /* redirect to the style method */ return this.style(v) } else { - /* store value */ - this.attrs[a] = v - /* treat x differently on text elements */ - if (a == 'x' && this._isText()) { - for (var i = this.lines.length - 1; i >= 0; i--) - this.lines[i].attr(a, v) + if (a == 'x' && this instanceof SVG.Text) + for (n = this.lines.length - 1; n >= 0; n--) + this.lines[n].attr(a, v) - /* set the actual attribute */ - } else { - /* BUG FIX: some browsers will render a stroke if a color is given even though stroke width is 0 */ - if (a == 'stroke-width') - this.attr('stroke', parseFloat(v) > 0 ? this.attrs.stroke : null) + /* BUG FIX: some browsers will render a stroke if a color is given even though stroke width is 0 */ + if (a == 'stroke-width') + this.attr('stroke', parseFloat(v) > 0 ? this._stroke : null) + else if (a == 'stroke') + this._stroke = v + + /* ensure hex color */ + if (SVG.Color.test(v) || SVG.Color.isRgb(v) || SVG.Color.isHsb(v)) + v = new SVG.Color(v).toHex() - /* ensure hex color */ - if (SVG.Color.test(v) || SVG.Color.isRgb(v) || SVG.Color.isHsb(v)) - v = new SVG.Color(v).toHex() - - /* set give attribute on node */ - n != null ? - this.node.setAttributeNS(n, a, v) : - this.node.setAttribute(a, v) - } + /* set give attribute on node */ + n != null ? + this.node.setAttributeNS(n, a, v) : + this.node.setAttribute(a, v) /* if the passed argument belongs to the style as well, add it there */ if (this._isStyle(a)) { @@ -614,10 +624,15 @@ /* add translation */ if (o.x != 0 || o.y != 0) - transform.push('translate(' + o.x + ',' + o.y + ')') + transform.push('translate(' + o.x / o.scaleX + ',' + o.y / o.scaleY + ')') + + /* add offset translation */ + if (this._offset) + transform.push('translate(' + (-this._offset.x) + ',' + (-this._offset.y) + ')') /* add only te required transformations */ - this.node.setAttribute('transform', transform.join(' ')) + if (transform.length > 0) + this.node.setAttribute('transform', transform.join(' ')) return this } @@ -648,7 +663,7 @@ return this.styles[s] } - } else if (v === null) { + } else if (v === null || SVG.regex.test(v, 'isBlank')) { /* remove value */ delete this.styles[s] @@ -717,12 +732,8 @@ return element } // Private: tester method for style detection - , _isStyle: function(attr) { - return typeof attr == 'string' ? SVG.regex.isStyle.test(attr) : false - } - // Private: element type tester - , _isText: function() { - return this instanceof SVG.Text + , _isStyle: function(a) { + return typeof a == 'string' ? SVG.regex.test(a, 'isStyle') : false } // Private: parse a matrix string , _parseMatrix: function(o) { @@ -746,7 +757,6 @@ }) - SVG.Container = function(element) { this.constructor.call(this, element) } @@ -756,55 +766,55 @@ // SVG.extend(SVG.Container, { + // Returns all child elements + children: function() { + return this._children || (this._children = []) + } // Add given element at a position - add: function(element, index) { + , add: function(element, i) { if (!this.has(element)) { /* define insertion index if none given */ - index = index == null ? this.children().length : index + i = i == null ? this.children().length : i /* remove references from previous parent */ if (element.parent) { - var i = element.parent.children().indexOf(element) - element.parent.children().splice(i, 1) + var index = element.parent.children().indexOf(element) + element.parent.children().splice(index, 1) } /* add element references */ - this.children().splice(index, 0, element) - this.node.insertBefore(element.node, this.node.childNodes[index] || null) + this.children().splice(i, 0, element) + this.node.insertBefore(element.node, this.node.childNodes[i] || null) element.parent = this } return this } - // Basically does the same as `add()` but returns the added element - , put: function(element, index) { - this.add(element, index) + // Basically does the same as `add()` but returns the added element instead + , put: function(element, i) { + this.add(element, i) return element } // Checks if the given element is a child , has: function(element) { return this.children().indexOf(element) >= 0 } - // Returns all child elements - , children: function() { - return this._children || (this._children = []) - } // Iterates over all children and invokes a given block , each: function(block) { var index, children = this.children() - + for (index = 0, length = children.length; index < length; index++) if (children[index] instanceof SVG.Shape) block.apply(children[index], [index, children]) - + return this } // Remove a child element at a position - , remove: function(element) { - var index = this.children().indexOf(element) + , removeElement: function(element) { + var i = this.children().indexOf(element) - this.children().splice(index, 1) + this.children().splice(i, 1) this.node.removeChild(element.node) element.parent = null @@ -812,15 +822,15 @@ } // Returns defs element , defs: function() { - return this._defs || (this._defs = this.put(new SVG.Defs(), 0)) + return this._defs || (this._defs = this.put(new SVG.Defs, 0)) } // Re-level defs to first positon in element stack , level: function() { - return this.remove(this.defs()).put(this.defs(), 0) + return this.removeElement(this.defs()).put(this.defs(), 0) } // Create a group element , group: function() { - return this.put(new SVG.G()) + return this.put(new SVG.G) } // Create a rect element , rect: function(width, height) { @@ -840,15 +850,15 @@ } // Create a wrapped polyline element , polyline: function(points) { - return this.put(new SVG.Wrap(new SVG.Polyline())).plot(points) + return this.put(new SVG.Polyline).plot(points) } // Create a wrapped polygon element , polygon: function(points) { - return this.put(new SVG.Wrap(new SVG.Polygon())).plot(points) + return this.put(new SVG.Polygon).plot(points) } // Create a wrapped path element , path: function(data) { - return this.put(new SVG.Wrap(new SVG.Path())).plot(data) + return this.put(new SVG.Path).plot(data) } // Create image element, load image and set its size , image: function(source, width, height) { @@ -861,7 +871,7 @@ } // Create nested svg document , nested: function() { - return this.put(new SVG.Nested()) + return this.put(new SVG.Nested) } // Create gradient element in defs , gradient: function(type, block) { @@ -873,7 +883,7 @@ } // Create masking element , mask: function() { - return this.defs().put(new SVG.Mask()) + return this.defs().put(new SVG.Mask) } // Get first child, skipping the defs node , first: function() { @@ -884,20 +894,22 @@ return this.children()[this.children().length - 1] } // Get the viewBox and calculate the zoom value - , viewbox: function() { - /* act as a getter if there are no arguments */ + , viewbox: function(v) { if (arguments.length == 0) + /* act as a getter if there are no arguments */ return new SVG.ViewBox(this) /* otherwise act as a setter */ - return this.attr('viewBox', Array.prototype.slice.call(arguments).join(' ')) + v = arguments.length == 1 ? + [v.x, v.y, v.width, v.height] : + Array.prototype.slice.call(arguments) + + return this.attr('viewBox', v.join(' ')) } // Remove all elements in this container , clear: function() { - this._children = [] - - while (this.node.hasChildNodes()) - this.node.removeChild(this.node.lastChild) + for (var i = this.children().length - 1; i >= 0; i--) + this.removeElement(this.children()[i]) return this } @@ -912,99 +924,122 @@ // SVG.extend(SVG.FX, { // Add animation parameters and start animation - animate: function(duration, ease) { - /* ensure default duration and easing */ - duration = duration == null ? 1000 : duration - ease = ease || '<>' - - var akeys, tkeys, skeys - , element = this.target - , fx = this - , start = new Date().getTime() - , finish = start + duration - - /* start animation */ - this.interval = setInterval(function(){ - // This code was borrowed from the emile.js micro framework by Thomas Fuchs, aka MadRobby. - var i, key - , time = new Date().getTime() - , pos = time > finish ? 1 : (time - start) / duration - - /* collect attribute keys */ - if (akeys == null) { - akeys = [] - for (key in fx.attrs) - akeys.push(key) - } - - /* collect transformation keys */ - if (tkeys == null) { - tkeys = [] - for (key in fx.trans) - tkeys.push(key) - } - - /* collect style keys */ - if (skeys == null) { - skeys = [] - for (key in fx.styles) - skeys.push(key) - } - - /* apply easing */ - pos = ease == '<>' ? - (-Math.cos(pos * Math.PI) / 2) + 0.5 : - ease == '>' ? - Math.sin(pos * Math.PI / 2) : - ease == '<' ? - -Math.cos(pos * Math.PI / 2) + 1 : - ease == '-' ? - pos : - typeof ease == 'function' ? - ease(pos) : - pos - - /* run all x-position properties */ - if (fx._x) - element.x(fx._at(fx._x, pos)) - else if (fx._cx) - element.cx(fx._at(fx._cx, pos)) - - /* run all y-position properties */ - if (fx._y) - element.y(fx._at(fx._y, pos)) - else if (fx._cy) - element.cy(fx._at(fx._cy, pos)) - - /* run all size properties */ - if (fx._size) - element.size(fx._at(fx._size.width, pos), fx._at(fx._size.height, pos)) - - /* animate attributes */ - for (i = akeys.length - 1; i >= 0; i--) - element.attr(akeys[i], fx._at(fx.attrs[akeys[i]], pos)) - - /* animate transformations */ - for (i = tkeys.length - 1; i >= 0; i--) - element.transform(tkeys[i], fx._at(fx.trans[tkeys[i]], pos)) - - /* animate styles */ - for (i = skeys.length - 1; i >= 0; i--) - element.style(skeys[i], fx._at(fx.styles[skeys[i]], pos)) + animate: function(d, ease, delay) { + var fx = this + + /* dissect object if one is passed */ + if (typeof d == 'object') { + delay = d.delay + ease = d.ease + d = d.duration + } + + /* delay animation */ + this.timeout = setTimeout(function() { - /* callback for each keyframe */ - if (fx._during) - fx._during.call(element, pos, function(from, to) { - return fx._at({ from: from, to: to }, pos) - }) + /* ensure default duration and easing */ + d = d == null ? 1000 : d + ease = ease || '<>' - /* finish off animation */ - if (time > finish) { - clearInterval(fx.interval) - fx._after ? fx._after.apply(element, [fx]) : fx.stop() - } + var akeys, tkeys, skeys + , interval = 1000 / 60 + , element = fx.target + , start = new Date().getTime() + , finish = start + d + + /* start animation */ + fx.interval = setInterval(function(){ + // This code was borrowed from the emile.js micro framework by Thomas Fuchs, aka MadRobby. + var i, key + , time = new Date().getTime() + , pos = time > finish ? 1 : (time - start) / d + + /* collect attribute keys */ + if (akeys == null) { + akeys = [] + for (key in fx.attrs) + akeys.push(key) + } + + /* collect transformation keys */ + if (tkeys == null) { + tkeys = [] + for (key in fx.trans) + tkeys.push(key) + } + + /* collect style keys */ + if (skeys == null) { + skeys = [] + for (key in fx.styles) + skeys.push(key) + } + + /* apply easing */ + pos = ease == '<>' ? + (-Math.cos(pos * Math.PI) / 2) + 0.5 : + ease == '>' ? + Math.sin(pos * Math.PI / 2) : + ease == '<' ? + -Math.cos(pos * Math.PI / 2) + 1 : + ease == '-' ? + pos : + typeof ease == 'function' ? + ease(pos) : + pos + + /* run all x-position properties */ + if (fx._x) + element.x(fx._at(fx._x, pos)) + else if (fx._cx) + element.cx(fx._at(fx._cx, pos)) + + /* run all y-position properties */ + if (fx._y) + element.y(fx._at(fx._y, pos)) + else if (fx._cy) + element.cy(fx._at(fx._cy, pos)) + + /* run all size properties */ + if (fx._size) + element.size(fx._at(fx._size.width, pos), fx._at(fx._size.height, pos)) + + /* run all viewbox properties */ + if (fx._viewbox) + element.viewbox( + fx._at(fx._viewbox.x, pos) + , fx._at(fx._viewbox.y, pos) + , fx._at(fx._viewbox.width, pos) + , fx._at(fx._viewbox.height, pos) + ) + + /* animate attributes */ + for (i = akeys.length - 1; i >= 0; i--) + element.attr(akeys[i], fx._at(fx.attrs[akeys[i]], pos)) + + /* animate transformations */ + for (i = tkeys.length - 1; i >= 0; i--) + element.transform(tkeys[i], fx._at(fx.trans[tkeys[i]], pos)) + + /* animate styles */ + for (i = skeys.length - 1; i >= 0; i--) + element.style(skeys[i], fx._at(fx.styles[skeys[i]], pos)) + + /* callback for each keyframe */ + if (fx._during) + fx._during.call(element, pos, function(from, to) { + return fx._at({ from: from, to: to }, pos) + }) + + /* finish off animation */ + if (time > finish) { + clearInterval(fx.interval) + fx._after ? fx._after.apply(element, [fx]) : fx.stop() + } + + }, d > interval ? interval : d) - }, duration > 10 ? 10 : duration) + }, delay || 0) return this } @@ -1059,29 +1094,25 @@ } // Animatable x-axis , x: function(x) { - var b = this.bbox() - this._x = { from: b.x, to: x } + this._x = { from: this.target.x(), to: x } return this } // Animatable y-axis , y: function(y) { - var b = this.bbox() - this._y = { from: b.y, to: y } + this._y = { from: this.target.y(), to: y } return this } // Animatable center x-axis , cx: function(x) { - var b = this.bbox() - this._cx = { from: b.cx, to: x } + this._cx = { from: this.target.cx(), to: x } return this } // Animatable center y-axis , cy: function(y) { - var b = this.bbox() - this._cy = { from: b.cy, to: y } + this._cy = { from: this.target.cy(), to: y } return this } @@ -1111,6 +1142,21 @@ return this } + // Add animatable viewbox + , viewbox: function(x, y, width, height) { + if (this.target instanceof SVG.Container) { + var box = this.target.viewbox() + + this._viewbox = { + x: { from: box.x, to: x } + , y: { from: box.y, to: y } + , width: { from: box.width, to: width } + , height: { from: box.height, to: height } + } + } + + return this + } // Add callback for each keyframe , during: function(during) { this._during = during @@ -1126,6 +1172,7 @@ // Stop running animation , stop: function() { /* stop current animation */ + clearTimeout(this.timeout) clearInterval(this.interval) /* reset storage for properties that need animation */ @@ -1139,10 +1186,11 @@ delete this._size delete this._after delete this._during + delete this._viewbox return this } - // Private: at position according to from and to + // Private: calculate position according to from and to , _at: function(o, pos) { /* number recalculation */ return typeof o.from == 'number' ? @@ -1165,7 +1213,7 @@ /* convert FROM unit */ match = SVG.regex.unit.exec(o.from.toString()) - from = parseFloat(match[1]) + from = parseFloat(match ? match[1] : 0) /* convert TO unit */ match = SVG.regex.unit.exec(o.to) @@ -1197,12 +1245,13 @@ // SVG.extend(SVG.Element, { // Get fx module or create a new one, then animate with given duration and ease - animate: function(duration, ease) { - return (this.fx || (this.fx = new SVG.FX(this))).stop().animate(duration, ease) + animate: function(d, ease, delay) { + return (this.fx || (this.fx = new SVG.FX(this))).stop().animate(d, ease, delay) }, // Stop current animation; this is an alias to the fx instance stop: function() { - this.fx.stop() + if (this.fx) + this.fx.stop() return this } @@ -1284,11 +1333,11 @@ SVG.extend(SVG.G, { // Move over x-axis x: function(x) { - return this.transform('x', x) + return x == null ? this.trans.x : this.transform('x', x) } // Move over y-axis , y: function(y) { - return this.transform('y', y) + return y == null ? this.trans.y : this.transform('y', y) } // Get defs , defs: function() { @@ -1316,7 +1365,7 @@ } // Send given element one step forward , forward: function() { - return this.parent.remove(this).put(this, this.position() + 1) + return this.parent.removeElement(this).put(this, this.position() + 1) } // Send given element one step backward , backward: function() { @@ -1325,20 +1374,20 @@ var i = this.position() if (i > 1) - this.parent.remove(this).add(this, i - 1) + this.parent.removeElement(this).add(this, i - 1) return this } // Send given element all the way to the front , front: function() { - return this.parent.remove(this).put(this) + return this.parent.removeElement(this).put(this) } // Send given element all the way to the back , back: function() { this.parent.level() if (this.position() > 1) - this.parent.remove(this).add(this, 0) + this.parent.removeElement(this).add(this, 0) return this } @@ -1360,7 +1409,6 @@ SVG.Mask.prototype = new SVG.Container SVG.extend(SVG.Element, { - // Distribute mask to svg element maskWith: function(element) { /* use given mask or create a new one */ @@ -1371,6 +1419,35 @@ }) + SVG.Clip = function Clip() { + this.constructor.call(this, SVG.create('clipPath')) + } + + // Inherit from SVG.Container + SVG.Clip.prototype = new SVG.Container + + SVG.extend(SVG.Element, { + + // Distribute clipPath to svg element + clipWith: function(element) { + /* use given clip or create a new one */ + this.clip = element instanceof SVG.Clip ? element : this.parent.clip().add(element) + + return this.attr('clip-path', 'url(#' + this.clip.attr('id') + ')') + } + + }) + + // Add container method + SVG.extend(SVG.Container, { + // Create clipping element + clip: function() { + return this.defs().put(new SVG.Clip) + } + + }) + + SVG.Pattern = function(type) { this.constructor.call(this, SVG.create('pattern')) } @@ -1462,8 +1539,7 @@ // SVG.extend(SVG.Defs, { - - /* define gradient */ + // define gradient gradient: function(type, block) { var element = this.put(new SVG.Gradient(type)) @@ -1488,8 +1564,7 @@ // SVG.extend(SVG.Stop, { - - /* add color stops */ + // add color stops update: function(o) { var index , attr = ['opacity', 'color'] @@ -1500,7 +1575,7 @@ this.style('stop-' + attr[index], o[attr[index]]) /* set attributes */ - return this.attr('offset', (o.offset != null ? o.offset : this.attrs.offset || 0) + '%') + return this.attr('offset', (o.offset != null ? o.offset : this.attr('offset')) + '%') } }) @@ -1574,89 +1649,6 @@ // Inherit from SVG.Element SVG.Shape.prototype = new SVG.Element - SVG.Wrap = function(element) { - this.constructor.call(this, SVG.create('g')) - - /* insert and store child */ - this.node.insertBefore(element.node, null) - this.child = element - this.type = element.node.nodeName - } - - // inherit from SVG.Shape - SVG.Wrap.prototype = new SVG.Shape() - - SVG.extend(SVG.Wrap, { - // Move over x-axis - x: function(x) { - return this.transform('x', x) - } - // Move over y-axis - , y: function(y) { - return this.transform('y', y) - } - // Set the actual size in pixels - , size: function(width, height) { - var scale = width / this._b.width - - this.child.transform({ - scaleX: scale - , scaleY: height != null ? height / this._b.height : scale - }) - - return this - } - // Move by center - , center: function(x, y) { - return this.move( - x + (this._b.width * this.child.trans.scaleX) / -2 - , y + (this._b.height * this.child.trans.scaleY) / -2 - ) - } - // Create distributed attr - , attr: function(a, v, n) { - /* call individual attributes if an object is given */ - if (typeof a == 'object') { - for (v in a) this.attr(v, a[v]) - - /* act as a getter if only one argument is given */ - } else if (arguments.length < 2) { - return a == 'transform' ? this.attrs[a] : this.child.attrs[a] - - /* apply locally for certain attributes */ - } else if (a == 'transform') { - this.attrs[a] = v - - n != null ? - this.node.setAttributeNS(n, a, v) : - this.node.setAttribute(a, v) - - /* apply attributes to child */ - } else { - this.child.attr(a, v, n) - } - - return this - } - // Distribute plot method to child - , plot: function(data) { - /* plot new shape */ - this.child.plot(data) - - /* get and store new bbox */ - this._b = this.child.bbox() - - /* reposition element withing wrapper */ - this.child.transform({ - x: -this._b.x - , y: -this._b.y - }) - - return this - } - - }) - SVG.Rect = function() { this.constructor.call(this, SVG.create('rect')) } @@ -1675,19 +1667,19 @@ SVG.extend(SVG.Ellipse, { // Move over x-axis x: function(x) { - return this.cx(x + this.attrs.rx) + return x == null ? this.cx() - this.attr('rx') : this.cx(x + this.attr('rx')) } // Move over y-axis , y: function(y) { - return this.cy(y + this.attrs.ry) + return y == null ? this.cy() - this.attr('ry') : this.cy(y + this.attr('ry')) } // Move by center over x-axis , cx: function(x) { - return this.attr('cx', x) + return x == null ? this.attr('cx') : this.attr('cx', x / this.trans.scaleX) } // Move by center over y-axis , cy: function(y) { - return this.attr('cy', y) + return y == null ? this.attr('cy') : this.attr('cy', y / this.trans.scaleY) } // Custom size function , size: function(width, height) { @@ -1716,48 +1708,42 @@ x: function(x) { var b = this.bbox() - return this.attr({ - x1: this.attrs.x1 - b.x + x - , x2: this.attrs.x2 - b.x + x + return x == null ? b.x : this.attr({ + x1: this.attr('x1') - b.x + x + , x2: this.attr('x2') - b.x + x }) } // Move over y-axis , y: function(y) { var b = this.bbox() - return this.attr({ - y1: this.attrs.y1 - b.y + y - , y2: this.attrs.y2 - b.y + y + return y == null ? b.y : this.attr({ + y1: this.attr('y1') - b.y + y + , y2: this.attr('y2') - b.y + y }) } // Move by center over x-axis , cx: function(x) { - return this.x(x - this.bbox().width / 2) + var half = this.bbox().width / 2 + return x == null ? this.x() + half : this.x(x - half) } // Move by center over y-axis , cy: function(y) { - return this.y(y - this.bbox().height / 2) + var half = this.bbox().height / 2 + return y == null ? this.y() + half : this.y(y - half) } // Set line size by width and height , size: function(width, height) { var b = this.bbox() return this - .attr(this.attrs.x1 < this.attrs.x2 ? 'x2' : 'x1', b.x + width) - .attr(this.attrs.y1 < this.attrs.y2 ? 'y2' : 'y1', b.y + height) + .attr(this.attr('x1') < this.attr('x2') ? 'x2' : 'x1', b.x + width) + .attr(this.attr('y1') < this.attr('y2') ? 'y2' : 'y1', b.y + height) } }) - SVG.Poly = { - // Set polygon data with default zero point if no data is passed - plot: function(points) { - this.attr('points', points || '0,0') - - return this - } - } - + SVG.Polyline = function() { this.constructor.call(this, SVG.create('polyline')) } @@ -1765,9 +1751,6 @@ // Inherit from SVG.Shape SVG.Polyline.prototype = new SVG.Shape - // Add polygon-specific functions - SVG.extend(SVG.Polyline, SVG.Poly) - SVG.Polygon = function() { this.constructor.call(this, SVG.create('polygon')) } @@ -1776,27 +1759,70 @@ SVG.Polygon.prototype = new SVG.Shape // Add polygon-specific functions - SVG.extend(SVG.Polygon, SVG.Poly) + SVG.extend(SVG.Polyline, SVG.Polygon, { + // Private: Native plot + _plot: function(p) { + if (Array.isArray(p)) { + var i, l, points = [] + + for (i = 0, l = p.length; i < l; i++) + points.push(p[i].join(',')) + + p = points.length == 0 ? points.join(' ') : '0,0' + } + + return this.attr('points', p || '0,0') + } + + }) SVG.Path = function() { this.constructor.call(this, SVG.create('path')) } // Inherit from SVG.Shape - SVG.Path.prototype = new SVG.Shape() + SVG.Path.prototype = new SVG.Shape SVG.extend(SVG.Path, { + // Private: Native plot + _plot: function(data) { + return this.attr('d', data || 'M0,0') + } + + }) + + SVG.extend(SVG.Polyline, SVG.Polygon, SVG.Path, { // Move over x-axis x: function(x) { - return this.transform('x', x) + return x == null ? this.bbox().x : this.transform('x', x) } // Move over y-axis , y: function(y) { - return this.transform('y', y) + return y == null ? this.bbox().y : this.transform('y', y) + } + // Set the actual size in pixels + , size: function(width, height) { + var scale = width / this._offset.width + + return this.transform({ + scaleX: scale + , scaleY: height != null ? height / this._offset.height : scale + }) } // Set path data , plot: function(data) { - return this.attr('d', data || 'M0,0') + var x = this.trans.scaleX + , y = this.trans.scaleY + + /* native plot */ + this._plot(data) + + /* get and store the actual offset of the element */ + this._offset = this.transform({ scaleX: 1, scaleY: 1 }).bbox() + this._offset.x -= this.trans.x + this._offset.y -= this.trans.y + + return this.transform({ scaleX: x, scaleY: y }) } }) @@ -1806,14 +1832,13 @@ } // Inherit from SVG.Element - SVG.Image.prototype = new SVG.Shape() + SVG.Image.prototype = new SVG.Shape SVG.extend(SVG.Image, { - /* (re)load image */ + // (re)load image load: function(url) { - this.src = url - return (url ? this.attr('xlink:href', url, SVG.xlink) : this) + return (url ? this.attr('xlink:href', (this.src = url), SVG.xlink) : this) } }) @@ -1826,7 +1851,7 @@ /* define default style */ this.styles = { 'font-size': 16 - , 'font-family': 'Helvetica' + , 'font-family': 'Helvetica, Arial, sans-serif' , 'text-anchor': 'start' } @@ -1837,8 +1862,37 @@ SVG.Text.prototype = new SVG.Shape SVG.extend(SVG.Text, { + // Move over x-axis + x: function(x, a) { + /* act as getter */ + if (x == null) return a ? this.attr('x') : this.bbox().x + + /* set x taking anchor in mind */ + if (!a) { + a = this.style('text-anchor') + x = a == 'start' ? x : a == 'end' ? x + this.bbox().width : x + this.bbox().width / 2 + } + + return this.attr('x', x) + } + // Move center over x-axis + , cx: function(x, a) { + return x == null ? this.bbox().cx : this.x(x - this.bbox().width / 2) + } + // Move center over y-axis + , cy: function(y, a) { + return y == null ? this.bbox().cy : this.y(a ? y : y - this.bbox().height / 2) + } + // Move element to given x and y values + , move: function(x, y, a) { + return this.x(x, a).y(y) + } + // Move element by its center + , center: function(x, y, a) { + return this.cx(x, a).cy(y, a) + } // Set the text content - text: function(text) { + , text: function(text) { /* act as getter */ if (text == null) return this.content @@ -1856,8 +1910,7 @@ for (i = 0, il = lines.length; i < il; i++) this.tspan(lines[i]) - /* set style */ - return this.attr('style', this.style()) + return this.attr('textLength', 1).attr('textLength', null) } // Create a tspan , tspan: function(text) { @@ -1869,17 +1922,6 @@ return tspan.attr('style', this.style()) } - // Move element by its center - , center: function(x, y) { - var anchor = this.style('text-anchor') - , box = this.bbox() - , x = anchor == 'start' ? - x - box.width / 2 : - anchor == 'end' ? - x + box.width / 2 : x - - return this.move(x, y - box.height / 2) - } // Set font size , size: function(size) { return this.attr('font-size', size) @@ -1903,8 +1945,8 @@ /* define position of all lines */ for (i = 0, il = this.lines.length; i < il; i++) this.lines[i].attr({ - dy: size * this._leading - (i == 0 ? size * 0.3 : 0) - , x: (this.attrs.x || 0) + dy: size * this._leading - (i == 0 ? size * 0.276666666 : 0) + , x: (this.attr('x') || 0) , style: this.style() }) @@ -1985,11 +2027,11 @@ SVG.extend(SVG.Element, SVG.FX, { // Rotation - rotate: function(deg, cx, cy) { + rotate: function(deg, x, y) { return this.transform({ rotation: deg || 0 - , cx: cx - , cy: cy + , cx: x + , cy: y }) } // Skew diff --git a/dist/svg.min.js b/dist/svg.min.js index 7fd6401..7302e4b 100644 --- a/dist/svg.min.js +++ b/dist/svg.min.js @@ -1,2 +1,2 @@ -/* svg.js v0.10-1-g4bd21ec - svg regex default color viewbox bbox element container fx event group arrange defs mask pattern gradient doc shape wrap rect ellipse line poly path image text nested sugar - svgjs.com/license */ -(function(){this.SVG=function(e){if(SVG.supported)return new SVG.Doc(e)},this.svg=function(e){return console.warn("WARNING: svg() is deprecated, please use SVG() instead."),SVG(e)},SVG.ns="http://www.w3.org/2000/svg",SVG.xlink="http://www.w3.org/1999/xlink",SVG.did=1e3,SVG.eid=function(e){return"Svgjs"+e.charAt(0).toUpperCase()+e.slice(1)+"Element"+SVG.did++},SVG.create=function(e){var t=document.createElementNS(this.ns,e);return t.setAttribute("id",this.eid(e)),t},SVG.extend=function(){var e,t,n,r;e=Array.prototype.slice.call(arguments),t=e.pop();for(r=e.length-1;r>=0;r--)if(e[r])for(n in t)e[r].prototype[n]=t[n]},SVG.supported=function(){return!!document.createElementNS&&!!document.createElementNS(SVG.ns,"svg").createSVGRect}();if(!SVG.supported)return!1;SVG.regex={unit:/^([\d\.]+)([a-z%]{0,2})$/,hex:/^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i,rgb:/rgb\((\d+),(\d+),(\d+),([\d\.]+)\)/,hsb:/hsb\((\d+),(\d+),(\d+),([\d\.]+)\)/,isHex:/^#[a-f0-9]{3,6}$/i,isRgb:/^rgb\(/,isHsb:/^hsb\(/,isCss:/[^:]+:[^;]+;?/,isStyle:/^font|text|leading|cursor/,isBlank:/^(\s+)?$/},SVG.default={matrix:"1,0,0,1,0,0",attrs:function(){return{"fill-opacity":1,"stroke-opacity":1,"stroke-width":0,fill:"#000",stroke:"#000",opacity:1,x:0,y:0,cx:0,cy:0,width:0,height:0,r:0,rx:0,ry:0}},trans:function(){return{x:0,y:0,scaleX:1,scaleY:1,rotation:0,skewX:0,skewY:0,matrix:this.matrix,a:1,b:0,c:0,d:1,e:0,f:0}}},SVG.Color=function(e){var t;this.r=0,this.g=0,this.b=0,typeof e=="string"?SVG.regex.isRgb.test(e)?(t=SVG.regex.rgb.exec(e.replace(/\s/g,"")),this.r=parseInt(m[1]),this.g=parseInt(m[2]),this.b=parseInt(m[3])):SVG.regex.isHex.test(e)?(t=SVG.regex.hex.exec(this._fullHex(e)),this.r=parseInt(t[1],16),this.g=parseInt(t[2],16),this.b=parseInt(t[3],16)):SVG.regex.isHsb.test(e)&&(t=SVG.regex.hsb.exec(e.replace(/\s/g,"")),e=this._hsbToRgb(t[1],t[2],t[3])):typeof e=="object"&&(SVG.Color.isHsb(e)&&(e=this._hsbToRgb(e.h,e.s,e.b)),this.r=e.r,this.g=e.g,this.b=e.b)},SVG.extend(SVG.Color,{toString:function(){return this.toHex()},toHex:function(){return"#"+this._compToHex(this.r)+this._compToHex(this.g)+this._compToHex(this.b)},toRgb:function(){return"rgb("+[this.r,this.g,this.b].join()+")"},brightness:function(){return this.r/255*.3+this.g/255*.59+this.b/255*.11},_hsbToRgb:function(e,t,n){var i,s;e=parseInt(e)%360,e<0&&(e+=360),t=parseInt(t),t=t>100?100:t,n=parseInt(n),n=(n<0?0:n>100?100:n)*255/100,i=n*t/100,s=i*(e*256/60%256)/256;switch(Math.floor(e/60)){case 0:r=n,g=n-i+s,b=n-i;break;case 1:r=n-s,g=n,b=n-i;break;case 2:r=n-i,g=n,b=n-i+s;break;case 3:r=n-i,g=n-s,b=n;break;case 4:r=n-i+s,g=n-i,b=n;break;case 5:r=n,g=n-i,b=n-s}return{r:Math.floor(r+.5),g:Math.floor(g+.5),b:Math.floor(b+.5)}},_fullHex:function(e){return e.length==4?["#",e.substring(1,2),e.substring(1,2),e.substring(2,3),e.substring(2,3),e.substring(3,4),e.substring(3,4)].join(""):e},_compToHex:function(e){var t=e.toString(16);return t.length==1?"0"+t:t}}),SVG.Color.test=function(e){return e+="",SVG.regex.isHex.test(e)||SVG.regex.isRgb.test(e)||SVG.regex.isHsb.test(e)},SVG.Color.isRgb=function(e){return typeof e.r=="number"},SVG.Color.isHsb=function(e){return typeof e.h=="number"},SVG.ViewBox=function(e){var t,n,r,i,s=e.bbox(),o=(e.attr("viewBox")||"").match(/[\d\.]+/g);this.x=s.x,this.y=s.y,this.width=e.node.offsetWidth||e.attr("width"),this.height=e.node.offsetHeight||e.attr("height"),o&&(t=parseFloat(o[0]),n=parseFloat(o[1]),r=parseFloat(o[2])-t,i=parseFloat(o[3])-n,this.zoom=this.width/this.height>r/i?this.height/i:this.width/r,this.x=t,this.y=n,this.width=r,this.height=i),this.zoom=this.zoom||1},SVG.extend(SVG.ViewBox,{toString:function(){return this.x+" "+this.y+" "+this.width+" "+this.height}}),SVG.BBox=function(e){var t=e.node.getBBox();this.x=t.x+e.trans.x,this.y=t.y+e.trans.y,this.cx=this.x+t.width/2,this.cy=this.x+t.height/2,this.width=t.width,this.height=t.height},SVG.Element=function(e){this.attrs=SVG.default.attrs(),this.styles={},this.trans=SVG.default.trans();if(this.node=e)this.type=e.nodeName,this.attrs.id=e.getAttribute("id")},SVG.extend(SVG.Element,{x:function(e){return this.attr("x",e)},y:function(e){return this.attr("y",e)},cx:function(e){return this.x(e-this.bbox().width/2)},cy:function(e){return this.y(e-this.bbox().height/2)},move:function(e,t){return this.x(e).y(t)},center:function(e,t){return this.cx(e).cy(t)},size:function(e,t){return this.attr({width:e,height:t})},clone:function(){var e;if(this instanceof SVG.Wrap)e=this.parent[this.child.node.nodeName](),e.attrs=this.attrs,e.child.trans=this.child.trans,e.child.attr(this.child.attrs).transform({}),e.plot&&e.plot(this.child.attrs[this.child instanceof SVG.Path?"d":"points"]);else{var t=this.node.nodeName;e=t=="rect"?this.parent[t](this.attrs.width,this.attrs.height):t=="ellipse"?this.parent[t](this.attrs.rx*2,this.attrs.ry*2):t=="image"?this.parent[t](this.src):t=="text"?this.parent[t](this.content):t=="g"?this.parent.group():this.parent[t](),e.attr(this.attrs)}return e.trans=this.trans,e.transform({})},remove:function(){return this.parent&&this.parent.remove(this),this},doc:function(){return this._parent(SVG.Doc)},nested:function(){return this._parent(SVG.Nested)},attr:function(e,t,n){if(arguments.length<2){if(typeof e!="object")return this._isStyle(e)?e=="text"?this.content:e=="leading"?this.leading():this.style(e):this.attrs[e]||this.node.getAttribute(e);for(t in e)this.attr(t,e[t])}else if(t===null)this.node.removeAttribute(e);else{if(e=="style")return this.style(t);this.attrs[e]=t;if(e=="x"&&this._isText())for(var r=this.lines.length-1;r>=0;r--)this.lines[r].attr(e,t);else{e=="stroke-width"&&this.attr("stroke",parseFloat(t)>0?this.attrs.stroke:null);if(SVG.Color.test(t)||SVG.Color.isRgb(t)||SVG.Color.isHsb(t))t=(new SVG.Color(t)).toHex();n!=null?this.node.setAttributeNS(n,e,t):this.node.setAttribute(e,t)}this._isStyle(e)&&(e=="text"?this.text(t):e=="leading"?this.leading(t):this.style(e,t),this.rebuild&&this.rebuild())}return this},transform:function(e,t){if(typeof e=="string"){if(arguments.length<2)return this.trans[e];var n={};return n[e]=t,this.transform(n)}var n=[];e=this._parseMatrix(e);for(t in e)e[t]!=null&&(this.trans[t]=e[t]);return this.trans.matrix=this.trans.a+","+this.trans.b+","+this.trans.c+","+this.trans.d+","+this.trans.e+","+this.trans.f,e=this.trans,e.matrix!=SVG.default.matrix&&n.push("matrix("+e.matrix+")"),e.rotation!=0&&n.push("rotate("+e.rotation+","+(e.cx!=null?e.cx:this.bbox().cx)+","+(e.cy!=null?e.cy:this.bbox().cy)+")"),(e.scaleX!=1||e.scaleY!=1)&&n.push("scale("+e.scaleX+","+e.scaleY+")"),e.skewX!=0&&n.push("skewX("+e.skewX+")"),e.skewY!=0&&n.push("skewY("+e.skewY+")"),(e.x!=0||e.y!=0)&&n.push("translate("+e.x+","+e.y+")"),this.node.setAttribute("transform",n.join(" ")),this},style:function(e,t){if(arguments.length==0)return this.attr("style");if(arguments.length<2)if(typeof e=="object")for(t in e)this.style(t,e[t]);else{if(!SVG.regex.isCss.test(e))return this.styles[e];e=e.split(";");for(var n=0;n<e.length;n++)t=e[n].split(":"),t.length==2&&this.style(t[0].replace(/\s+/g,""),t[1].replace(/^\s+/,"").replace(/\s+$/,""))}else t===null?delete this.styles[e]:this.styles[e]=t;e="";for(t in this.styles)e+=t+":"+this.styles[t]+";";return this.node.setAttribute("style",e),this},data:function(e,t,n){if(arguments.length<2)try{return JSON.parse(this.attr("data-"+e))}catch(r){return this.attr("data-"+e)}else this.attr("data-"+e,t===null?null:n===!0?t:JSON.stringify(t));return this},bbox:function(){return new SVG.BBox(this)},inside:function(e,t){var n=this.bbox();return e>n.x&&t>n.y&&e<n.x+n.width&&t<n.y+n.height},show:function(){return this.style("display","")},hide:function(){return this.style("display","none")},visible:function(){return this.style("display")!="none"},_parent:function(e){var t=this;while(t!=null&&!(t instanceof e))t=t.parent;return t},_isStyle:function(e){return typeof e=="string"?SVG.regex.isStyle.test(e):!1},_isText:function(){return this instanceof SVG.Text},_parseMatrix:function(e){if(e.matrix){var t=e.matrix.replace(/\s/g,"").split(",");t.length==6&&(e.a=parseFloat(t[0]),e.b=parseFloat(t[1]),e.c=parseFloat(t[2]),e.d=parseFloat(t[3]),e.e=parseFloat(t[4]),e.f=parseFloat(t[5]))}return e}}),SVG.Container=function(e){this.constructor.call(this,e)},SVG.Container.prototype=new SVG.Element,SVG.extend(SVG.Container,{add:function(e,t){if(!this.has(e)){t=t==null?this.children().length:t;if(e.parent){var n=e.parent.children().indexOf(e);e.parent.children().splice(n,1)}this.children().splice(t,0,e),this.node.insertBefore(e.node,this.node.childNodes[t]||null),e.parent=this}return this},put:function(e,t){return this.add(e,t),e},has:function(e){return this.children().indexOf(e)>=0},children:function(){return this._children||(this._children=[])},each:function(e){var t,n=this.children();for(t=0,length=n.length;t<length;t++)n[t]instanceof SVG.Shape&&e.apply(n[t],[t,n]);return this},remove:function(e){var t=this.children().indexOf(e);return this.children().splice(t,1),this.node.removeChild(e.node),e.parent=null,this},defs:function(){return this._defs||(this._defs=this.put(new SVG.Defs,0))},level:function(){return this.remove(this.defs()).put(this.defs(),0)},group:function(){return this.put(new SVG.G)},rect:function(e,t){return this.put((new SVG.Rect).size(e,t))},circle:function(e){return this.ellipse(e,e)},ellipse:function(e,t){return this.put((new SVG.Ellipse).size(e,t).move(0,0))},line:function(e,t,n,r){return this.put((new SVG.Line).attr({x1:e,y1:t,x2:n,y2:r}))},polyline:function(e){return this.put(new SVG.Wrap(new SVG.Polyline)).plot(e)},polygon:function(e){return this.put(new SVG.Wrap(new SVG.Polygon)).plot(e)},path:function(e){return this.put(new SVG.Wrap(new SVG.Path)).plot(e)},image:function(e,t,n){return t=t!=null?t:100,this.put((new SVG.Image).load(e).size(t,n!=null?n:t))},text:function(e){return this.put((new SVG.Text).text(e))},nested:function(){return this.put(new SVG.Nested)},gradient:function(e,t){return this.defs().gradient(e,t)},pattern:function(e,t,n){return this.defs().pattern(e,t,n)},mask:function(){return this.defs().put(new SVG.Mask)},first:function(){return this.children()[0]instanceof SVG.Defs?this.children()[1]:this.children()[0]},last:function(){return this.children()[this.children().length-1]},viewbox:function(){return arguments.length==0?new SVG.ViewBox(this):this.attr("viewBox",Array.prototype.slice.call(arguments).join(" "))},clear:function(){this._children=[];while(this.node.hasChildNodes())this.node.removeChild(this.node.lastChild);return this}}),SVG.FX=function(e){this.target=e},SVG.extend(SVG.FX,{animate:function(e,t){e=e==null?1e3:e,t=t||"<>";var n,r,i,s=this.target,o=this,u=(new Date).getTime(),a=u+e;return this.interval=setInterval(function(){var f,l,c=(new Date).getTime(),h=c>a?1:(c-u)/e;if(n==null){n=[];for(l in o.attrs)n.push(l)}if(r==null){r=[];for(l in o.trans)r.push(l)}if(i==null){i=[];for(l in o.styles)i.push(l)}h=t=="<>"?-Math.cos(h*Math.PI)/2+.5:t==">"?Math.sin(h*Math.PI/2):t=="<"?-Math.cos(h*Math.PI/2)+1:t=="-"?h:typeof t=="function"?t(h):h,o._x?s.x(o._at(o._x,h)):o._cx&&s.cx(o._at(o._cx,h)),o._y?s.y(o._at(o._y,h)):o._cy&&s.cy(o._at(o._cy,h)),o._size&&s.size(o._at(o._size.width,h),o._at(o._size.height,h));for(f=n.length-1;f>=0;f--)s.attr(n[f],o._at(o.attrs[n[f]],h));for(f=r.length-1;f>=0;f--)s.transform(r[f],o._at(o.trans[r[f]],h));for(f=i.length-1;f>=0;f--)s.style(i[f],o._at(o.styles[i[f]],h));o._during&&o._during.call(s,h,function(e,t){return o._at({from:e,to:t},h)}),c>a&&(clearInterval(o.interval),o._after?o._after.apply(s,[o]):o.stop())},e>10?10:e),this},bbox:function(){return this.target.bbox()},attr:function(e,t,n){if(typeof e=="object")for(var r in e)this.attr(r,e[r]);else this.attrs[e]={from:this.target.attr(e),to:t};return this},transform:function(e,t){if(arguments.length==1){e=this.target._parseMatrix(e),delete e.matrix;for(t in e)this.trans[t]={from:this.target.trans[t],to:e[t]}}else{var n={};n[e]=t,this.transform(n)}return this},style:function(e,t){if(typeof e=="object")for(var n in e)this.style(n,e[n]);else this.styles[e]={from:this.target.style(e),to:t};return this},x:function(e){var t=this.bbox();return this._x={from:t.x,to:e},this},y:function(e){var t=this.bbox();return this._y={from:t.y,to:e},this},cx:function(e){var t=this.bbox();return this._cx={from:t.cx,to:e},this},cy:function(e){var t=this.bbox();return this._cy={from:t.cy,to:e},this},move:function(e,t){return this.x(e).y(t)},center:function(e,t){return this.cx(e).cy(t)},size:function(e,t){if(this.target instanceof SVG.Text)this.attr("font-size",e);else{var n=this.target.bbox();this._size={width:{from:n.width,to:e},height:{from:n.height,to:t}}}return this},during:function(e){return this._during=e,this},after:function(e){return this._after=e,this},stop:function(){return clearInterval(this.interval),this.attrs={},this.trans={},this.styles={},delete this._x,delete this._y,delete this._cx,delete this._cy,delete this._size,delete this._after,delete this._during,this},_at:function(e,t){return typeof e.from=="number"?e.from+(e.to-e.from)*t:SVG.regex.unit.test(e.to)?this._unit(e,t):e.to&&(e.to.r||SVG.Color.test(e.to))?this._color(e,t):t<1?e.from:e.to},_unit:function(e,t){var n,r;return n=SVG.regex.unit.exec(e.from.toString()),r=parseFloat(n[1]),n=SVG.regex.unit.exec(e.to),r+(parseFloat(n[1])-r)*t+n[2]},_color:function(e,t){var n,r;return t=t<0?0:t>1?1:t,n=new SVG.Color(e.from),r=new SVG.Color(e.to),(new SVG.Color({r:~~(n.r+(r.r-n.r)*t),g:~~(n.g+(r.g-n.g)*t),b:~~(n.b+(r.b-n.b)*t)})).toHex()}}),SVG.extend(SVG.Element,{animate:function(e,t){return(this.fx||(this.fx=new SVG.FX(this))).stop().animate(e,t)},stop:function(){return this.fx.stop(),this}}),["click","dblclick","mousedown","mouseup","mouseover","mouseout","mousemove","mouseenter","mouseleave","touchstart","touchend","touchmove","touchcancel"].forEach(function(e){SVG.Element.prototype[e]=function(t){var n=this;return this.node["on"+e]=typeof t=="function"?function(){return t.apply(n,arguments)}:null,this}}),SVG.on=function(e,t,n){e.addEventListener?e.addEventListener(t,n,!1):e.attachEvent("on"+t,n)},SVG.off=function(e,t,n){e.removeEventListener?e.removeEventListener(t,n,!1):e.detachEvent("on"+t,n)},SVG.extend(SVG.Element,{on:function(e,t){return SVG.on(this.node,e,t),this},off:function(e,t){return SVG.off(this.node,e,t),this}}),SVG.G=function(){this.constructor.call(this,SVG.create("g"))},SVG.G.prototype=new SVG.Container,SVG.extend(SVG.G,{x:function(e){return this.transform("x",e)},y:function(e){return this.transform("y",e)},defs:function(){return this.doc().defs()}}),SVG.extend(SVG.Element,{siblings:function(){return this.parent.children()},position:function(){return this.siblings().indexOf(this)},next:function(){return this.siblings()[this.position()+1]},previous:function(){return this.siblings()[this.position()-1]},forward:function(){return this.parent.remove(this).put(this,this.position()+1)},backward:function(){this.parent.level();var e=this.position();return e>1&&this.parent.remove(this).add(this,e-1),this},front:function(){return this.parent.remove(this).put(this)},back:function(){return this.parent.level(),this.position()>1&&this.parent.remove(this).add(this,0),this}}),SVG.Defs=function(){this.constructor.call(this,SVG.create("defs"))},SVG.Defs.prototype=new SVG.Container,SVG.Mask=function(){this.constructor.call(this,SVG.create("mask"))},SVG.Mask.prototype=new SVG.Container,SVG.extend(SVG.Element,{maskWith:function(e){return this.mask=e instanceof SVG.Mask?e:this.parent.mask().add(e),this.attr("mask","url(#"+this.mask.attr("id")+")")}}),SVG.Pattern=function(e){this.constructor.call(this,SVG.create("pattern"))},SVG.Pattern.prototype=new SVG.Container,SVG.extend(SVG.Pattern,{fill:function(){return"url(#"+this.attr("id")+")"}}),SVG.extend(SVG.Defs,{pattern:function(e,t,n){var r=this.put(new SVG.Pattern);return n(r),r.attr({x:0,y:0,width:e,height:t,patternUnits:"userSpaceOnUse"})}}),SVG.Gradient=function(e){this.constructor.call(this,SVG.create(e+"Gradient")),this.type=e},SVG.Gradient.prototype=new SVG.Container,SVG.extend(SVG.Gradient,{from:function(e,t){return this.type=="radial"?this.attr({fx:e+"%",fy:t+"%"}):this.attr({x1:e+"%",y1:t+"%"})},to:function(e,t){return this.type=="radial"?this.attr({cx:e+"%",cy:t+"%"}):this.attr({x2:e+"%",y2:t+"%"})},radius:function(e){return this.type=="radial"?this.attr({r:e+"%"}):this},at:function(e){return this.put(new SVG.Stop(e))},update:function(e){while(this.node.hasChildNodes())this.node.removeChild(this.node.lastChild);return e(this),this},fill:function(){return"url(#"+this.attr("id")+")"}}),SVG.extend(SVG.Defs,{gradient:function(e,t){var n=this.put(new SVG.Gradient(e));return t(n),n}}),SVG.Stop=function(e){this.constructor.call(this,SVG.create("stop")),this.update(e)},SVG.Stop.prototype=new SVG.Element,SVG.extend(SVG.Stop,{update:function(e){var t,n=["opacity","color"];for(t=n.length-1;t>=0;t--)e[n[t]]!=null&&this.style("stop-"+n[t],e[n[t]]);return this.attr("offset",(e.offset!=null?e.offset:this.attrs.offset||0)+"%")}}),SVG.Doc=function(e){this.constructor.call(this,SVG.create("svg")),this.parent=typeof e=="string"?document.getElementById(e):e,this.attr({xmlns:SVG.ns,version:"1.1",width:"100%",height:"100%"}).attr("xlink",SVG.xlink,SVG.ns).defs(),this.stage()},SVG.Doc.prototype=new SVG.Container,SVG.Doc.prototype.stage=function(){var e,t=this,n=document.createElement("div");return n.style.cssText="position:relative;height:100%;",t.parent.appendChild(n),n.appendChild(t.node),e=function(){document.readyState==="complete"?(t.style("position:absolute;"),setTimeout(function(){t.style("position:relative;"),t.parent.removeChild(t.node.parentNode),t.node.parentNode.removeChild(t.node),t.parent.appendChild(t.node)},5)):setTimeout(e,10)},e(),this},SVG.Shape=function(e){this.constructor.call(this,e)},SVG.Shape.prototype=new SVG.Element,SVG.Wrap=function(e){this.constructor.call(this,SVG.create("g")),this.node.insertBefore(e.node,null),this.child=e,this.type=e.node.nodeName},SVG.Wrap.prototype=new SVG.Shape,SVG.extend(SVG.Wrap,{x:function(e){return this.transform("x",e)},y:function(e){return this.transform("y",e)},size:function(e,t){var n=e/this._b.width;return this.child.transform({scaleX:n,scaleY:t!=null?t/this._b.height:n}),this},center:function(e,t){return this.move(e+this._b.width*this.child.trans.scaleX/-2,t+this._b.height*this.child.trans.scaleY/-2)},attr:function(e,t,n){if(typeof e=="object")for(t in e)this.attr(t,e[t]);else{if(arguments.length<2)return e=="transform"?this.attrs[e]:this.child.attrs[e];e=="transform"?(this.attrs[e]=t,n!=null?this.node.setAttributeNS(n,e,t):this.node.setAttribute(e,t)):this.child.attr(e,t,n)}return this},plot:function(e){return this.child.plot(e),this._b=this.child.bbox(),this.child.transform({x:-this._b.x,y:-this._b.y}),this}}),SVG.Rect=function(){this.constructor.call(this,SVG.create("rect"))},SVG.Rect.prototype=new SVG.Shape,SVG.Ellipse=function(){this.constructor.call(this,SVG.create("ellipse"))},SVG.Ellipse.prototype=new SVG.Shape,SVG.extend(SVG.Ellipse,{x:function(e){return this.cx(e+this.attrs.rx)},y:function(e){return this.cy(e+this.attrs.ry)},cx:function(e){return this.attr("cx",e)},cy:function(e){return this.attr("cy",e)},size:function(e,t){return this.attr({rx:e/2,ry:t/2})}}),SVG.Line=function(){this.constructor.call(this,SVG.create("line"))},SVG.Line.prototype=new SVG.Shape,SVG.extend(SVG.Line,{x:function(e){var t=this.bbox();return this.attr({x1:this.attrs.x1-t.x+e,x2:this.attrs.x2-t.x+e})},y:function(e){var t=this.bbox();return this.attr({y1:this.attrs.y1-t.y+e,y2:this.attrs.y2-t.y+e})},cx:function(e){return this.x(e-this.bbox().width/2)},cy:function(e){return this.y(e-this.bbox().height/2)},size:function(e,t){var n=this.bbox();return this.attr(this.attrs.x1<this.attrs.x2?"x2":"x1",n.x+e).attr(this.attrs.y1<this.attrs.y2?"y2":"y1",n.y+t)}}),SVG.Poly={plot:function(e){return this.attr("points",e||"0,0"),this}},SVG.Polyline=function(){this.constructor.call(this,SVG.create("polyline"))},SVG.Polyline.prototype=new SVG.Shape,SVG.extend(SVG.Polyline,SVG.Poly),SVG.Polygon=function(){this.constructor.call(this,SVG.create("polygon"))},SVG.Polygon.prototype=new SVG.Shape,SVG.extend(SVG.Polygon,SVG.Poly),SVG.Path=function(){this.constructor.call(this,SVG.create("path"))},SVG.Path.prototype=new SVG.Shape,SVG.extend(SVG.Path,{x:function(e){return this.transform("x",e)},y:function(e){return this.transform("y",e)},plot:function(e){return this.attr("d",e||"M0,0")}}),SVG.Image=function(){this.constructor.call(this,SVG.create("image"))},SVG.Image.prototype=new SVG.Shape,SVG.extend(SVG.Image,{load:function(e){return this.src=e,e?this.attr("xlink:href",e,SVG.xlink):this}});var e="size family weight stretch variant style".split(" ");SVG.Text=function(){this.constructor.call(this,SVG.create("text")),this.styles={"font-size":16,"font-family":"Helvetica","text-anchor":"start"},this._leading=1.2},SVG.Text.prototype=new SVG.Shape,SVG.extend(SVG.Text,{text:function(e){if(e==null)return this.content;this.clear(),this.content=SVG.regex.isBlank.test(e)?"text":e;var t,n,r=e.split("\n");for(t=0,n=r.length;t<n;t++)this.tspan(r[t]);return this.attr("style",this.style())},tspan:function(e){var t=(new SVG.TSpan).text(e);return this.node.appendChild(t.node),this.lines.push(t),t.attr("style",this.style())},center:function(e,t){var n=this.style("text-anchor"),r=this.bbox(),e=n=="start"?e-r.width/2:n=="end"?e+r.width/2:e;return this.move(e,t-r.height/2)},size:function(e){return this.attr("font-size",e)},leading:function(e){return e==null?this._leading:(this._leading=e,this.rebuild())},rebuild:function(){var e,t,n=this.styles["font-size"];for(e=0,t=this.lines.length;e<t;e++)this.lines[e].attr({dy:n*this._leading-(e==0?n*.3:0),x:this.attrs.x||0,style:this.style()});return this},clear:function(){while(this.node.hasChildNodes())this.node.removeChild(this.node.lastChild);return this.lines=[],this}}),SVG.TSpan=function(){this.constructor.call(this,SVG.create("tspan"))},SVG.TSpan.prototype=new SVG.Shape,SVG.extend(SVG.TSpan,{text:function(e){return this.node.appendChild(document.createTextNode(e)),this}}),SVG.Nested=function(){this.constructor.call(this,SVG.create("svg")),this.style("overflow","visible")},SVG.Nested.prototype=new SVG.Container,SVG._stroke=["color","width","opacity","linecap","linejoin","miterlimit","dasharray","dashoffset"],SVG._fill=["color","opacity","rule"];var t=function(e,t){return t=="color"?e:e+"-"+t};["fill","stroke"].forEach(function(e){var n={};n[e]=function(n){var r;if(typeof n=="string"||SVG.Color.isRgb(n)||SVG.Color.isHsb(n))this.attr(e,n);else for(index=SVG["_"+e].length-1;index>=0;index--)n[SVG["_"+e][index]]!=null&&this.attr(t(e,SVG["_"+e][index]),n[SVG["_"+e][index]]);return this},SVG.extend(SVG.Shape,SVG.FX,n)}),SVG.extend(SVG.Element,SVG.FX,{rotate:function(e,t,n){return this.transform({rotation:e||0,cx:t,cy:n})},skew:function(e,t){return this.transform({skewX:e||0,skewY:t||0})},scale:function(e,t){return this.transform({scaleX:e,scaleY:t==null?e:t})},matrix:function(e){return this.transform({matrix:e})},opacity:function(e){return this.attr("opacity",e)}}),SVG.Text&&SVG.extend(SVG.Text,SVG.FX,{font:function(t){for(var n in t)n=="anchor"?this.attr("text-anchor",t[n]):e.indexOf(n)>-1?this.attr("font-"+n,t[n]):this.attr(n,t[n]);return this}})}).call(this);
\ No newline at end of file +/* svg.js v0.11 - svg regex default color viewbox bbox element container fx event group arrange defs mask clip pattern gradient doc shape rect ellipse line poly path plotable image text nested sugar - svgjs.com/license */ +(function(){this.SVG=function(e){if(SVG.supported)return new SVG.Doc(e)},this.svg=function(e){return console.warn("WARNING: svg() is deprecated, please use SVG() instead."),SVG(e)},SVG.ns="http://www.w3.org/2000/svg",SVG.xlink="http://www.w3.org/1999/xlink",SVG.did=1e3,SVG.eid=function(e){return"Svgjs"+e.charAt(0).toUpperCase()+e.slice(1)+SVG.did++},SVG.create=function(e){var t=document.createElementNS(this.ns,e);return t.setAttribute("id",this.eid(e)),t},SVG.extend=function(){var e,t,n,r;e=Array.prototype.slice.call(arguments),t=e.pop();for(r=e.length-1;r>=0;r--)if(e[r])for(n in t)e[r].prototype[n]=t[n]},SVG.get=function(e){var t=document.getElementById(e);if(t)return t.instance},SVG.supported=function(){return!!document.createElementNS&&!!document.createElementNS(SVG.ns,"svg").createSVGRect}();if(!SVG.supported)return!1;SVG.regex={test:function(e,t){return this[t].test(e)},unit:/^([\d\.]+)([a-z%]{0,2})$/,hex:/^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i,rgb:/rgb\((\d+),(\d+),(\d+),([\d\.]+)\)/,hsb:/hsb\((\d+),(\d+),(\d+),([\d\.]+)\)/,isHex:/^#[a-f0-9]{3,6}$/i,isRgb:/^rgb\(/,isHsb:/^hsb\(/,isCss:/[^:]+:[^;]+;?/,isStyle:/^font|text|leading|cursor/,isBlank:/^(\s+)?$/,isNumber:/^-?[\d\.]+$/},SVG.default={matrix:"1,0,0,1,0,0",attrs:{"fill-opacity":1,"stroke-opacity":1,"stroke-width":0,fill:"#000",stroke:"#000",opacity:1,x:0,y:0,cx:0,cy:0,width:0,height:0,r:0,rx:0,ry:0,offset:0},trans:function(){return{x:0,y:0,scaleX:1,scaleY:1,rotation:0,skewX:0,skewY:0,matrix:this.matrix,a:1,b:0,c:0,d:1,e:0,f:0}}},SVG.Color=function(e){var t;this.r=0,this.g=0,this.b=0,typeof e=="string"?SVG.regex.isRgb.test(e)?(t=SVG.regex.rgb.exec(e.replace(/\s/g,"")),this.r=parseInt(m[1]),this.g=parseInt(m[2]),this.b=parseInt(m[3])):SVG.regex.isHex.test(e)?(t=SVG.regex.hex.exec(this._fullHex(e)),this.r=parseInt(t[1],16),this.g=parseInt(t[2],16),this.b=parseInt(t[3],16)):SVG.regex.isHsb.test(e)&&(t=SVG.regex.hsb.exec(e.replace(/\s/g,"")),e=this._hsbToRgb(t[1],t[2],t[3])):typeof e=="object"&&(SVG.Color.isHsb(e)&&(e=this._hsbToRgb(e.h,e.s,e.b)),this.r=e.r,this.g=e.g,this.b=e.b)},SVG.extend(SVG.Color,{toString:function(){return this.toHex()},toHex:function(){return"#"+this._compToHex(this.r)+this._compToHex(this.g)+this._compToHex(this.b)},toRgb:function(){return"rgb("+[this.r,this.g,this.b].join()+")"},brightness:function(){return this.r/255*.3+this.g/255*.59+this.b/255*.11},_hsbToRgb:function(e,t,n){var i,s;e=parseInt(e)%360,e<0&&(e+=360),t=parseInt(t),t=t>100?100:t,n=parseInt(n),n=(n<0?0:n>100?100:n)*255/100,i=n*t/100,s=i*(e*256/60%256)/256;switch(Math.floor(e/60)){case 0:r=n,g=n-i+s,b=n-i;break;case 1:r=n-s,g=n,b=n-i;break;case 2:r=n-i,g=n,b=n-i+s;break;case 3:r=n-i,g=n-s,b=n;break;case 4:r=n-i+s,g=n-i,b=n;break;case 5:r=n,g=n-i,b=n-s}return{r:Math.floor(r+.5),g:Math.floor(g+.5),b:Math.floor(b+.5)}},_fullHex:function(e){return e.length==4?["#",e.substring(1,2),e.substring(1,2),e.substring(2,3),e.substring(2,3),e.substring(3,4),e.substring(3,4)].join(""):e},_compToHex:function(e){var t=e.toString(16);return t.length==1?"0"+t:t}}),SVG.Color.test=function(e){return e+="",SVG.regex.isHex.test(e)||SVG.regex.isRgb.test(e)||SVG.regex.isHsb.test(e)},SVG.Color.isRgb=function(e){return e&&typeof e.r=="number"},SVG.Color.isHsb=function(e){return e&&typeof e.h=="number"},SVG.ViewBox=function(e){var t,n,r,i,s=e.bbox(),o=(e.attr("viewBox")||"").match(/[\d\.]+/g);this.x=s.x,this.y=s.y,this.width=e.node.offsetWidth||e.attr("width"),this.height=e.node.offsetHeight||e.attr("height"),o&&(t=parseFloat(o[0]),n=parseFloat(o[1]),r=parseFloat(o[2])-t,i=parseFloat(o[3])-n,this.zoom=this.width/this.height>r/i?this.height/i:this.width/r,this.x=t,this.y=n,this.width=r,this.height=i),this.zoom=this.zoom||1},SVG.extend(SVG.ViewBox,{toString:function(){return this.x+" "+this.y+" "+this.width+" "+this.height}}),SVG.BBox=function(e){var t=e.node.getBBox();this.x=t.x+e.trans.x,this.y=t.y+e.trans.y,this.width=t.width*e.trans.scaleX,this.height=t.height*e.trans.scaleY,this.cx=this.x+this.width/2,this.cy=this.y+this.height/2},SVG.Element=function(e){this._stroke=SVG.default.attrs.stroke,this.styles={},this.trans=SVG.default.trans();if(this.node=e)this.type=e.nodeName,this.node.instance=this},SVG.extend(SVG.Element,{x:function(e){return e&&(e/=this.trans.scaleX),this.attr("x",e)},y:function(e){return e&&(e/=this.trans.scaleY),this.attr("y",e)},cx:function(e){return e==null?this.bbox().cx:this.x(e-this.bbox().width/2)},cy:function(e){return e==null?this.bbox().cy:this.y(e-this.bbox().height/2)},move:function(e,t){return this.x(e).y(t)},center:function(e,t){return this.cx(e).cy(t)},size:function(e,t){return this.attr({width:e,height:t})},clone:function(){var e,t,n=this.type;return e=n=="rect"||n=="ellipse"?this.parent[n](0,0):n=="line"?this.parent[n](0,0,0,0):n=="image"?this.parent[n](this.src):n=="text"?this.parent[n](this.content):n=="path"?this.parent[n](this.attr("d")):n=="polyline"||n=="polygon"?this.parent[n](this.attr("points")):n=="g"?this.parent.group():this.parent[n](),t=this.attr(),delete t.id,e.attr(t),e.trans=this.trans,e.transform({})},remove:function(){return this.parent&&this.parent.removeElement(this),this},doc:function(e){return this._parent(e||SVG.Doc)},attr:function(e,t,n){if(e==null){e={},t=this.node.attributes;for(n=t.length-1;n>=0;n--)e[t[n].nodeName]=t[n].nodeValue;return e}if(typeof e=="object")for(t in e)this.attr(t,e[t]);else if(t===null)this.node.removeAttribute(e);else{if(t==null)return this._isStyle(e)?e=="text"?this.content:e=="leading"?this.leading():this.style(e):(t=this.node.getAttribute(e),t==null?SVG.default.attrs[e]:SVG.regex.test(t,"isNumber")?parseFloat(t):t);if(e=="style")return this.style(t);if(e=="x"&&this instanceof SVG.Text)for(n=this.lines.length-1;n>=0;n--)this.lines[n].attr(e,t);e=="stroke-width"?this.attr("stroke",parseFloat(t)>0?this._stroke:null):e=="stroke"&&(this._stroke=t);if(SVG.Color.test(t)||SVG.Color.isRgb(t)||SVG.Color.isHsb(t))t=(new SVG.Color(t)).toHex();n!=null?this.node.setAttributeNS(n,e,t):this.node.setAttribute(e,t),this._isStyle(e)&&(e=="text"?this.text(t):e=="leading"?this.leading(t):this.style(e,t),this.rebuild&&this.rebuild())}return this},transform:function(e,t){if(typeof e=="string"){if(arguments.length<2)return this.trans[e];var n={};return n[e]=t,this.transform(n)}var n=[];e=this._parseMatrix(e);for(t in e)e[t]!=null&&(this.trans[t]=e[t]);return this.trans.matrix=this.trans.a+","+this.trans.b+","+this.trans.c+","+this.trans.d+","+this.trans.e+","+this.trans.f,e=this.trans,e.matrix!=SVG.default.matrix&&n.push("matrix("+e.matrix+")"),e.rotation!=0&&n.push("rotate("+e.rotation+","+(e.cx!=null?e.cx:this.bbox().cx)+","+(e.cy!=null?e.cy:this.bbox().cy)+")"),(e.scaleX!=1||e.scaleY!=1)&&n.push("scale("+e.scaleX+","+e.scaleY+")"),e.skewX!=0&&n.push("skewX("+e.skewX+")"),e.skewY!=0&&n.push("skewY("+e.skewY+")"),(e.x!=0||e.y!=0)&&n.push("translate("+e.x/e.scaleX+","+e.y/e.scaleY+")"),this._offset&&n.push("translate("+ -this._offset.x+","+ -this._offset.y+")"),n.length>0&&this.node.setAttribute("transform",n.join(" ")),this},style:function(e,t){if(arguments.length==0)return this.attr("style");if(arguments.length<2)if(typeof e=="object")for(t in e)this.style(t,e[t]);else{if(!SVG.regex.isCss.test(e))return this.styles[e];e=e.split(";");for(var n=0;n<e.length;n++)t=e[n].split(":"),t.length==2&&this.style(t[0].replace(/\s+/g,""),t[1].replace(/^\s+/,"").replace(/\s+$/,""))}else t===null||SVG.regex.test(t,"isBlank")?delete this.styles[e]:this.styles[e]=t;e="";for(t in this.styles)e+=t+":"+this.styles[t]+";";return this.node.setAttribute("style",e),this},data:function(e,t,n){if(arguments.length<2)try{return JSON.parse(this.attr("data-"+e))}catch(r){return this.attr("data-"+e)}else this.attr("data-"+e,t===null?null:n===!0?t:JSON.stringify(t));return this},bbox:function(){return new SVG.BBox(this)},inside:function(e,t){var n=this.bbox();return e>n.x&&t>n.y&&e<n.x+n.width&&t<n.y+n.height},show:function(){return this.style("display","")},hide:function(){return this.style("display","none")},visible:function(){return this.style("display")!="none"},_parent:function(e){var t=this;while(t!=null&&!(t instanceof e))t=t.parent;return t},_isStyle:function(e){return typeof e=="string"?SVG.regex.test(e,"isStyle"):!1},_parseMatrix:function(e){if(e.matrix){var t=e.matrix.replace(/\s/g,"").split(",");t.length==6&&(e.a=parseFloat(t[0]),e.b=parseFloat(t[1]),e.c=parseFloat(t[2]),e.d=parseFloat(t[3]),e.e=parseFloat(t[4]),e.f=parseFloat(t[5]))}return e}}),SVG.Container=function(e){this.constructor.call(this,e)},SVG.Container.prototype=new SVG.Element,SVG.extend(SVG.Container,{children:function(){return this._children||(this._children=[])},add:function(e,t){if(!this.has(e)){t=t==null?this.children().length:t;if(e.parent){var n=e.parent.children().indexOf(e);e.parent.children().splice(n,1)}this.children().splice(t,0,e),this.node.insertBefore(e.node,this.node.childNodes[t]||null),e.parent=this}return this},put:function(e,t){return this.add(e,t),e},has:function(e){return this.children().indexOf(e)>=0},each:function(e){var t,n=this.children();for(t=0,length=n.length;t<length;t++)n[t]instanceof SVG.Shape&&e.apply(n[t],[t,n]);return this},removeElement:function(e){var t=this.children().indexOf(e);return this.children().splice(t,1),this.node.removeChild(e.node),e.parent=null,this},defs:function(){return this._defs||(this._defs=this.put(new SVG.Defs,0))},level:function(){return this.removeElement(this.defs()).put(this.defs(),0)},group:function(){return this.put(new SVG.G)},rect:function(e,t){return this.put((new SVG.Rect).size(e,t))},circle:function(e){return this.ellipse(e,e)},ellipse:function(e,t){return this.put((new SVG.Ellipse).size(e,t).move(0,0))},line:function(e,t,n,r){return this.put((new SVG.Line).attr({x1:e,y1:t,x2:n,y2:r}))},polyline:function(e){return this.put(new SVG.Polyline).plot(e)},polygon:function(e){return this.put(new SVG.Polygon).plot(e)},path:function(e){return this.put(new SVG.Path).plot(e)},image:function(e,t,n){return t=t!=null?t:100,this.put((new SVG.Image).load(e).size(t,n!=null?n:t))},text:function(e){return this.put((new SVG.Text).text(e))},nested:function(){return this.put(new SVG.Nested)},gradient:function(e,t){return this.defs().gradient(e,t)},pattern:function(e,t,n){return this.defs().pattern(e,t,n)},mask:function(){return this.defs().put(new SVG.Mask)},first:function(){return this.children()[0]instanceof SVG.Defs?this.children()[1]:this.children()[0]},last:function(){return this.children()[this.children().length-1]},viewbox:function(e){return arguments.length==0?new SVG.ViewBox(this):(e=arguments.length==1?[e.x,e.y,e.width,e.height]:Array.prototype.slice.call(arguments),this.attr("viewBox",e.join(" ")))},clear:function(){for(var e=this.children().length-1;e>=0;e--)this.removeElement(this.children()[e]);return this}}),SVG.FX=function(e){this.target=e},SVG.extend(SVG.FX,{animate:function(e,t,n){var r=this;return typeof e=="object"&&(n=e.delay,t=e.ease,e=e.duration),this.timeout=setTimeout(function(){e=e==null?1e3:e,t=t||"<>";var n,i,s,o=1e3/60,u=r.target,a=(new Date).getTime(),f=a+e;r.interval=setInterval(function(){var o,l,c=(new Date).getTime(),h=c>f?1:(c-a)/e;if(n==null){n=[];for(l in r.attrs)n.push(l)}if(i==null){i=[];for(l in r.trans)i.push(l)}if(s==null){s=[];for(l in r.styles)s.push(l)}h=t=="<>"?-Math.cos(h*Math.PI)/2+.5:t==">"?Math.sin(h*Math.PI/2):t=="<"?-Math.cos(h*Math.PI/2)+1:t=="-"?h:typeof t=="function"?t(h):h,r._x?u.x(r._at(r._x,h)):r._cx&&u.cx(r._at(r._cx,h)),r._y?u.y(r._at(r._y,h)):r._cy&&u.cy(r._at(r._cy,h)),r._size&&u.size(r._at(r._size.width,h),r._at(r._size.height,h)),r._viewbox&&u.viewbox(r._at(r._viewbox.x,h),r._at(r._viewbox.y,h),r._at(r._viewbox.width,h),r._at(r._viewbox.height,h));for(o=n.length-1;o>=0;o--)u.attr(n[o],r._at(r.attrs[n[o]],h));for(o=i.length-1;o>=0;o--)u.transform(i[o],r._at(r.trans[i[o]],h));for(o=s.length-1;o>=0;o--)u.style(s[o],r._at(r.styles[s[o]],h));r._during&&r._during.call(u,h,function(e,t){return r._at({from:e,to:t},h)}),c>f&&(clearInterval(r.interval),r._after?r._after.apply(u,[r]):r.stop())},e>o?o:e)},n||0),this},bbox:function(){return this.target.bbox()},attr:function(e,t,n){if(typeof e=="object")for(var r in e)this.attr(r,e[r]);else this.attrs[e]={from:this.target.attr(e),to:t};return this},transform:function(e,t){if(arguments.length==1){e=this.target._parseMatrix(e),delete e.matrix;for(t in e)this.trans[t]={from:this.target.trans[t],to:e[t]}}else{var n={};n[e]=t,this.transform(n)}return this},style:function(e,t){if(typeof e=="object")for(var n in e)this.style(n,e[n]);else this.styles[e]={from:this.target.style(e),to:t};return this},x:function(e){return this._x={from:this.target.x(),to:e},this},y:function(e){return this._y={from:this.target.y(),to:e},this},cx:function(e){return this._cx={from:this.target.cx(),to:e},this},cy:function(e){return this._cy={from:this.target.cy(),to:e},this},move:function(e,t){return this.x(e).y(t)},center:function(e,t){return this.cx(e).cy(t)},size:function(e,t){if(this.target instanceof SVG.Text)this.attr("font-size",e);else{var n=this.target.bbox();this._size={width:{from:n.width,to:e},height:{from:n.height,to:t}}}return this},viewbox:function(e,t,n,r){if(this.target instanceof SVG.Container){var i=this.target.viewbox();this._viewbox={x:{from:i.x,to:e},y:{from:i.y,to:t},width:{from:i.width,to:n},height:{from:i.height,to:r}}}return this},during:function(e){return this._during=e,this},after:function(e){return this._after=e,this},stop:function(){return clearTimeout(this.timeout),clearInterval(this.interval),this.attrs={},this.trans={},this.styles={},delete this._x,delete this._y,delete this._cx,delete this._cy,delete this._size,delete this._after,delete this._during,delete this._viewbox,this},_at:function(e,t){return typeof e.from=="number"?e.from+(e.to-e.from)*t:SVG.regex.unit.test(e.to)?this._unit(e,t):e.to&&(e.to.r||SVG.Color.test(e.to))?this._color(e,t):t<1?e.from:e.to},_unit:function(e,t){var n,r;return n=SVG.regex.unit.exec(e.from.toString()),r=parseFloat(n?n[1]:0),n=SVG.regex.unit.exec(e.to),r+(parseFloat(n[1])-r)*t+n[2]},_color:function(e,t){var n,r;return t=t<0?0:t>1?1:t,n=new SVG.Color(e.from),r=new SVG.Color(e.to),(new SVG.Color({r:~~(n.r+(r.r-n.r)*t),g:~~(n.g+(r.g-n.g)*t),b:~~(n.b+(r.b-n.b)*t)})).toHex()}}),SVG.extend(SVG.Element,{animate:function(e,t,n){return(this.fx||(this.fx=new SVG.FX(this))).stop().animate(e,t,n)},stop:function(){return this.fx&&this.fx.stop(),this}}),["click","dblclick","mousedown","mouseup","mouseover","mouseout","mousemove","mouseenter","mouseleave","touchstart","touchend","touchmove","touchcancel"].forEach(function(e){SVG.Element.prototype[e]=function(t){var n=this;return this.node["on"+e]=typeof t=="function"?function(){return t.apply(n,arguments)}:null,this}}),SVG.on=function(e,t,n){e.addEventListener?e.addEventListener(t,n,!1):e.attachEvent("on"+t,n)},SVG.off=function(e,t,n){e.removeEventListener?e.removeEventListener(t,n,!1):e.detachEvent("on"+t,n)},SVG.extend(SVG.Element,{on:function(e,t){return SVG.on(this.node,e,t),this},off:function(e,t){return SVG.off(this.node,e,t),this}}),SVG.G=function(){this.constructor.call(this,SVG.create("g"))},SVG.G.prototype=new SVG.Container,SVG.extend(SVG.G,{x:function(e){return e==null?this.trans.x:this.transform("x",e)},y:function(e){return e==null?this.trans.y:this.transform("y",e)},defs:function(){return this.doc().defs()}}),SVG.extend(SVG.Element,{siblings:function(){return this.parent.children()},position:function(){return this.siblings().indexOf(this)},next:function(){return this.siblings()[this.position()+1]},previous:function(){return this.siblings()[this.position()-1]},forward:function(){return this.parent.removeElement(this).put(this,this.position()+1)},backward:function(){this.parent.level();var e=this.position();return e>1&&this.parent.removeElement(this).add(this,e-1),this},front:function(){return this.parent.removeElement(this).put(this)},back:function(){return this.parent.level(),this.position()>1&&this.parent.removeElement(this).add(this,0),this}}),SVG.Defs=function(){this.constructor.call(this,SVG.create("defs"))},SVG.Defs.prototype=new SVG.Container,SVG.Mask=function(){this.constructor.call(this,SVG.create("mask"))},SVG.Mask.prototype=new SVG.Container,SVG.extend(SVG.Element,{maskWith:function(e){return this.mask=e instanceof SVG.Mask?e:this.parent.mask().add(e),this.attr("mask","url(#"+this.mask.attr("id")+")")}}),SVG.Clip=function(){this.constructor.call(this,SVG.create("clipPath"))},SVG.Clip.prototype=new SVG.Container,SVG.extend(SVG.Element,{clipWith:function(e){return this.clip=e instanceof SVG.Clip?e:this.parent.clip().add(e),this.attr("clip-path","url(#"+this.clip.attr("id")+")")}}),SVG.extend(SVG.Container,{clip:function(){return this.defs().put(new SVG.Clip)}}),SVG.Pattern=function(e){this.constructor.call(this,SVG.create("pattern"))},SVG.Pattern.prototype=new SVG.Container,SVG.extend(SVG.Pattern,{fill:function(){return"url(#"+this.attr("id")+")"}}),SVG.extend(SVG.Defs,{pattern:function(e,t,n){var r=this.put(new SVG.Pattern);return n(r),r.attr({x:0,y:0,width:e,height:t,patternUnits:"userSpaceOnUse"})}}),SVG.Gradient=function(e){this.constructor.call(this,SVG.create(e+"Gradient")),this.type=e},SVG.Gradient.prototype=new SVG.Container,SVG.extend(SVG.Gradient,{from:function(e,t){return this.type=="radial"?this.attr({fx:e+"%",fy:t+"%"}):this.attr({x1:e+"%",y1:t+"%"})},to:function(e,t){return this.type=="radial"?this.attr({cx:e+"%",cy:t+"%"}):this.attr({x2:e+"%",y2:t+"%"})},radius:function(e){return this.type=="radial"?this.attr({r:e+"%"}):this},at:function(e){return this.put(new SVG.Stop(e))},update:function(e){while(this.node.hasChildNodes())this.node.removeChild(this.node.lastChild);return e(this),this},fill:function(){return"url(#"+this.attr("id")+")"}}),SVG.extend(SVG.Defs,{gradient:function(e,t){var n=this.put(new SVG.Gradient(e));return t(n),n}}),SVG.Stop=function(e){this.constructor.call(this,SVG.create("stop")),this.update(e)},SVG.Stop.prototype=new SVG.Element,SVG.extend(SVG.Stop,{update:function(e){var t,n=["opacity","color"];for(t=n.length-1;t>=0;t--)e[n[t]]!=null&&this.style("stop-"+n[t],e[n[t]]);return this.attr("offset",(e.offset!=null?e.offset:this.attr("offset"))+"%")}}),SVG.Doc=function(e){this.constructor.call(this,SVG.create("svg")),this.parent=typeof e=="string"?document.getElementById(e):e,this.attr({xmlns:SVG.ns,version:"1.1",width:"100%",height:"100%"}).attr("xlink",SVG.xlink,SVG.ns).defs(),this.stage()},SVG.Doc.prototype=new SVG.Container,SVG.Doc.prototype.stage=function(){var e,t=this,n=document.createElement("div");return n.style.cssText="position:relative;height:100%;",t.parent.appendChild(n),n.appendChild(t.node),e=function(){document.readyState==="complete"?(t.style("position:absolute;"),setTimeout(function(){t.style("position:relative;"),t.parent.removeChild(t.node.parentNode),t.node.parentNode.removeChild(t.node),t.parent.appendChild(t.node)},5)):setTimeout(e,10)},e(),this},SVG.Shape=function(e){this.constructor.call(this,e)},SVG.Shape.prototype=new SVG.Element,SVG.Rect=function(){this.constructor.call(this,SVG.create("rect"))},SVG.Rect.prototype=new SVG.Shape,SVG.Ellipse=function(){this.constructor.call(this,SVG.create("ellipse"))},SVG.Ellipse.prototype=new SVG.Shape,SVG.extend(SVG.Ellipse,{x:function(e){return e==null?this.cx()-this.attr("rx"):this.cx(e+this.attr("rx"))},y:function(e){return e==null?this.cy()-this.attr("ry"):this.cy(e+this.attr("ry"))},cx:function(e){return e==null?this.attr("cx"):this.attr("cx",e/this.trans.scaleX)},cy:function(e){return e==null?this.attr("cy"):this.attr("cy",e/this.trans.scaleY)},size:function(e,t){return this.attr({rx:e/2,ry:t/2})}}),SVG.Line=function(){this.constructor.call(this,SVG.create("line"))},SVG.Line.prototype=new SVG.Shape,SVG.extend(SVG.Line,{x:function(e){var t=this.bbox();return e==null?t.x:this.attr({x1:this.attr("x1")-t.x+e,x2:this.attr("x2")-t.x+e})},y:function(e){var t=this.bbox();return e==null?t.y:this.attr({y1:this.attr("y1")-t.y+e,y2:this.attr("y2")-t.y+e})},cx:function(e){var t=this.bbox().width/2;return e==null?this.x()+t:this.x(e-t)},cy:function(e){var t=this.bbox().height/2;return e==null?this.y()+t:this.y(e-t)},size:function(e,t){var n=this.bbox();return this.attr(this.attr("x1")<this.attr("x2")?"x2":"x1",n.x+e).attr(this.attr("y1")<this.attr("y2")?"y2":"y1",n.y+t)}}),SVG.Polyline=function(){this.constructor.call(this,SVG.create("polyline"))},SVG.Polyline.prototype=new SVG.Shape,SVG.Polygon=function(){this.constructor.call(this,SVG.create("polygon"))},SVG.Polygon.prototype=new SVG.Shape,SVG.extend(SVG.Polyline,SVG.Polygon,{_plot:function(e){if(Array.isArray(e)){var t,n,r=[];for(t=0,n=e.length;t<n;t++)r.push(e[t].join(","));e=r.length==0?r.join(" "):"0,0"}return this.attr("points",e||"0,0")}}),SVG.Path=function(){this.constructor.call(this,SVG.create("path"))},SVG.Path.prototype=new SVG.Shape,SVG.extend(SVG.Path,{_plot:function(e){return this.attr("d",e||"M0,0")}}),SVG.extend(SVG.Polyline,SVG.Polygon,SVG.Path,{x:function(e){return e==null?this.bbox().x:this.transform("x",e)},y:function(e){return e==null?this.bbox().y:this.transform("y",e)},size:function(e,t){var n=e/this._offset.width;return this.transform({scaleX:n,scaleY:t!=null?t/this._offset.height:n})},plot:function(e){var t=this.trans.scaleX,n=this.trans.scaleY;return this._plot(e),this._offset=this.transform({scaleX:1,scaleY:1}).bbox(),this._offset.x-=this.trans.x,this._offset.y-=this.trans.y,this.transform({scaleX:t,scaleY:n})}}),SVG.Image=function(){this.constructor.call(this,SVG.create("image"))},SVG.Image.prototype=new SVG.Shape,SVG.extend(SVG.Image,{load:function(e){return e?this.attr("xlink:href",this.src=e,SVG.xlink):this}});var e="size family weight stretch variant style".split(" ");SVG.Text=function(){this.constructor.call(this,SVG.create("text")),this.styles={"font-size":16,"font-family":"Helvetica, Arial, sans-serif","text-anchor":"start"},this._leading=1.2},SVG.Text.prototype=new SVG.Shape,SVG.extend(SVG.Text,{x:function(e,t){return e==null?t?this.attr("x"):this.bbox().x:(t||(t=this.style("text-anchor"),e=t=="start"?e:t=="end"?e+this.bbox().width:e+this.bbox().width/2),this.attr("x",e))},cx:function(e,t){return e==null?this.bbox().cx:this.x(e-this.bbox().width/2)},cy:function(e,t){return e==null?this.bbox().cy:this.y(t?e:e-this.bbox().height/2)},move:function(e,t,n){return this.x(e,n).y(t)},center:function(e,t,n){return this.cx(e,n).cy(t,n)},text:function(e){if(e==null)return this.content;this.clear(),this.content=SVG.regex.isBlank.test(e)?"text":e;var t,n,r=e.split("\n");for(t=0,n=r.length;t<n;t++)this.tspan(r[t]);return this.attr("textLength",1).attr("textLength",null)},tspan:function(e){var t=(new SVG.TSpan).text(e);return this.node.appendChild(t.node),this.lines.push(t),t.attr("style",this.style())},size:function(e){return this.attr("font-size",e)},leading:function(e){return e==null?this._leading:(this._leading=e,this.rebuild())},rebuild:function(){var e,t,n=this.styles["font-size"];for(e=0,t=this.lines.length;e<t;e++)this.lines[e].attr({dy:n*this._leading-(e==0?n*.276666666:0),x:this.attr("x")||0,style:this.style()});return this},clear:function(){while(this.node.hasChildNodes())this.node.removeChild(this.node.lastChild);return this.lines=[],this}}),SVG.TSpan=function(){this.constructor.call(this,SVG.create("tspan"))},SVG.TSpan.prototype=new SVG.Shape,SVG.extend(SVG.TSpan,{text:function(e){return this.node.appendChild(document.createTextNode(e)),this}}),SVG.Nested=function(){this.constructor.call(this,SVG.create("svg")),this.style("overflow","visible")},SVG.Nested.prototype=new SVG.Container,SVG._stroke=["color","width","opacity","linecap","linejoin","miterlimit","dasharray","dashoffset"],SVG._fill=["color","opacity","rule"];var t=function(e,t){return t=="color"?e:e+"-"+t};["fill","stroke"].forEach(function(e){var n={};n[e]=function(n){var r;if(typeof n=="string"||SVG.Color.isRgb(n)||SVG.Color.isHsb(n))this.attr(e,n);else for(index=SVG["_"+e].length-1;index>=0;index--)n[SVG["_"+e][index]]!=null&&this.attr(t(e,SVG["_"+e][index]),n[SVG["_"+e][index]]);return this},SVG.extend(SVG.Shape,SVG.FX,n)}),SVG.extend(SVG.Element,SVG.FX,{rotate:function(e,t,n){return this.transform({rotation:e||0,cx:t,cy:n})},skew:function(e,t){return this.transform({skewX:e||0,skewY:t||0})},scale:function(e,t){return this.transform({scaleX:e,scaleY:t==null?e:t})},matrix:function(e){return this.transform({matrix:e})},opacity:function(e){return this.attr("opacity",e)}}),SVG.Text&&SVG.extend(SVG.Text,SVG.FX,{font:function(t){for(var n in t)n=="anchor"?this.attr("text-anchor",t[n]):e.indexOf(n)>-1?this.attr("font-"+n,t[n]):this.attr(n,t[n]);return this}})}).call(this);
\ No newline at end of file diff --git a/spec/index.html b/spec/index.html new file mode 100644 index 0000000..0a79446 --- /dev/null +++ b/spec/index.html @@ -0,0 +1,74 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" + "http://www.w3.org/TR/html4/loose.dtd"> +<html> +<head> + <title>Jasmine Spec Runner</title> + + <link rel="shortcut icon" type="image/png" href="lib/jasmine-1.3.1/jasmine_favicon.png"> + <link rel="stylesheet" type="text/css" href="lib/jasmine-1.3.1/jasmine.css"> + + <style type="text/css" media="screen"> + #canvas { + width: 1px; + height: 1px; + overflow: hidden; + } + </style> + +</head> + +<body> +</body> + +<script type="text/javascript" src="lib/jasmine-1.3.1/jasmine.js"></script> +<script type="text/javascript" src="lib/jasmine-1.3.1/jasmine-html.js"></script> + +<!-- include source files here... --> +<script src="../dist/svg.js" type="text/javascript" charset="utf-8"></script> + +<!-- include spec files here... --> +<script type="text/javascript" src="spec/helper.js"></script> +<script type="text/javascript" src="spec/svg.js"></script> +<script type="text/javascript" src="spec/container.js"></script> +<script type="text/javascript" src="spec/element.js"></script> +<script type="text/javascript" src="spec/rect.js"></script> +<script type="text/javascript" src="spec/ellipse.js"></script> +<script type="text/javascript" src="spec/line.js"></script> +<script type="text/javascript" src="spec/polyline.js"></script> +<script type="text/javascript" src="spec/polygon.js"></script> +<script type="text/javascript" src="spec/path.js"></script> +<script type="text/javascript" src="spec/image.js"></script> +<script type="text/javascript" src="spec/text.js"></script> +<script type="text/javascript" src="spec/doc.js"></script> +<script type="text/javascript" src="spec/gradient.js"></script> + +<script type="text/javascript"> + (function() { + var jasmineEnv = jasmine.getEnv(); + jasmineEnv.updateInterval = 1000; + + var htmlReporter = new jasmine.HtmlReporter(); + + jasmineEnv.addReporter(htmlReporter); + + jasmineEnv.specFilter = function(spec) { + return htmlReporter.specFilter(spec); + }; + + var currentWindowOnload = window.onload; + + window.onload = function() { + if (currentWindowOnload) { + currentWindowOnload(); + } + execJasmine(); + }; + + function execJasmine() { + jasmineEnv.execute(); + } + + })(); +</script> + +</html> diff --git a/spec/lib/jasmine-1.3.1/MIT.LICENSE b/spec/lib/jasmine-1.3.1/MIT.LICENSE new file mode 100644 index 0000000..7c435ba --- /dev/null +++ b/spec/lib/jasmine-1.3.1/MIT.LICENSE @@ -0,0 +1,20 @@ +Copyright (c) 2008-2011 Pivotal Labs + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/spec/lib/jasmine-1.3.1/jasmine-html.js b/spec/lib/jasmine-1.3.1/jasmine-html.js new file mode 100644 index 0000000..543d569 --- /dev/null +++ b/spec/lib/jasmine-1.3.1/jasmine-html.js @@ -0,0 +1,681 @@ +jasmine.HtmlReporterHelpers = {}; + +jasmine.HtmlReporterHelpers.createDom = function(type, attrs, childrenVarArgs) { + var el = document.createElement(type); + + for (var i = 2; i < arguments.length; i++) { + var child = arguments[i]; + + if (typeof child === 'string') { + el.appendChild(document.createTextNode(child)); + } else { + if (child) { + el.appendChild(child); + } + } + } + + for (var attr in attrs) { + if (attr == "className") { + el[attr] = attrs[attr]; + } else { + el.setAttribute(attr, attrs[attr]); + } + } + + return el; +}; + +jasmine.HtmlReporterHelpers.getSpecStatus = function(child) { + var results = child.results(); + var status = results.passed() ? 'passed' : 'failed'; + if (results.skipped) { + status = 'skipped'; + } + + return status; +}; + +jasmine.HtmlReporterHelpers.appendToSummary = function(child, childElement) { + var parentDiv = this.dom.summary; + var parentSuite = (typeof child.parentSuite == 'undefined') ? 'suite' : 'parentSuite'; + var parent = child[parentSuite]; + + if (parent) { + if (typeof this.views.suites[parent.id] == 'undefined') { + this.views.suites[parent.id] = new jasmine.HtmlReporter.SuiteView(parent, this.dom, this.views); + } + parentDiv = this.views.suites[parent.id].element; + } + + parentDiv.appendChild(childElement); +}; + + +jasmine.HtmlReporterHelpers.addHelpers = function(ctor) { + for(var fn in jasmine.HtmlReporterHelpers) { + ctor.prototype[fn] = jasmine.HtmlReporterHelpers[fn]; + } +}; + +jasmine.HtmlReporter = function(_doc) { + var self = this; + var doc = _doc || window.document; + + var reporterView; + + var dom = {}; + + // Jasmine Reporter Public Interface + self.logRunningSpecs = false; + + self.reportRunnerStarting = function(runner) { + var specs = runner.specs() || []; + + if (specs.length == 0) { + return; + } + + createReporterDom(runner.env.versionString()); + doc.body.appendChild(dom.reporter); + setExceptionHandling(); + + reporterView = new jasmine.HtmlReporter.ReporterView(dom); + reporterView.addSpecs(specs, self.specFilter); + }; + + self.reportRunnerResults = function(runner) { + reporterView && reporterView.complete(); + }; + + self.reportSuiteResults = function(suite) { + reporterView.suiteComplete(suite); + }; + + self.reportSpecStarting = function(spec) { + if (self.logRunningSpecs) { + self.log('>> Jasmine Running ' + spec.suite.description + ' ' + spec.description + '...'); + } + }; + + self.reportSpecResults = function(spec) { + reporterView.specComplete(spec); + }; + + self.log = function() { + var console = jasmine.getGlobal().console; + if (console && console.log) { + if (console.log.apply) { + console.log.apply(console, arguments); + } else { + console.log(arguments); // ie fix: console.log.apply doesn't exist on ie + } + } + }; + + self.specFilter = function(spec) { + if (!focusedSpecName()) { + return true; + } + + return spec.getFullName().indexOf(focusedSpecName()) === 0; + }; + + return self; + + function focusedSpecName() { + var specName; + + (function memoizeFocusedSpec() { + if (specName) { + return; + } + + var paramMap = []; + var params = jasmine.HtmlReporter.parameters(doc); + + for (var i = 0; i < params.length; i++) { + var p = params[i].split('='); + paramMap[decodeURIComponent(p[0])] = decodeURIComponent(p[1]); + } + + specName = paramMap.spec; + })(); + + return specName; + } + + function createReporterDom(version) { + dom.reporter = self.createDom('div', { id: 'HTMLReporter', className: 'jasmine_reporter' }, + dom.banner = self.createDom('div', { className: 'banner' }, + self.createDom('span', { className: 'title' }, "Jasmine "), + self.createDom('span', { className: 'version' }, version)), + + dom.symbolSummary = self.createDom('ul', {className: 'symbolSummary'}), + dom.alert = self.createDom('div', {className: 'alert'}, + self.createDom('span', { className: 'exceptions' }, + self.createDom('label', { className: 'label', 'for': 'no_try_catch' }, 'No try/catch'), + self.createDom('input', { id: 'no_try_catch', type: 'checkbox' }))), + dom.results = self.createDom('div', {className: 'results'}, + dom.summary = self.createDom('div', { className: 'summary' }), + dom.details = self.createDom('div', { id: 'details' })) + ); + } + + function noTryCatch() { + return window.location.search.match(/catch=false/); + } + + function searchWithCatch() { + var params = jasmine.HtmlReporter.parameters(window.document); + var removed = false; + var i = 0; + + while (!removed && i < params.length) { + if (params[i].match(/catch=/)) { + params.splice(i, 1); + removed = true; + } + i++; + } + if (jasmine.CATCH_EXCEPTIONS) { + params.push("catch=false"); + } + + return params.join("&"); + } + + function setExceptionHandling() { + var chxCatch = document.getElementById('no_try_catch'); + + if (noTryCatch()) { + chxCatch.setAttribute('checked', true); + jasmine.CATCH_EXCEPTIONS = false; + } + chxCatch.onclick = function() { + window.location.search = searchWithCatch(); + }; + } +}; +jasmine.HtmlReporter.parameters = function(doc) { + var paramStr = doc.location.search.substring(1); + var params = []; + + if (paramStr.length > 0) { + params = paramStr.split('&'); + } + return params; +} +jasmine.HtmlReporter.sectionLink = function(sectionName) { + var link = '?'; + var params = []; + + if (sectionName) { + params.push('spec=' + encodeURIComponent(sectionName)); + } + if (!jasmine.CATCH_EXCEPTIONS) { + params.push("catch=false"); + } + if (params.length > 0) { + link += params.join("&"); + } + + return link; +}; +jasmine.HtmlReporterHelpers.addHelpers(jasmine.HtmlReporter); +jasmine.HtmlReporter.ReporterView = function(dom) { + this.startedAt = new Date(); + this.runningSpecCount = 0; + this.completeSpecCount = 0; + this.passedCount = 0; + this.failedCount = 0; + this.skippedCount = 0; + + this.createResultsMenu = function() { + this.resultsMenu = this.createDom('span', {className: 'resultsMenu bar'}, + this.summaryMenuItem = this.createDom('a', {className: 'summaryMenuItem', href: "#"}, '0 specs'), + ' | ', + this.detailsMenuItem = this.createDom('a', {className: 'detailsMenuItem', href: "#"}, '0 failing')); + + this.summaryMenuItem.onclick = function() { + dom.reporter.className = dom.reporter.className.replace(/ showDetails/g, ''); + }; + + this.detailsMenuItem.onclick = function() { + showDetails(); + }; + }; + + this.addSpecs = function(specs, specFilter) { + this.totalSpecCount = specs.length; + + this.views = { + specs: {}, + suites: {} + }; + + for (var i = 0; i < specs.length; i++) { + var spec = specs[i]; + this.views.specs[spec.id] = new jasmine.HtmlReporter.SpecView(spec, dom, this.views); + if (specFilter(spec)) { + this.runningSpecCount++; + } + } + }; + + this.specComplete = function(spec) { + this.completeSpecCount++; + + if (isUndefined(this.views.specs[spec.id])) { + this.views.specs[spec.id] = new jasmine.HtmlReporter.SpecView(spec, dom); + } + + var specView = this.views.specs[spec.id]; + + switch (specView.status()) { + case 'passed': + this.passedCount++; + break; + + case 'failed': + this.failedCount++; + break; + + case 'skipped': + this.skippedCount++; + break; + } + + specView.refresh(); + this.refresh(); + }; + + this.suiteComplete = function(suite) { + var suiteView = this.views.suites[suite.id]; + if (isUndefined(suiteView)) { + return; + } + suiteView.refresh(); + }; + + this.refresh = function() { + + if (isUndefined(this.resultsMenu)) { + this.createResultsMenu(); + } + + // currently running UI + if (isUndefined(this.runningAlert)) { + this.runningAlert = this.createDom('a', { href: jasmine.HtmlReporter.sectionLink(), className: "runningAlert bar" }); + dom.alert.appendChild(this.runningAlert); + } + this.runningAlert.innerHTML = "Running " + this.completeSpecCount + " of " + specPluralizedFor(this.totalSpecCount); + + // skipped specs UI + if (isUndefined(this.skippedAlert)) { + this.skippedAlert = this.createDom('a', { href: jasmine.HtmlReporter.sectionLink(), className: "skippedAlert bar" }); + } + + this.skippedAlert.innerHTML = "Skipping " + this.skippedCount + " of " + specPluralizedFor(this.totalSpecCount) + " - run all"; + + if (this.skippedCount === 1 && isDefined(dom.alert)) { + dom.alert.appendChild(this.skippedAlert); + } + + // passing specs UI + if (isUndefined(this.passedAlert)) { + this.passedAlert = this.createDom('span', { href: jasmine.HtmlReporter.sectionLink(), className: "passingAlert bar" }); + } + this.passedAlert.innerHTML = "Passing " + specPluralizedFor(this.passedCount); + + // failing specs UI + if (isUndefined(this.failedAlert)) { + this.failedAlert = this.createDom('span', {href: "?", className: "failingAlert bar"}); + } + this.failedAlert.innerHTML = "Failing " + specPluralizedFor(this.failedCount); + + if (this.failedCount === 1 && isDefined(dom.alert)) { + dom.alert.appendChild(this.failedAlert); + dom.alert.appendChild(this.resultsMenu); + } + + // summary info + this.summaryMenuItem.innerHTML = "" + specPluralizedFor(this.runningSpecCount); + this.detailsMenuItem.innerHTML = "" + this.failedCount + " failing"; + }; + + this.complete = function() { + dom.alert.removeChild(this.runningAlert); + + this.skippedAlert.innerHTML = "Ran " + this.runningSpecCount + " of " + specPluralizedFor(this.totalSpecCount) + " - run all"; + + if (this.failedCount === 0) { + dom.alert.appendChild(this.createDom('span', {className: 'passingAlert bar'}, "Passing " + specPluralizedFor(this.passedCount))); + } else { + showDetails(); + } + + dom.banner.appendChild(this.createDom('span', {className: 'duration'}, "finished in " + ((new Date().getTime() - this.startedAt.getTime()) / 1000) + "s")); + }; + + return this; + + function showDetails() { + if (dom.reporter.className.search(/showDetails/) === -1) { + dom.reporter.className += " showDetails"; + } + } + + function isUndefined(obj) { + return typeof obj === 'undefined'; + } + + function isDefined(obj) { + return !isUndefined(obj); + } + + function specPluralizedFor(count) { + var str = count + " spec"; + if (count > 1) { + str += "s" + } + return str; + } + +}; + +jasmine.HtmlReporterHelpers.addHelpers(jasmine.HtmlReporter.ReporterView); + + +jasmine.HtmlReporter.SpecView = function(spec, dom, views) { + this.spec = spec; + this.dom = dom; + this.views = views; + + this.symbol = this.createDom('li', { className: 'pending' }); + this.dom.symbolSummary.appendChild(this.symbol); + + this.summary = this.createDom('div', { className: 'specSummary' }, + this.createDom('a', { + className: 'description', + href: jasmine.HtmlReporter.sectionLink(this.spec.getFullName()), + title: this.spec.getFullName() + }, this.spec.description) + ); + + this.detail = this.createDom('div', { className: 'specDetail' }, + this.createDom('a', { + className: 'description', + href: '?spec=' + encodeURIComponent(this.spec.getFullName()), + title: this.spec.getFullName() + }, this.spec.getFullName()) + ); +}; + +jasmine.HtmlReporter.SpecView.prototype.status = function() { + return this.getSpecStatus(this.spec); +}; + +jasmine.HtmlReporter.SpecView.prototype.refresh = function() { + this.symbol.className = this.status(); + + switch (this.status()) { + case 'skipped': + break; + + case 'passed': + this.appendSummaryToSuiteDiv(); + break; + + case 'failed': + this.appendSummaryToSuiteDiv(); + this.appendFailureDetail(); + break; + } +}; + +jasmine.HtmlReporter.SpecView.prototype.appendSummaryToSuiteDiv = function() { + this.summary.className += ' ' + this.status(); + this.appendToSummary(this.spec, this.summary); +}; + +jasmine.HtmlReporter.SpecView.prototype.appendFailureDetail = function() { + this.detail.className += ' ' + this.status(); + + var resultItems = this.spec.results().getItems(); + var messagesDiv = this.createDom('div', { className: 'messages' }); + + for (var i = 0; i < resultItems.length; i++) { + var result = resultItems[i]; + + if (result.type == 'log') { + messagesDiv.appendChild(this.createDom('div', {className: 'resultMessage log'}, result.toString())); + } else if (result.type == 'expect' && result.passed && !result.passed()) { + messagesDiv.appendChild(this.createDom('div', {className: 'resultMessage fail'}, result.message)); + + if (result.trace.stack) { + messagesDiv.appendChild(this.createDom('div', {className: 'stackTrace'}, result.trace.stack)); + } + } + } + + if (messagesDiv.childNodes.length > 0) { + this.detail.appendChild(messagesDiv); + this.dom.details.appendChild(this.detail); + } +}; + +jasmine.HtmlReporterHelpers.addHelpers(jasmine.HtmlReporter.SpecView);jasmine.HtmlReporter.SuiteView = function(suite, dom, views) { + this.suite = suite; + this.dom = dom; + this.views = views; + + this.element = this.createDom('div', { className: 'suite' }, + this.createDom('a', { className: 'description', href: jasmine.HtmlReporter.sectionLink(this.suite.getFullName()) }, this.suite.description) + ); + + this.appendToSummary(this.suite, this.element); +}; + +jasmine.HtmlReporter.SuiteView.prototype.status = function() { + return this.getSpecStatus(this.suite); +}; + +jasmine.HtmlReporter.SuiteView.prototype.refresh = function() { + this.element.className += " " + this.status(); +}; + +jasmine.HtmlReporterHelpers.addHelpers(jasmine.HtmlReporter.SuiteView); + +/* @deprecated Use jasmine.HtmlReporter instead + */ +jasmine.TrivialReporter = function(doc) { + this.document = doc || document; + this.suiteDivs = {}; + this.logRunningSpecs = false; +}; + +jasmine.TrivialReporter.prototype.createDom = function(type, attrs, childrenVarArgs) { + var el = document.createElement(type); + + for (var i = 2; i < arguments.length; i++) { + var child = arguments[i]; + + if (typeof child === 'string') { + el.appendChild(document.createTextNode(child)); + } else { + if (child) { el.appendChild(child); } + } + } + + for (var attr in attrs) { + if (attr == "className") { + el[attr] = attrs[attr]; + } else { + el.setAttribute(attr, attrs[attr]); + } + } + + return el; +}; + +jasmine.TrivialReporter.prototype.reportRunnerStarting = function(runner) { + var showPassed, showSkipped; + + this.outerDiv = this.createDom('div', { id: 'TrivialReporter', className: 'jasmine_reporter' }, + this.createDom('div', { className: 'banner' }, + this.createDom('div', { className: 'logo' }, + this.createDom('span', { className: 'title' }, "Jasmine"), + this.createDom('span', { className: 'version' }, runner.env.versionString())), + this.createDom('div', { className: 'options' }, + "Show ", + showPassed = this.createDom('input', { id: "__jasmine_TrivialReporter_showPassed__", type: 'checkbox' }), + this.createDom('label', { "for": "__jasmine_TrivialReporter_showPassed__" }, " passed "), + showSkipped = this.createDom('input', { id: "__jasmine_TrivialReporter_showSkipped__", type: 'checkbox' }), + this.createDom('label', { "for": "__jasmine_TrivialReporter_showSkipped__" }, " skipped") + ) + ), + + this.runnerDiv = this.createDom('div', { className: 'runner running' }, + this.createDom('a', { className: 'run_spec', href: '?' }, "run all"), + this.runnerMessageSpan = this.createDom('span', {}, "Running..."), + this.finishedAtSpan = this.createDom('span', { className: 'finished-at' }, "")) + ); + + this.document.body.appendChild(this.outerDiv); + + var suites = runner.suites(); + for (var i = 0; i < suites.length; i++) { + var suite = suites[i]; + var suiteDiv = this.createDom('div', { className: 'suite' }, + this.createDom('a', { className: 'run_spec', href: '?spec=' + encodeURIComponent(suite.getFullName()) }, "run"), + this.createDom('a', { className: 'description', href: '?spec=' + encodeURIComponent(suite.getFullName()) }, suite.description)); + this.suiteDivs[suite.id] = suiteDiv; + var parentDiv = this.outerDiv; + if (suite.parentSuite) { + parentDiv = this.suiteDivs[suite.parentSuite.id]; + } + parentDiv.appendChild(suiteDiv); + } + + this.startedAt = new Date(); + + var self = this; + showPassed.onclick = function(evt) { + if (showPassed.checked) { + self.outerDiv.className += ' show-passed'; + } else { + self.outerDiv.className = self.outerDiv.className.replace(/ show-passed/, ''); + } + }; + + showSkipped.onclick = function(evt) { + if (showSkipped.checked) { + self.outerDiv.className += ' show-skipped'; + } else { + self.outerDiv.className = self.outerDiv.className.replace(/ show-skipped/, ''); + } + }; +}; + +jasmine.TrivialReporter.prototype.reportRunnerResults = function(runner) { + var results = runner.results(); + var className = (results.failedCount > 0) ? "runner failed" : "runner passed"; + this.runnerDiv.setAttribute("class", className); + //do it twice for IE + this.runnerDiv.setAttribute("className", className); + var specs = runner.specs(); + var specCount = 0; + for (var i = 0; i < specs.length; i++) { + if (this.specFilter(specs[i])) { + specCount++; + } + } + var message = "" + specCount + " spec" + (specCount == 1 ? "" : "s" ) + ", " + results.failedCount + " failure" + ((results.failedCount == 1) ? "" : "s"); + message += " in " + ((new Date().getTime() - this.startedAt.getTime()) / 1000) + "s"; + this.runnerMessageSpan.replaceChild(this.createDom('a', { className: 'description', href: '?'}, message), this.runnerMessageSpan.firstChild); + + this.finishedAtSpan.appendChild(document.createTextNode("Finished at " + new Date().toString())); +}; + +jasmine.TrivialReporter.prototype.reportSuiteResults = function(suite) { + var results = suite.results(); + var status = results.passed() ? 'passed' : 'failed'; + if (results.totalCount === 0) { // todo: change this to check results.skipped + status = 'skipped'; + } + this.suiteDivs[suite.id].className += " " + status; +}; + +jasmine.TrivialReporter.prototype.reportSpecStarting = function(spec) { + if (this.logRunningSpecs) { + this.log('>> Jasmine Running ' + spec.suite.description + ' ' + spec.description + '...'); + } +}; + +jasmine.TrivialReporter.prototype.reportSpecResults = function(spec) { + var results = spec.results(); + var status = results.passed() ? 'passed' : 'failed'; + if (results.skipped) { + status = 'skipped'; + } + var specDiv = this.createDom('div', { className: 'spec ' + status }, + this.createDom('a', { className: 'run_spec', href: '?spec=' + encodeURIComponent(spec.getFullName()) }, "run"), + this.createDom('a', { + className: 'description', + href: '?spec=' + encodeURIComponent(spec.getFullName()), + title: spec.getFullName() + }, spec.description)); + + + var resultItems = results.getItems(); + var messagesDiv = this.createDom('div', { className: 'messages' }); + for (var i = 0; i < resultItems.length; i++) { + var result = resultItems[i]; + + if (result.type == 'log') { + messagesDiv.appendChild(this.createDom('div', {className: 'resultMessage log'}, result.toString())); + } else if (result.type == 'expect' && result.passed && !result.passed()) { + messagesDiv.appendChild(this.createDom('div', {className: 'resultMessage fail'}, result.message)); + + if (result.trace.stack) { + messagesDiv.appendChild(this.createDom('div', {className: 'stackTrace'}, result.trace.stack)); + } + } + } + + if (messagesDiv.childNodes.length > 0) { + specDiv.appendChild(messagesDiv); + } + + this.suiteDivs[spec.suite.id].appendChild(specDiv); +}; + +jasmine.TrivialReporter.prototype.log = function() { + var console = jasmine.getGlobal().console; + if (console && console.log) { + if (console.log.apply) { + console.log.apply(console, arguments); + } else { + console.log(arguments); // ie fix: console.log.apply doesn't exist on ie + } + } +}; + +jasmine.TrivialReporter.prototype.getLocation = function() { + return this.document.location; +}; + +jasmine.TrivialReporter.prototype.specFilter = function(spec) { + var paramMap = {}; + var params = this.getLocation().search.substring(1).split('&'); + for (var i = 0; i < params.length; i++) { + var p = params[i].split('='); + paramMap[decodeURIComponent(p[0])] = decodeURIComponent(p[1]); + } + + if (!paramMap.spec) { + return true; + } + return spec.getFullName().indexOf(paramMap.spec) === 0; +}; diff --git a/spec/lib/jasmine-1.3.1/jasmine.css b/spec/lib/jasmine-1.3.1/jasmine.css new file mode 100644 index 0000000..8c008dc --- /dev/null +++ b/spec/lib/jasmine-1.3.1/jasmine.css @@ -0,0 +1,82 @@ +body { background-color: #eeeeee; padding: 0; margin: 5px; overflow-y: scroll; } + +#HTMLReporter { font-size: 11px; font-family: Monaco, "Lucida Console", monospace; line-height: 14px; color: #333333; } +#HTMLReporter a { text-decoration: none; } +#HTMLReporter a:hover { text-decoration: underline; } +#HTMLReporter p, #HTMLReporter h1, #HTMLReporter h2, #HTMLReporter h3, #HTMLReporter h4, #HTMLReporter h5, #HTMLReporter h6 { margin: 0; line-height: 14px; } +#HTMLReporter .banner, #HTMLReporter .symbolSummary, #HTMLReporter .summary, #HTMLReporter .resultMessage, #HTMLReporter .specDetail .description, #HTMLReporter .alert .bar, #HTMLReporter .stackTrace { padding-left: 9px; padding-right: 9px; } +#HTMLReporter #jasmine_content { position: fixed; right: 100%; } +#HTMLReporter .version { color: #aaaaaa; } +#HTMLReporter .banner { margin-top: 14px; } +#HTMLReporter .duration { color: #aaaaaa; float: right; } +#HTMLReporter .symbolSummary { overflow: hidden; *zoom: 1; margin: 14px 0; } +#HTMLReporter .symbolSummary li { display: block; float: left; height: 7px; width: 14px; margin-bottom: 7px; font-size: 16px; } +#HTMLReporter .symbolSummary li.passed { font-size: 14px; } +#HTMLReporter .symbolSummary li.passed:before { color: #5e7d00; content: "\02022"; } +#HTMLReporter .symbolSummary li.failed { line-height: 9px; } +#HTMLReporter .symbolSummary li.failed:before { color: #b03911; content: "x"; font-weight: bold; margin-left: -1px; } +#HTMLReporter .symbolSummary li.skipped { font-size: 14px; } +#HTMLReporter .symbolSummary li.skipped:before { color: #bababa; content: "\02022"; } +#HTMLReporter .symbolSummary li.pending { line-height: 11px; } +#HTMLReporter .symbolSummary li.pending:before { color: #aaaaaa; content: "-"; } +#HTMLReporter .exceptions { color: #fff; float: right; margin-top: 5px; margin-right: 5px; } +#HTMLReporter .bar { line-height: 28px; font-size: 14px; display: block; color: #eee; } +#HTMLReporter .runningAlert { background-color: #666666; } +#HTMLReporter .skippedAlert { background-color: #aaaaaa; } +#HTMLReporter .skippedAlert:first-child { background-color: #333333; } +#HTMLReporter .skippedAlert:hover { text-decoration: none; color: white; text-decoration: underline; } +#HTMLReporter .passingAlert { background-color: #a6b779; } +#HTMLReporter .passingAlert:first-child { background-color: #5e7d00; } +#HTMLReporter .failingAlert { background-color: #cf867e; } +#HTMLReporter .failingAlert:first-child { background-color: #b03911; } +#HTMLReporter .results { margin-top: 14px; } +#HTMLReporter #details { display: none; } +#HTMLReporter .resultsMenu, #HTMLReporter .resultsMenu a { background-color: #fff; color: #333333; } +#HTMLReporter.showDetails .summaryMenuItem { font-weight: normal; text-decoration: inherit; } +#HTMLReporter.showDetails .summaryMenuItem:hover { text-decoration: underline; } +#HTMLReporter.showDetails .detailsMenuItem { font-weight: bold; text-decoration: underline; } +#HTMLReporter.showDetails .summary { display: none; } +#HTMLReporter.showDetails #details { display: block; } +#HTMLReporter .summaryMenuItem { font-weight: bold; text-decoration: underline; } +#HTMLReporter .summary { margin-top: 14px; } +#HTMLReporter .summary .suite .suite, #HTMLReporter .summary .specSummary { margin-left: 14px; } +#HTMLReporter .summary .specSummary.passed a { color: #5e7d00; } +#HTMLReporter .summary .specSummary.failed a { color: #b03911; } +#HTMLReporter .description + .suite { margin-top: 0; } +#HTMLReporter .suite { margin-top: 14px; } +#HTMLReporter .suite a { color: #333333; } +#HTMLReporter #details .specDetail { margin-bottom: 28px; } +#HTMLReporter #details .specDetail .description { display: block; color: white; background-color: #b03911; } +#HTMLReporter .resultMessage { padding-top: 14px; color: #333333; } +#HTMLReporter .resultMessage span.result { display: block; } +#HTMLReporter .stackTrace { margin: 5px 0 0 0; max-height: 224px; overflow: auto; line-height: 18px; color: #666666; border: 1px solid #ddd; background: white; white-space: pre; } + +#TrivialReporter { padding: 8px 13px; position: absolute; top: 0; bottom: 0; left: 0; right: 0; overflow-y: scroll; background-color: white; font-family: "Helvetica Neue Light", "Lucida Grande", "Calibri", "Arial", sans-serif; /*.resultMessage {*/ /*white-space: pre;*/ /*}*/ } +#TrivialReporter a:visited, #TrivialReporter a { color: #303; } +#TrivialReporter a:hover, #TrivialReporter a:active { color: blue; } +#TrivialReporter .run_spec { float: right; padding-right: 5px; font-size: .8em; text-decoration: none; } +#TrivialReporter .banner { color: #303; background-color: #fef; padding: 5px; } +#TrivialReporter .logo { float: left; font-size: 1.1em; padding-left: 5px; } +#TrivialReporter .logo .version { font-size: .6em; padding-left: 1em; } +#TrivialReporter .runner.running { background-color: yellow; } +#TrivialReporter .options { text-align: right; font-size: .8em; } +#TrivialReporter .suite { border: 1px outset gray; margin: 5px 0; padding-left: 1em; } +#TrivialReporter .suite .suite { margin: 5px; } +#TrivialReporter .suite.passed { background-color: #dfd; } +#TrivialReporter .suite.failed { background-color: #fdd; } +#TrivialReporter .spec { margin: 5px; padding-left: 1em; clear: both; } +#TrivialReporter .spec.failed, #TrivialReporter .spec.passed, #TrivialReporter .spec.skipped { padding-bottom: 5px; border: 1px solid gray; } +#TrivialReporter .spec.failed { background-color: #fbb; border-color: red; } +#TrivialReporter .spec.passed { background-color: #bfb; border-color: green; } +#TrivialReporter .spec.skipped { background-color: #bbb; } +#TrivialReporter .messages { border-left: 1px dashed gray; padding-left: 1em; padding-right: 1em; } +#TrivialReporter .passed { background-color: #cfc; display: none; } +#TrivialReporter .failed { background-color: #fbb; } +#TrivialReporter .skipped { color: #777; background-color: #eee; display: none; } +#TrivialReporter .resultMessage span.result { display: block; line-height: 2em; color: black; } +#TrivialReporter .resultMessage .mismatch { color: black; } +#TrivialReporter .stackTrace { white-space: pre; font-size: .8em; margin-left: 10px; max-height: 5em; overflow: auto; border: 1px inset red; padding: 1em; background: #eef; } +#TrivialReporter .finished-at { padding-left: 1em; font-size: .6em; } +#TrivialReporter.show-passed .passed, #TrivialReporter.show-skipped .skipped { display: block; } +#TrivialReporter #jasmine_content { position: fixed; right: 100%; } +#TrivialReporter .runner { border: 1px solid gray; display: block; margin: 5px 0; padding: 2px 0 2px 10px; } diff --git a/spec/lib/jasmine-1.3.1/jasmine.js b/spec/lib/jasmine-1.3.1/jasmine.js new file mode 100644 index 0000000..476d4b8 --- /dev/null +++ b/spec/lib/jasmine-1.3.1/jasmine.js @@ -0,0 +1,2600 @@ +var isCommonJS = typeof window == "undefined" && typeof exports == "object"; + +/** + * Top level namespace for Jasmine, a lightweight JavaScript BDD/spec/testing framework. + * + * @namespace + */ +var jasmine = {}; +if (isCommonJS) exports.jasmine = jasmine; +/** + * @private + */ +jasmine.unimplementedMethod_ = function() { + throw new Error("unimplemented method"); +}; + +/** + * Use <code>jasmine.undefined</code> instead of <code>undefined</code>, since <code>undefined</code> is just + * a plain old variable and may be redefined by somebody else. + * + * @private + */ +jasmine.undefined = jasmine.___undefined___; + +/** + * Show diagnostic messages in the console if set to true + * + */ +jasmine.VERBOSE = false; + +/** + * Default interval in milliseconds for event loop yields (e.g. to allow network activity or to refresh the screen with the HTML-based runner). Small values here may result in slow test running. Zero means no updates until all tests have completed. + * + */ +jasmine.DEFAULT_UPDATE_INTERVAL = 250; + +/** + * Maximum levels of nesting that will be included when an object is pretty-printed + */ +jasmine.MAX_PRETTY_PRINT_DEPTH = 40; + +/** + * Default timeout interval in milliseconds for waitsFor() blocks. + */ +jasmine.DEFAULT_TIMEOUT_INTERVAL = 5000; + +/** + * By default exceptions thrown in the context of a test are caught by jasmine so that it can run the remaining tests in the suite. + * Set to false to let the exception bubble up in the browser. + * + */ +jasmine.CATCH_EXCEPTIONS = true; + +jasmine.getGlobal = function() { + function getGlobal() { + return this; + } + + return getGlobal(); +}; + +/** + * Allows for bound functions to be compared. Internal use only. + * + * @ignore + * @private + * @param base {Object} bound 'this' for the function + * @param name {Function} function to find + */ +jasmine.bindOriginal_ = function(base, name) { + var original = base[name]; + if (original.apply) { + return function() { + return original.apply(base, arguments); + }; + } else { + // IE support + return jasmine.getGlobal()[name]; + } +}; + +jasmine.setTimeout = jasmine.bindOriginal_(jasmine.getGlobal(), 'setTimeout'); +jasmine.clearTimeout = jasmine.bindOriginal_(jasmine.getGlobal(), 'clearTimeout'); +jasmine.setInterval = jasmine.bindOriginal_(jasmine.getGlobal(), 'setInterval'); +jasmine.clearInterval = jasmine.bindOriginal_(jasmine.getGlobal(), 'clearInterval'); + +jasmine.MessageResult = function(values) { + this.type = 'log'; + this.values = values; + this.trace = new Error(); // todo: test better +}; + +jasmine.MessageResult.prototype.toString = function() { + var text = ""; + for (var i = 0; i < this.values.length; i++) { + if (i > 0) text += " "; + if (jasmine.isString_(this.values[i])) { + text += this.values[i]; + } else { + text += jasmine.pp(this.values[i]); + } + } + return text; +}; + +jasmine.ExpectationResult = function(params) { + this.type = 'expect'; + this.matcherName = params.matcherName; + this.passed_ = params.passed; + this.expected = params.expected; + this.actual = params.actual; + this.message = this.passed_ ? 'Passed.' : params.message; + + var trace = (params.trace || new Error(this.message)); + this.trace = this.passed_ ? '' : trace; +}; + +jasmine.ExpectationResult.prototype.toString = function () { + return this.message; +}; + +jasmine.ExpectationResult.prototype.passed = function () { + return this.passed_; +}; + +/** + * Getter for the Jasmine environment. Ensures one gets created + */ +jasmine.getEnv = function() { + var env = jasmine.currentEnv_ = jasmine.currentEnv_ || new jasmine.Env(); + return env; +}; + +/** + * @ignore + * @private + * @param value + * @returns {Boolean} + */ +jasmine.isArray_ = function(value) { + return jasmine.isA_("Array", value); +}; + +/** + * @ignore + * @private + * @param value + * @returns {Boolean} + */ +jasmine.isString_ = function(value) { + return jasmine.isA_("String", value); +}; + +/** + * @ignore + * @private + * @param value + * @returns {Boolean} + */ +jasmine.isNumber_ = function(value) { + return jasmine.isA_("Number", value); +}; + +/** + * @ignore + * @private + * @param {String} typeName + * @param value + * @returns {Boolean} + */ +jasmine.isA_ = function(typeName, value) { + return Object.prototype.toString.apply(value) === '[object ' + typeName + ']'; +}; + +/** + * Pretty printer for expecations. Takes any object and turns it into a human-readable string. + * + * @param value {Object} an object to be outputted + * @returns {String} + */ +jasmine.pp = function(value) { + var stringPrettyPrinter = new jasmine.StringPrettyPrinter(); + stringPrettyPrinter.format(value); + return stringPrettyPrinter.string; +}; + +/** + * Returns true if the object is a DOM Node. + * + * @param {Object} obj object to check + * @returns {Boolean} + */ +jasmine.isDomNode = function(obj) { + return obj.nodeType > 0; +}; + +/** + * Returns a matchable 'generic' object of the class type. For use in expecations of type when values don't matter. + * + * @example + * // don't care about which function is passed in, as long as it's a function + * expect(mySpy).toHaveBeenCalledWith(jasmine.any(Function)); + * + * @param {Class} clazz + * @returns matchable object of the type clazz + */ +jasmine.any = function(clazz) { + return new jasmine.Matchers.Any(clazz); +}; + +/** + * Returns a matchable subset of a JSON object. For use in expectations when you don't care about all of the + * attributes on the object. + * + * @example + * // don't care about any other attributes than foo. + * expect(mySpy).toHaveBeenCalledWith(jasmine.objectContaining({foo: "bar"}); + * + * @param sample {Object} sample + * @returns matchable object for the sample + */ +jasmine.objectContaining = function (sample) { + return new jasmine.Matchers.ObjectContaining(sample); +}; + +/** + * Jasmine Spies are test doubles that can act as stubs, spies, fakes or when used in an expecation, mocks. + * + * Spies should be created in test setup, before expectations. They can then be checked, using the standard Jasmine + * expectation syntax. Spies can be checked if they were called or not and what the calling params were. + * + * A Spy has the following fields: wasCalled, callCount, mostRecentCall, and argsForCall (see docs). + * + * Spies are torn down at the end of every spec. + * + * Note: Do <b>not</b> call new jasmine.Spy() directly - a spy must be created using spyOn, jasmine.createSpy or jasmine.createSpyObj. + * + * @example + * // a stub + * var myStub = jasmine.createSpy('myStub'); // can be used anywhere + * + * // spy example + * var foo = { + * not: function(bool) { return !bool; } + * } + * + * // actual foo.not will not be called, execution stops + * spyOn(foo, 'not'); + + // foo.not spied upon, execution will continue to implementation + * spyOn(foo, 'not').andCallThrough(); + * + * // fake example + * var foo = { + * not: function(bool) { return !bool; } + * } + * + * // foo.not(val) will return val + * spyOn(foo, 'not').andCallFake(function(value) {return value;}); + * + * // mock example + * foo.not(7 == 7); + * expect(foo.not).toHaveBeenCalled(); + * expect(foo.not).toHaveBeenCalledWith(true); + * + * @constructor + * @see spyOn, jasmine.createSpy, jasmine.createSpyObj + * @param {String} name + */ +jasmine.Spy = function(name) { + /** + * The name of the spy, if provided. + */ + this.identity = name || 'unknown'; + /** + * Is this Object a spy? + */ + this.isSpy = true; + /** + * The actual function this spy stubs. + */ + this.plan = function() { + }; + /** + * Tracking of the most recent call to the spy. + * @example + * var mySpy = jasmine.createSpy('foo'); + * mySpy(1, 2); + * mySpy.mostRecentCall.args = [1, 2]; + */ + this.mostRecentCall = {}; + + /** + * Holds arguments for each call to the spy, indexed by call count + * @example + * var mySpy = jasmine.createSpy('foo'); + * mySpy(1, 2); + * mySpy(7, 8); + * mySpy.mostRecentCall.args = [7, 8]; + * mySpy.argsForCall[0] = [1, 2]; + * mySpy.argsForCall[1] = [7, 8]; + */ + this.argsForCall = []; + this.calls = []; +}; + +/** + * Tells a spy to call through to the actual implemenatation. + * + * @example + * var foo = { + * bar: function() { // do some stuff } + * } + * + * // defining a spy on an existing property: foo.bar + * spyOn(foo, 'bar').andCallThrough(); + */ +jasmine.Spy.prototype.andCallThrough = function() { + this.plan = this.originalValue; + return this; +}; + +/** + * For setting the return value of a spy. + * + * @example + * // defining a spy from scratch: foo() returns 'baz' + * var foo = jasmine.createSpy('spy on foo').andReturn('baz'); + * + * // defining a spy on an existing property: foo.bar() returns 'baz' + * spyOn(foo, 'bar').andReturn('baz'); + * + * @param {Object} value + */ +jasmine.Spy.prototype.andReturn = function(value) { + this.plan = function() { + return value; + }; + return this; +}; + +/** + * For throwing an exception when a spy is called. + * + * @example + * // defining a spy from scratch: foo() throws an exception w/ message 'ouch' + * var foo = jasmine.createSpy('spy on foo').andThrow('baz'); + * + * // defining a spy on an existing property: foo.bar() throws an exception w/ message 'ouch' + * spyOn(foo, 'bar').andThrow('baz'); + * + * @param {String} exceptionMsg + */ +jasmine.Spy.prototype.andThrow = function(exceptionMsg) { + this.plan = function() { + throw exceptionMsg; + }; + return this; +}; + +/** + * Calls an alternate implementation when a spy is called. + * + * @example + * var baz = function() { + * // do some stuff, return something + * } + * // defining a spy from scratch: foo() calls the function baz + * var foo = jasmine.createSpy('spy on foo').andCall(baz); + * + * // defining a spy on an existing property: foo.bar() calls an anonymnous function + * spyOn(foo, 'bar').andCall(function() { return 'baz';} ); + * + * @param {Function} fakeFunc + */ +jasmine.Spy.prototype.andCallFake = function(fakeFunc) { + this.plan = fakeFunc; + return this; +}; + +/** + * Resets all of a spy's the tracking variables so that it can be used again. + * + * @example + * spyOn(foo, 'bar'); + * + * foo.bar(); + * + * expect(foo.bar.callCount).toEqual(1); + * + * foo.bar.reset(); + * + * expect(foo.bar.callCount).toEqual(0); + */ +jasmine.Spy.prototype.reset = function() { + this.wasCalled = false; + this.callCount = 0; + this.argsForCall = []; + this.calls = []; + this.mostRecentCall = {}; +}; + +jasmine.createSpy = function(name) { + + var spyObj = function() { + spyObj.wasCalled = true; + spyObj.callCount++; + var args = jasmine.util.argsToArray(arguments); + spyObj.mostRecentCall.object = this; + spyObj.mostRecentCall.args = args; + spyObj.argsForCall.push(args); + spyObj.calls.push({object: this, args: args}); + return spyObj.plan.apply(this, arguments); + }; + + var spy = new jasmine.Spy(name); + + for (var prop in spy) { + spyObj[prop] = spy[prop]; + } + + spyObj.reset(); + + return spyObj; +}; + +/** + * Determines whether an object is a spy. + * + * @param {jasmine.Spy|Object} putativeSpy + * @returns {Boolean} + */ +jasmine.isSpy = function(putativeSpy) { + return putativeSpy && putativeSpy.isSpy; +}; + +/** + * Creates a more complicated spy: an Object that has every property a function that is a spy. Used for stubbing something + * large in one call. + * + * @param {String} baseName name of spy class + * @param {Array} methodNames array of names of methods to make spies + */ +jasmine.createSpyObj = function(baseName, methodNames) { + if (!jasmine.isArray_(methodNames) || methodNames.length === 0) { + throw new Error('createSpyObj requires a non-empty array of method names to create spies for'); + } + var obj = {}; + for (var i = 0; i < methodNames.length; i++) { + obj[methodNames[i]] = jasmine.createSpy(baseName + '.' + methodNames[i]); + } + return obj; +}; + +/** + * All parameters are pretty-printed and concatenated together, then written to the current spec's output. + * + * Be careful not to leave calls to <code>jasmine.log</code> in production code. + */ +jasmine.log = function() { + var spec = jasmine.getEnv().currentSpec; + spec.log.apply(spec, arguments); +}; + +/** + * Function that installs a spy on an existing object's method name. Used within a Spec to create a spy. + * + * @example + * // spy example + * var foo = { + * not: function(bool) { return !bool; } + * } + * spyOn(foo, 'not'); // actual foo.not will not be called, execution stops + * + * @see jasmine.createSpy + * @param obj + * @param methodName + * @return {jasmine.Spy} a Jasmine spy that can be chained with all spy methods + */ +var spyOn = function(obj, methodName) { + return jasmine.getEnv().currentSpec.spyOn(obj, methodName); +}; +if (isCommonJS) exports.spyOn = spyOn; + +/** + * Creates a Jasmine spec that will be added to the current suite. + * + * // TODO: pending tests + * + * @example + * it('should be true', function() { + * expect(true).toEqual(true); + * }); + * + * @param {String} desc description of this specification + * @param {Function} func defines the preconditions and expectations of the spec + */ +var it = function(desc, func) { + return jasmine.getEnv().it(desc, func); +}; +if (isCommonJS) exports.it = it; + +/** + * Creates a <em>disabled</em> Jasmine spec. + * + * A convenience method that allows existing specs to be disabled temporarily during development. + * + * @param {String} desc description of this specification + * @param {Function} func defines the preconditions and expectations of the spec + */ +var xit = function(desc, func) { + return jasmine.getEnv().xit(desc, func); +}; +if (isCommonJS) exports.xit = xit; + +/** + * Starts a chain for a Jasmine expectation. + * + * It is passed an Object that is the actual value and should chain to one of the many + * jasmine.Matchers functions. + * + * @param {Object} actual Actual value to test against and expected value + * @return {jasmine.Matchers} + */ +var expect = function(actual) { + return jasmine.getEnv().currentSpec.expect(actual); +}; +if (isCommonJS) exports.expect = expect; + +/** + * Defines part of a jasmine spec. Used in cominbination with waits or waitsFor in asynchrnous specs. + * + * @param {Function} func Function that defines part of a jasmine spec. + */ +var runs = function(func) { + jasmine.getEnv().currentSpec.runs(func); +}; +if (isCommonJS) exports.runs = runs; + +/** + * Waits a fixed time period before moving to the next block. + * + * @deprecated Use waitsFor() instead + * @param {Number} timeout milliseconds to wait + */ +var waits = function(timeout) { + jasmine.getEnv().currentSpec.waits(timeout); +}; +if (isCommonJS) exports.waits = waits; + +/** + * Waits for the latchFunction to return true before proceeding to the next block. + * + * @param {Function} latchFunction + * @param {String} optional_timeoutMessage + * @param {Number} optional_timeout + */ +var waitsFor = function(latchFunction, optional_timeoutMessage, optional_timeout) { + jasmine.getEnv().currentSpec.waitsFor.apply(jasmine.getEnv().currentSpec, arguments); +}; +if (isCommonJS) exports.waitsFor = waitsFor; + +/** + * A function that is called before each spec in a suite. + * + * Used for spec setup, including validating assumptions. + * + * @param {Function} beforeEachFunction + */ +var beforeEach = function(beforeEachFunction) { + jasmine.getEnv().beforeEach(beforeEachFunction); +}; +if (isCommonJS) exports.beforeEach = beforeEach; + +/** + * A function that is called after each spec in a suite. + * + * Used for restoring any state that is hijacked during spec execution. + * + * @param {Function} afterEachFunction + */ +var afterEach = function(afterEachFunction) { + jasmine.getEnv().afterEach(afterEachFunction); +}; +if (isCommonJS) exports.afterEach = afterEach; + +/** + * Defines a suite of specifications. + * + * Stores the description and all defined specs in the Jasmine environment as one suite of specs. Variables declared + * are accessible by calls to beforeEach, it, and afterEach. Describe blocks can be nested, allowing for specialization + * of setup in some tests. + * + * @example + * // TODO: a simple suite + * + * // TODO: a simple suite with a nested describe block + * + * @param {String} description A string, usually the class under test. + * @param {Function} specDefinitions function that defines several specs. + */ +var describe = function(description, specDefinitions) { + return jasmine.getEnv().describe(description, specDefinitions); +}; +if (isCommonJS) exports.describe = describe; + +/** + * Disables a suite of specifications. Used to disable some suites in a file, or files, temporarily during development. + * + * @param {String} description A string, usually the class under test. + * @param {Function} specDefinitions function that defines several specs. + */ +var xdescribe = function(description, specDefinitions) { + return jasmine.getEnv().xdescribe(description, specDefinitions); +}; +if (isCommonJS) exports.xdescribe = xdescribe; + + +// Provide the XMLHttpRequest class for IE 5.x-6.x: +jasmine.XmlHttpRequest = (typeof XMLHttpRequest == "undefined") ? function() { + function tryIt(f) { + try { + return f(); + } catch(e) { + } + return null; + } + + var xhr = tryIt(function() { + return new ActiveXObject("Msxml2.XMLHTTP.6.0"); + }) || + tryIt(function() { + return new ActiveXObject("Msxml2.XMLHTTP.3.0"); + }) || + tryIt(function() { + return new ActiveXObject("Msxml2.XMLHTTP"); + }) || + tryIt(function() { + return new ActiveXObject("Microsoft.XMLHTTP"); + }); + + if (!xhr) throw new Error("This browser does not support XMLHttpRequest."); + + return xhr; +} : XMLHttpRequest; +/** + * @namespace + */ +jasmine.util = {}; + +/** + * Declare that a child class inherit it's prototype from the parent class. + * + * @private + * @param {Function} childClass + * @param {Function} parentClass + */ +jasmine.util.inherit = function(childClass, parentClass) { + /** + * @private + */ + var subclass = function() { + }; + subclass.prototype = parentClass.prototype; + childClass.prototype = new subclass(); +}; + +jasmine.util.formatException = function(e) { + var lineNumber; + if (e.line) { + lineNumber = e.line; + } + else if (e.lineNumber) { + lineNumber = e.lineNumber; + } + + var file; + + if (e.sourceURL) { + file = e.sourceURL; + } + else if (e.fileName) { + file = e.fileName; + } + + var message = (e.name && e.message) ? (e.name + ': ' + e.message) : e.toString(); + + if (file && lineNumber) { + message += ' in ' + file + ' (line ' + lineNumber + ')'; + } + + return message; +}; + +jasmine.util.htmlEscape = function(str) { + if (!str) return str; + return str.replace(/&/g, '&') + .replace(/</g, '<') + .replace(/>/g, '>'); +}; + +jasmine.util.argsToArray = function(args) { + var arrayOfArgs = []; + for (var i = 0; i < args.length; i++) arrayOfArgs.push(args[i]); + return arrayOfArgs; +}; + +jasmine.util.extend = function(destination, source) { + for (var property in source) destination[property] = source[property]; + return destination; +}; + +/** + * Environment for Jasmine + * + * @constructor + */ +jasmine.Env = function() { + this.currentSpec = null; + this.currentSuite = null; + this.currentRunner_ = new jasmine.Runner(this); + + this.reporter = new jasmine.MultiReporter(); + + this.updateInterval = jasmine.DEFAULT_UPDATE_INTERVAL; + this.defaultTimeoutInterval = jasmine.DEFAULT_TIMEOUT_INTERVAL; + this.lastUpdate = 0; + this.specFilter = function() { + return true; + }; + + this.nextSpecId_ = 0; + this.nextSuiteId_ = 0; + this.equalityTesters_ = []; + + // wrap matchers + this.matchersClass = function() { + jasmine.Matchers.apply(this, arguments); + }; + jasmine.util.inherit(this.matchersClass, jasmine.Matchers); + + jasmine.Matchers.wrapInto_(jasmine.Matchers.prototype, this.matchersClass); +}; + + +jasmine.Env.prototype.setTimeout = jasmine.setTimeout; +jasmine.Env.prototype.clearTimeout = jasmine.clearTimeout; +jasmine.Env.prototype.setInterval = jasmine.setInterval; +jasmine.Env.prototype.clearInterval = jasmine.clearInterval; + +/** + * @returns an object containing jasmine version build info, if set. + */ +jasmine.Env.prototype.version = function () { + if (jasmine.version_) { + return jasmine.version_; + } else { + throw new Error('Version not set'); + } +}; + +/** + * @returns string containing jasmine version build info, if set. + */ +jasmine.Env.prototype.versionString = function() { + if (!jasmine.version_) { + return "version unknown"; + } + + var version = this.version(); + var versionString = version.major + "." + version.minor + "." + version.build; + if (version.release_candidate) { + versionString += ".rc" + version.release_candidate; + } + versionString += " revision " + version.revision; + return versionString; +}; + +/** + * @returns a sequential integer starting at 0 + */ +jasmine.Env.prototype.nextSpecId = function () { + return this.nextSpecId_++; +}; + +/** + * @returns a sequential integer starting at 0 + */ +jasmine.Env.prototype.nextSuiteId = function () { + return this.nextSuiteId_++; +}; + +/** + * Register a reporter to receive status updates from Jasmine. + * @param {jasmine.Reporter} reporter An object which will receive status updates. + */ +jasmine.Env.prototype.addReporter = function(reporter) { + this.reporter.addReporter(reporter); +}; + +jasmine.Env.prototype.execute = function() { + this.currentRunner_.execute(); +}; + +jasmine.Env.prototype.describe = function(description, specDefinitions) { + var suite = new jasmine.Suite(this, description, specDefinitions, this.currentSuite); + + var parentSuite = this.currentSuite; + if (parentSuite) { + parentSuite.add(suite); + } else { + this.currentRunner_.add(suite); + } + + this.currentSuite = suite; + + var declarationError = null; + try { + specDefinitions.call(suite); + } catch(e) { + declarationError = e; + } + + if (declarationError) { + this.it("encountered a declaration exception", function() { + throw declarationError; + }); + } + + this.currentSuite = parentSuite; + + return suite; +}; + +jasmine.Env.prototype.beforeEach = function(beforeEachFunction) { + if (this.currentSuite) { + this.currentSuite.beforeEach(beforeEachFunction); + } else { + this.currentRunner_.beforeEach(beforeEachFunction); + } +}; + +jasmine.Env.prototype.currentRunner = function () { + return this.currentRunner_; +}; + +jasmine.Env.prototype.afterEach = function(afterEachFunction) { + if (this.currentSuite) { + this.currentSuite.afterEach(afterEachFunction); + } else { + this.currentRunner_.afterEach(afterEachFunction); + } + +}; + +jasmine.Env.prototype.xdescribe = function(desc, specDefinitions) { + return { + execute: function() { + } + }; +}; + +jasmine.Env.prototype.it = function(description, func) { + var spec = new jasmine.Spec(this, this.currentSuite, description); + this.currentSuite.add(spec); + this.currentSpec = spec; + + if (func) { + spec.runs(func); + } + + return spec; +}; + +jasmine.Env.prototype.xit = function(desc, func) { + return { + id: this.nextSpecId(), + runs: function() { + } + }; +}; + +jasmine.Env.prototype.compareRegExps_ = function(a, b, mismatchKeys, mismatchValues) { + if (a.source != b.source) + mismatchValues.push("expected pattern /" + b.source + "/ is not equal to the pattern /" + a.source + "/"); + + if (a.ignoreCase != b.ignoreCase) + mismatchValues.push("expected modifier i was" + (b.ignoreCase ? " " : " not ") + "set and does not equal the origin modifier"); + + if (a.global != b.global) + mismatchValues.push("expected modifier g was" + (b.global ? " " : " not ") + "set and does not equal the origin modifier"); + + if (a.multiline != b.multiline) + mismatchValues.push("expected modifier m was" + (b.multiline ? " " : " not ") + "set and does not equal the origin modifier"); + + if (a.sticky != b.sticky) + mismatchValues.push("expected modifier y was" + (b.sticky ? " " : " not ") + "set and does not equal the origin modifier"); + + return (mismatchValues.length === 0); +}; + +jasmine.Env.prototype.compareObjects_ = function(a, b, mismatchKeys, mismatchValues) { + if (a.__Jasmine_offseteen_here_offsetefore__ === b && b.__Jasmine_offseteen_here_offsetefore__ === a) { + return true; + } + + a.__Jasmine_offseteen_here_offsetefore__ = b; + b.__Jasmine_offseteen_here_offsetefore__ = a; + + var hasKey = function(obj, keyName) { + return obj !== null && obj[keyName] !== jasmine.undefined; + }; + + for (var property in b) { + if (!hasKey(a, property) && hasKey(b, property)) { + mismatchKeys.push("expected has key '" + property + "', but missing from actual."); + } + } + for (property in a) { + if (!hasKey(b, property) && hasKey(a, property)) { + mismatchKeys.push("expected missing key '" + property + "', but present in actual."); + } + } + for (property in b) { + if (property == '__Jasmine_offseteen_here_offsetefore__') continue; + if (!this.equals_(a[property], b[property], mismatchKeys, mismatchValues)) { + mismatchValues.push("'" + property + "' was '" + (b[property] ? jasmine.util.htmlEscape(b[property].toString()) : b[property]) + "' in expected, but was '" + (a[property] ? jasmine.util.htmlEscape(a[property].toString()) : a[property]) + "' in actual."); + } + } + + if (jasmine.isArray_(a) && jasmine.isArray_(b) && a.length != b.length) { + mismatchValues.push("arrays were not the same length"); + } + + delete a.__Jasmine_offseteen_here_offsetefore__; + delete b.__Jasmine_offseteen_here_offsetefore__; + return (mismatchKeys.length === 0 && mismatchValues.length === 0); +}; + +jasmine.Env.prototype.equals_ = function(a, b, mismatchKeys, mismatchValues) { + mismatchKeys = mismatchKeys || []; + mismatchValues = mismatchValues || []; + + for (var i = 0; i < this.equalityTesters_.length; i++) { + var equalityTester = this.equalityTesters_[i]; + var result = equalityTester(a, b, this, mismatchKeys, mismatchValues); + if (result !== jasmine.undefined) return result; + } + + if (a === b) return true; + + if (a === jasmine.undefined || a === null || b === jasmine.undefined || b === null) { + return (a == jasmine.undefined && b == jasmine.undefined); + } + + if (jasmine.isDomNode(a) && jasmine.isDomNode(b)) { + return a === b; + } + + if (a instanceof Date && b instanceof Date) { + return a.getTime() == b.getTime(); + } + + if (a.jasmineMatches) { + return a.jasmineMatches(b); + } + + if (b.jasmineMatches) { + return b.jasmineMatches(a); + } + + if (a instanceof jasmine.Matchers.ObjectContaining) { + return a.matches(b); + } + + if (b instanceof jasmine.Matchers.ObjectContaining) { + return b.matches(a); + } + + if (jasmine.isString_(a) && jasmine.isString_(b)) { + return (a == b); + } + + if (jasmine.isNumber_(a) && jasmine.isNumber_(b)) { + return (a == b); + } + + if (a instanceof RegExp && b instanceof RegExp) { + return this.compareRegExps_(a, b, mismatchKeys, mismatchValues); + } + + if (typeof a === "object" && typeof b === "object") { + return this.compareObjects_(a, b, mismatchKeys, mismatchValues); + } + + //Straight check + return (a === b); +}; + +jasmine.Env.prototype.contains_ = function(haystack, needle) { + if (jasmine.isArray_(haystack)) { + for (var i = 0; i < haystack.length; i++) { + if (this.equals_(haystack[i], needle)) return true; + } + return false; + } + return haystack.indexOf(needle) >= 0; +}; + +jasmine.Env.prototype.addEqualityTester = function(equalityTester) { + this.equalityTesters_.push(equalityTester); +}; +/** No-op base class for Jasmine reporters. + * + * @constructor + */ +jasmine.Reporter = function() { +}; + +//noinspection JSUnusedLocalSymbols +jasmine.Reporter.prototype.reportRunnerStarting = function(runner) { +}; + +//noinspection JSUnusedLocalSymbols +jasmine.Reporter.prototype.reportRunnerResults = function(runner) { +}; + +//noinspection JSUnusedLocalSymbols +jasmine.Reporter.prototype.reportSuiteResults = function(suite) { +}; + +//noinspection JSUnusedLocalSymbols +jasmine.Reporter.prototype.reportSpecStarting = function(spec) { +}; + +//noinspection JSUnusedLocalSymbols +jasmine.Reporter.prototype.reportSpecResults = function(spec) { +}; + +//noinspection JSUnusedLocalSymbols +jasmine.Reporter.prototype.log = function(str) { +}; + +/** + * Blocks are functions with executable code that make up a spec. + * + * @constructor + * @param {jasmine.Env} env + * @param {Function} func + * @param {jasmine.Spec} spec + */ +jasmine.Block = function(env, func, spec) { + this.env = env; + this.func = func; + this.spec = spec; +}; + +jasmine.Block.prototype.execute = function(onComplete) { + if (!jasmine.CATCH_EXCEPTIONS) { + this.func.apply(this.spec); + } + else { + try { + this.func.apply(this.spec); + } catch (e) { + this.spec.fail(e); + } + } + onComplete(); +}; +/** JavaScript API reporter. + * + * @constructor + */ +jasmine.JsApiReporter = function() { + this.started = false; + this.finished = false; + this.suites_ = []; + this.results_ = {}; +}; + +jasmine.JsApiReporter.prototype.reportRunnerStarting = function(runner) { + this.started = true; + var suites = runner.topLevelSuites(); + for (var i = 0; i < suites.length; i++) { + var suite = suites[i]; + this.suites_.push(this.summarize_(suite)); + } +}; + +jasmine.JsApiReporter.prototype.suites = function() { + return this.suites_; +}; + +jasmine.JsApiReporter.prototype.summarize_ = function(suiteOrSpec) { + var isSuite = suiteOrSpec instanceof jasmine.Suite; + var summary = { + id: suiteOrSpec.id, + name: suiteOrSpec.description, + type: isSuite ? 'suite' : 'spec', + children: [] + }; + + if (isSuite) { + var children = suiteOrSpec.children(); + for (var i = 0; i < children.length; i++) { + summary.children.push(this.summarize_(children[i])); + } + } + return summary; +}; + +jasmine.JsApiReporter.prototype.results = function() { + return this.results_; +}; + +jasmine.JsApiReporter.prototype.resultsForSpec = function(specId) { + return this.results_[specId]; +}; + +//noinspection JSUnusedLocalSymbols +jasmine.JsApiReporter.prototype.reportRunnerResults = function(runner) { + this.finished = true; +}; + +//noinspection JSUnusedLocalSymbols +jasmine.JsApiReporter.prototype.reportSuiteResults = function(suite) { +}; + +//noinspection JSUnusedLocalSymbols +jasmine.JsApiReporter.prototype.reportSpecResults = function(spec) { + this.results_[spec.id] = { + messages: spec.results().getItems(), + result: spec.results().failedCount > 0 ? "failed" : "passed" + }; +}; + +//noinspection JSUnusedLocalSymbols +jasmine.JsApiReporter.prototype.log = function(str) { +}; + +jasmine.JsApiReporter.prototype.resultsForSpecs = function(specIds){ + var results = {}; + for (var i = 0; i < specIds.length; i++) { + var specId = specIds[i]; + results[specId] = this.summarizeResult_(this.results_[specId]); + } + return results; +}; + +jasmine.JsApiReporter.prototype.summarizeResult_ = function(result){ + var summaryMessages = []; + var messagesLength = result.messages.length; + for (var messageIndex = 0; messageIndex < messagesLength; messageIndex++) { + var resultMessage = result.messages[messageIndex]; + summaryMessages.push({ + text: resultMessage.type == 'log' ? resultMessage.toString() : jasmine.undefined, + passed: resultMessage.passed ? resultMessage.passed() : true, + type: resultMessage.type, + message: resultMessage.message, + trace: { + stack: resultMessage.passed && !resultMessage.passed() ? resultMessage.trace.stack : jasmine.undefined + } + }); + } + + return { + result : result.result, + messages : summaryMessages + }; +}; + +/** + * @constructor + * @param {jasmine.Env} env + * @param actual + * @param {jasmine.Spec} spec + */ +jasmine.Matchers = function(env, actual, spec, opt_isNot) { + this.env = env; + this.actual = actual; + this.spec = spec; + this.isNot = opt_isNot || false; + this.reportWasCalled_ = false; +}; + +// todo: @deprecated as of Jasmine 0.11, remove soon [xw] +jasmine.Matchers.pp = function(str) { + throw new Error("jasmine.Matchers.pp() is no longer supported, please use jasmine.pp() instead!"); +}; + +// todo: @deprecated Deprecated as of Jasmine 0.10. Rewrite your custom matchers to return true or false. [xw] +jasmine.Matchers.prototype.report = function(result, failing_message, details) { + throw new Error("As of jasmine 0.11, custom matchers must be implemented differently -- please see jasmine docs"); +}; + +jasmine.Matchers.wrapInto_ = function(prototype, matchersClass) { + for (var methodName in prototype) { + if (methodName == 'report') continue; + var orig = prototype[methodName]; + matchersClass.prototype[methodName] = jasmine.Matchers.matcherFn_(methodName, orig); + } +}; + +jasmine.Matchers.matcherFn_ = function(matcherName, matcherFunction) { + return function() { + var matcherArgs = jasmine.util.argsToArray(arguments); + var result = matcherFunction.apply(this, arguments); + + if (this.isNot) { + result = !result; + } + + if (this.reportWasCalled_) return result; + + var message; + if (!result) { + if (this.message) { + message = this.message.apply(this, arguments); + if (jasmine.isArray_(message)) { + message = message[this.isNot ? 1 : 0]; + } + } else { + var englishyPredicate = matcherName.replace(/[A-Z]/g, function(s) { return ' ' + s.toLowerCase(); }); + message = "Expected " + jasmine.pp(this.actual) + (this.isNot ? " not " : " ") + englishyPredicate; + if (matcherArgs.length > 0) { + for (var i = 0; i < matcherArgs.length; i++) { + if (i > 0) message += ","; + message += " " + jasmine.pp(matcherArgs[i]); + } + } + message += "."; + } + } + var expectationResult = new jasmine.ExpectationResult({ + matcherName: matcherName, + passed: result, + expected: matcherArgs.length > 1 ? matcherArgs : matcherArgs[0], + actual: this.actual, + message: message + }); + this.spec.addMatcherResult(expectationResult); + return jasmine.undefined; + }; +}; + + + + +/** + * toBe: compares the actual to the expected using === + * @param expected + */ +jasmine.Matchers.prototype.toBe = function(expected) { + return this.actual === expected; +}; + +/** + * toNotBe: compares the actual to the expected using !== + * @param expected + * @deprecated as of 1.0. Use not.toBe() instead. + */ +jasmine.Matchers.prototype.toNotBe = function(expected) { + return this.actual !== expected; +}; + +/** + * toEqual: compares the actual to the expected using common sense equality. Handles Objects, Arrays, etc. + * + * @param expected + */ +jasmine.Matchers.prototype.toEqual = function(expected) { + return this.env.equals_(this.actual, expected); +}; + +/** + * toNotEqual: compares the actual to the expected using the ! of jasmine.Matchers.toEqual + * @param expected + * @deprecated as of 1.0. Use not.toEqual() instead. + */ +jasmine.Matchers.prototype.toNotEqual = function(expected) { + return !this.env.equals_(this.actual, expected); +}; + +/** + * Matcher that compares the actual to the expected using a regular expression. Constructs a RegExp, so takes + * a pattern or a String. + * + * @param expected + */ +jasmine.Matchers.prototype.toMatch = function(expected) { + return new RegExp(expected).test(this.actual); +}; + +/** + * Matcher that compares the actual to the expected using the boolean inverse of jasmine.Matchers.toMatch + * @param expected + * @deprecated as of 1.0. Use not.toMatch() instead. + */ +jasmine.Matchers.prototype.toNotMatch = function(expected) { + return !(new RegExp(expected).test(this.actual)); +}; + +/** + * Matcher that compares the actual to jasmine.undefined. + */ +jasmine.Matchers.prototype.toBeDefined = function() { + return (this.actual !== jasmine.undefined); +}; + +/** + * Matcher that compares the actual to jasmine.undefined. + */ +jasmine.Matchers.prototype.toBeUndefined = function() { + return (this.actual === jasmine.undefined); +}; + +/** + * Matcher that compares the actual to null. + */ +jasmine.Matchers.prototype.toBeNull = function() { + return (this.actual === null); +}; + +/** + * Matcher that compares the actual to NaN. + */ +jasmine.Matchers.prototype.toBeNaN = function() { + this.message = function() { + return [ "Expected " + jasmine.pp(this.actual) + " to be NaN." ]; + }; + + return (this.actual !== this.actual); +}; + +/** + * Matcher that boolean not-nots the actual. + */ +jasmine.Matchers.prototype.toBeTruthy = function() { + return !!this.actual; +}; + + +/** + * Matcher that boolean nots the actual. + */ +jasmine.Matchers.prototype.toBeFalsy = function() { + return !this.actual; +}; + + +/** + * Matcher that checks to see if the actual, a Jasmine spy, was called. + */ +jasmine.Matchers.prototype.toHaveBeenCalled = function() { + if (arguments.length > 0) { + throw new Error('toHaveBeenCalled does not take arguments, use toHaveBeenCalledWith'); + } + + if (!jasmine.isSpy(this.actual)) { + throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.'); + } + + this.message = function() { + return [ + "Expected spy " + this.actual.identity + " to have been called.", + "Expected spy " + this.actual.identity + " not to have been called." + ]; + }; + + return this.actual.wasCalled; +}; + +/** @deprecated Use expect(xxx).toHaveBeenCalled() instead */ +jasmine.Matchers.prototype.wasCalled = jasmine.Matchers.prototype.toHaveBeenCalled; + +/** + * Matcher that checks to see if the actual, a Jasmine spy, was not called. + * + * @deprecated Use expect(xxx).not.toHaveBeenCalled() instead + */ +jasmine.Matchers.prototype.wasNotCalled = function() { + if (arguments.length > 0) { + throw new Error('wasNotCalled does not take arguments'); + } + + if (!jasmine.isSpy(this.actual)) { + throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.'); + } + + this.message = function() { + return [ + "Expected spy " + this.actual.identity + " to not have been called.", + "Expected spy " + this.actual.identity + " to have been called." + ]; + }; + + return !this.actual.wasCalled; +}; + +/** + * Matcher that checks to see if the actual, a Jasmine spy, was called with a set of parameters. + * + * @example + * + */ +jasmine.Matchers.prototype.toHaveBeenCalledWith = function() { + var expectedArgs = jasmine.util.argsToArray(arguments); + if (!jasmine.isSpy(this.actual)) { + throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.'); + } + this.message = function() { + var invertedMessage = "Expected spy " + this.actual.identity + " not to have been called with " + jasmine.pp(expectedArgs) + " but it was."; + var positiveMessage = ""; + if (this.actual.callCount === 0) { + positiveMessage = "Expected spy " + this.actual.identity + " to have been called with " + jasmine.pp(expectedArgs) + " but it was never called."; + } else { + positiveMessage = "Expected spy " + this.actual.identity + " to have been called with " + jasmine.pp(expectedArgs) + " but actual calls were " + jasmine.pp(this.actual.argsForCall).replace(/^\[ | \]$/g, '') + } + return [positiveMessage, invertedMessage]; + }; + + return this.env.contains_(this.actual.argsForCall, expectedArgs); +}; + +/** @deprecated Use expect(xxx).toHaveBeenCalledWith() instead */ +jasmine.Matchers.prototype.wasCalledWith = jasmine.Matchers.prototype.toHaveBeenCalledWith; + +/** @deprecated Use expect(xxx).not.toHaveBeenCalledWith() instead */ +jasmine.Matchers.prototype.wasNotCalledWith = function() { + var expectedArgs = jasmine.util.argsToArray(arguments); + if (!jasmine.isSpy(this.actual)) { + throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.'); + } + + this.message = function() { + return [ + "Expected spy not to have been called with " + jasmine.pp(expectedArgs) + " but it was", + "Expected spy to have been called with " + jasmine.pp(expectedArgs) + " but it was" + ]; + }; + + return !this.env.contains_(this.actual.argsForCall, expectedArgs); +}; + +/** + * Matcher that checks that the expected item is an element in the actual Array. + * + * @param {Object} expected + */ +jasmine.Matchers.prototype.toContain = function(expected) { + return this.env.contains_(this.actual, expected); +}; + +/** + * Matcher that checks that the expected item is NOT an element in the actual Array. + * + * @param {Object} expected + * @deprecated as of 1.0. Use not.toContain() instead. + */ +jasmine.Matchers.prototype.toNotContain = function(expected) { + return !this.env.contains_(this.actual, expected); +}; + +jasmine.Matchers.prototype.toBeLessThan = function(expected) { + return this.actual < expected; +}; + +jasmine.Matchers.prototype.toBeGreaterThan = function(expected) { + return this.actual > expected; +}; + +/** + * Matcher that checks that the expected item is equal to the actual item + * up to a given level of decimal precision (default 2). + * + * @param {Number} expected + * @param {Number} precision, as number of decimal places + */ +jasmine.Matchers.prototype.toBeCloseTo = function(expected, precision) { + if (!(precision === 0)) { + precision = precision || 2; + } + return Math.abs(expected - this.actual) < (Math.pow(10, -precision) / 2); +}; + +/** + * Matcher that checks that the expected exception was thrown by the actual. + * + * @param {String} [expected] + */ +jasmine.Matchers.prototype.toThrow = function(expected) { + var result = false; + var exception; + if (typeof this.actual != 'function') { + throw new Error('Actual is not a function'); + } + try { + this.actual(); + } catch (e) { + exception = e; + } + if (exception) { + result = (expected === jasmine.undefined || this.env.equals_(exception.message || exception, expected.message || expected)); + } + + var not = this.isNot ? "not " : ""; + + this.message = function() { + if (exception && (expected === jasmine.undefined || !this.env.equals_(exception.message || exception, expected.message || expected))) { + return ["Expected function " + not + "to throw", expected ? expected.message || expected : "an exception", ", but it threw", exception.message || exception].join(' '); + } else { + return "Expected function to throw an exception."; + } + }; + + return result; +}; + +jasmine.Matchers.Any = function(expectedClass) { + this.expectedClass = expectedClass; +}; + +jasmine.Matchers.Any.prototype.jasmineMatches = function(other) { + if (this.expectedClass == String) { + return typeof other == 'string' || other instanceof String; + } + + if (this.expectedClass == Number) { + return typeof other == 'number' || other instanceof Number; + } + + if (this.expectedClass == Function) { + return typeof other == 'function' || other instanceof Function; + } + + if (this.expectedClass == Object) { + return typeof other == 'object'; + } + + return other instanceof this.expectedClass; +}; + +jasmine.Matchers.Any.prototype.jasmineToString = function() { + return '<jasmine.any(' + this.expectedClass + ')>'; +}; + +jasmine.Matchers.ObjectContaining = function (sample) { + this.sample = sample; +}; + +jasmine.Matchers.ObjectContaining.prototype.jasmineMatches = function(other, mismatchKeys, mismatchValues) { + mismatchKeys = mismatchKeys || []; + mismatchValues = mismatchValues || []; + + var env = jasmine.getEnv(); + + var hasKey = function(obj, keyName) { + return obj != null && obj[keyName] !== jasmine.undefined; + }; + + for (var property in this.sample) { + if (!hasKey(other, property) && hasKey(this.sample, property)) { + mismatchKeys.push("expected has key '" + property + "', but missing from actual."); + } + else if (!env.equals_(this.sample[property], other[property], mismatchKeys, mismatchValues)) { + mismatchValues.push("'" + property + "' was '" + (other[property] ? jasmine.util.htmlEscape(other[property].toString()) : other[property]) + "' in expected, but was '" + (this.sample[property] ? jasmine.util.htmlEscape(this.sample[property].toString()) : this.sample[property]) + "' in actual."); + } + } + + return (mismatchKeys.length === 0 && mismatchValues.length === 0); +}; + +jasmine.Matchers.ObjectContaining.prototype.jasmineToString = function () { + return "<jasmine.objectContaining(" + jasmine.pp(this.sample) + ")>"; +}; +// Mock setTimeout, clearTimeout +// Contributed by Pivotal Computer Systems, www.pivotalsf.com + +jasmine.FakeTimer = function() { + this.reset(); + + var self = this; + self.setTimeout = function(funcToCall, millis) { + self.timeoutsMade++; + self.scheduleFunction(self.timeoutsMade, funcToCall, millis, false); + return self.timeoutsMade; + }; + + self.setInterval = function(funcToCall, millis) { + self.timeoutsMade++; + self.scheduleFunction(self.timeoutsMade, funcToCall, millis, true); + return self.timeoutsMade; + }; + + self.clearTimeout = function(timeoutKey) { + self.scheduledFunctions[timeoutKey] = jasmine.undefined; + }; + + self.clearInterval = function(timeoutKey) { + self.scheduledFunctions[timeoutKey] = jasmine.undefined; + }; + +}; + +jasmine.FakeTimer.prototype.reset = function() { + this.timeoutsMade = 0; + this.scheduledFunctions = {}; + this.nowMillis = 0; +}; + +jasmine.FakeTimer.prototype.tick = function(millis) { + var oldMillis = this.nowMillis; + var newMillis = oldMillis + millis; + this.runFunctionsWithinRange(oldMillis, newMillis); + this.nowMillis = newMillis; +}; + +jasmine.FakeTimer.prototype.runFunctionsWithinRange = function(oldMillis, nowMillis) { + var scheduledFunc; + var funcsToRun = []; + for (var timeoutKey in this.scheduledFunctions) { + scheduledFunc = this.scheduledFunctions[timeoutKey]; + if (scheduledFunc != jasmine.undefined && + scheduledFunc.runAtMillis >= oldMillis && + scheduledFunc.runAtMillis <= nowMillis) { + funcsToRun.push(scheduledFunc); + this.scheduledFunctions[timeoutKey] = jasmine.undefined; + } + } + + if (funcsToRun.length > 0) { + funcsToRun.sort(function(a, b) { + return a.runAtMillis - b.runAtMillis; + }); + for (var i = 0; i < funcsToRun.length; ++i) { + try { + var funcToRun = funcsToRun[i]; + this.nowMillis = funcToRun.runAtMillis; + funcToRun.funcToCall(); + if (funcToRun.recurring) { + this.scheduleFunction(funcToRun.timeoutKey, + funcToRun.funcToCall, + funcToRun.millis, + true); + } + } catch(e) { + } + } + this.runFunctionsWithinRange(oldMillis, nowMillis); + } +}; + +jasmine.FakeTimer.prototype.scheduleFunction = function(timeoutKey, funcToCall, millis, recurring) { + this.scheduledFunctions[timeoutKey] = { + runAtMillis: this.nowMillis + millis, + funcToCall: funcToCall, + recurring: recurring, + timeoutKey: timeoutKey, + millis: millis + }; +}; + +/** + * @namespace + */ +jasmine.Clock = { + defaultFakeTimer: new jasmine.FakeTimer(), + + reset: function() { + jasmine.Clock.assertInstalled(); + jasmine.Clock.defaultFakeTimer.reset(); + }, + + tick: function(millis) { + jasmine.Clock.assertInstalled(); + jasmine.Clock.defaultFakeTimer.tick(millis); + }, + + runFunctionsWithinRange: function(oldMillis, nowMillis) { + jasmine.Clock.defaultFakeTimer.runFunctionsWithinRange(oldMillis, nowMillis); + }, + + scheduleFunction: function(timeoutKey, funcToCall, millis, recurring) { + jasmine.Clock.defaultFakeTimer.scheduleFunction(timeoutKey, funcToCall, millis, recurring); + }, + + useMock: function() { + if (!jasmine.Clock.isInstalled()) { + var spec = jasmine.getEnv().currentSpec; + spec.after(jasmine.Clock.uninstallMock); + + jasmine.Clock.installMock(); + } + }, + + installMock: function() { + jasmine.Clock.installed = jasmine.Clock.defaultFakeTimer; + }, + + uninstallMock: function() { + jasmine.Clock.assertInstalled(); + jasmine.Clock.installed = jasmine.Clock.real; + }, + + real: { + setTimeout: jasmine.getGlobal().setTimeout, + clearTimeout: jasmine.getGlobal().clearTimeout, + setInterval: jasmine.getGlobal().setInterval, + clearInterval: jasmine.getGlobal().clearInterval + }, + + assertInstalled: function() { + if (!jasmine.Clock.isInstalled()) { + throw new Error("Mock clock is not installed, use jasmine.Clock.useMock()"); + } + }, + + isInstalled: function() { + return jasmine.Clock.installed == jasmine.Clock.defaultFakeTimer; + }, + + installed: null +}; +jasmine.Clock.installed = jasmine.Clock.real; + +//else for IE support +jasmine.getGlobal().setTimeout = function(funcToCall, millis) { + if (jasmine.Clock.installed.setTimeout.apply) { + return jasmine.Clock.installed.setTimeout.apply(this, arguments); + } else { + return jasmine.Clock.installed.setTimeout(funcToCall, millis); + } +}; + +jasmine.getGlobal().setInterval = function(funcToCall, millis) { + if (jasmine.Clock.installed.setInterval.apply) { + return jasmine.Clock.installed.setInterval.apply(this, arguments); + } else { + return jasmine.Clock.installed.setInterval(funcToCall, millis); + } +}; + +jasmine.getGlobal().clearTimeout = function(timeoutKey) { + if (jasmine.Clock.installed.clearTimeout.apply) { + return jasmine.Clock.installed.clearTimeout.apply(this, arguments); + } else { + return jasmine.Clock.installed.clearTimeout(timeoutKey); + } +}; + +jasmine.getGlobal().clearInterval = function(timeoutKey) { + if (jasmine.Clock.installed.clearTimeout.apply) { + return jasmine.Clock.installed.clearInterval.apply(this, arguments); + } else { + return jasmine.Clock.installed.clearInterval(timeoutKey); + } +}; + +/** + * @constructor + */ +jasmine.MultiReporter = function() { + this.subReporters_ = []; +}; +jasmine.util.inherit(jasmine.MultiReporter, jasmine.Reporter); + +jasmine.MultiReporter.prototype.addReporter = function(reporter) { + this.subReporters_.push(reporter); +}; + +(function() { + var functionNames = [ + "reportRunnerStarting", + "reportRunnerResults", + "reportSuiteResults", + "reportSpecStarting", + "reportSpecResults", + "log" + ]; + for (var i = 0; i < functionNames.length; i++) { + var functionName = functionNames[i]; + jasmine.MultiReporter.prototype[functionName] = (function(functionName) { + return function() { + for (var j = 0; j < this.subReporters_.length; j++) { + var subReporter = this.subReporters_[j]; + if (subReporter[functionName]) { + subReporter[functionName].apply(subReporter, arguments); + } + } + }; + })(functionName); + } +})(); +/** + * Holds results for a set of Jasmine spec. Allows for the results array to hold another jasmine.NestedResults + * + * @constructor + */ +jasmine.NestedResults = function() { + /** + * The total count of results + */ + this.totalCount = 0; + /** + * Number of passed results + */ + this.passedCount = 0; + /** + * Number of failed results + */ + this.failedCount = 0; + /** + * Was this suite/spec skipped? + */ + this.skipped = false; + /** + * @ignore + */ + this.items_ = []; +}; + +/** + * Roll up the result counts. + * + * @param result + */ +jasmine.NestedResults.prototype.rollupCounts = function(result) { + this.totalCount += result.totalCount; + this.passedCount += result.passedCount; + this.failedCount += result.failedCount; +}; + +/** + * Adds a log message. + * @param values Array of message parts which will be concatenated later. + */ +jasmine.NestedResults.prototype.log = function(values) { + this.items_.push(new jasmine.MessageResult(values)); +}; + +/** + * Getter for the results: message & results. + */ +jasmine.NestedResults.prototype.getItems = function() { + return this.items_; +}; + +/** + * Adds a result, tracking counts (total, passed, & failed) + * @param {jasmine.ExpectationResult|jasmine.NestedResults} result + */ +jasmine.NestedResults.prototype.addResult = function(result) { + if (result.type != 'log') { + if (result.items_) { + this.rollupCounts(result); + } else { + this.totalCount++; + if (result.passed()) { + this.passedCount++; + } else { + this.failedCount++; + } + } + } + this.items_.push(result); +}; + +/** + * @returns {Boolean} True if <b>everything</b> below passed + */ +jasmine.NestedResults.prototype.passed = function() { + return this.passedCount === this.totalCount; +}; +/** + * Base class for pretty printing for expectation results. + */ +jasmine.PrettyPrinter = function() { + this.ppNestLevel_ = 0; +}; + +/** + * Formats a value in a nice, human-readable string. + * + * @param value + */ +jasmine.PrettyPrinter.prototype.format = function(value) { + this.ppNestLevel_++; + try { + if (value === jasmine.undefined) { + this.emitScalar('undefined'); + } else if (value === null) { + this.emitScalar('null'); + } else if (value === jasmine.getGlobal()) { + this.emitScalar('<global>'); + } else if (value.jasmineToString) { + this.emitScalar(value.jasmineToString()); + } else if (typeof value === 'string') { + this.emitString(value); + } else if (jasmine.isSpy(value)) { + this.emitScalar("spy on " + value.identity); + } else if (value instanceof RegExp) { + this.emitScalar(value.toString()); + } else if (typeof value === 'function') { + this.emitScalar('Function'); + } else if (typeof value.nodeType === 'number') { + this.emitScalar('HTMLNode'); + } else if (value instanceof Date) { + this.emitScalar('Date(' + value + ')'); + } else if (value.__Jasmine_offseteen_here_offsetefore__) { + this.emitScalar('<circular reference: ' + (jasmine.isArray_(value) ? 'Array' : 'Object') + '>'); + } else if (jasmine.isArray_(value) || typeof value == 'object') { + value.__Jasmine_offseteen_here_offsetefore__ = true; + if (jasmine.isArray_(value)) { + this.emitArray(value); + } else { + this.emitObject(value); + } + delete value.__Jasmine_offseteen_here_offsetefore__; + } else { + this.emitScalar(value.toString()); + } + } finally { + this.ppNestLevel_--; + } +}; + +jasmine.PrettyPrinter.prototype.iterateObject = function(obj, fn) { + for (var property in obj) { + if (!obj.hasOwnProperty(property)) continue; + if (property == '__Jasmine_offseteen_here_offsetefore__') continue; + fn(property, obj.__lookupGetter__ ? (obj.__lookupGetter__(property) !== jasmine.undefined && + obj.__lookupGetter__(property) !== null) : false); + } +}; + +jasmine.PrettyPrinter.prototype.emitArray = jasmine.unimplementedMethod_; +jasmine.PrettyPrinter.prototype.emitObject = jasmine.unimplementedMethod_; +jasmine.PrettyPrinter.prototype.emitScalar = jasmine.unimplementedMethod_; +jasmine.PrettyPrinter.prototype.emitString = jasmine.unimplementedMethod_; + +jasmine.StringPrettyPrinter = function() { + jasmine.PrettyPrinter.call(this); + + this.string = ''; +}; +jasmine.util.inherit(jasmine.StringPrettyPrinter, jasmine.PrettyPrinter); + +jasmine.StringPrettyPrinter.prototype.emitScalar = function(value) { + this.append(value); +}; + +jasmine.StringPrettyPrinter.prototype.emitString = function(value) { + this.append("'" + value + "'"); +}; + +jasmine.StringPrettyPrinter.prototype.emitArray = function(array) { + if (this.ppNestLevel_ > jasmine.MAX_PRETTY_PRINT_DEPTH) { + this.append("Array"); + return; + } + + this.append('[ '); + for (var i = 0; i < array.length; i++) { + if (i > 0) { + this.append(', '); + } + this.format(array[i]); + } + this.append(' ]'); +}; + +jasmine.StringPrettyPrinter.prototype.emitObject = function(obj) { + if (this.ppNestLevel_ > jasmine.MAX_PRETTY_PRINT_DEPTH) { + this.append("Object"); + return; + } + + var self = this; + this.append('{ '); + var first = true; + + this.iterateObject(obj, function(property, isGetter) { + if (first) { + first = false; + } else { + self.append(', '); + } + + self.append(property); + self.append(' : '); + if (isGetter) { + self.append('<getter>'); + } else { + self.format(obj[property]); + } + }); + + this.append(' }'); +}; + +jasmine.StringPrettyPrinter.prototype.append = function(value) { + this.string += value; +}; +jasmine.Queue = function(env) { + this.env = env; + + // parallel to blocks. each true value in this array means the block will + // get executed even if we abort + this.ensured = []; + this.blocks = []; + this.running = false; + this.index = 0; + this.offset = 0; + this.abort = false; +}; + +jasmine.Queue.prototype.addBefore = function(block, ensure) { + if (ensure === jasmine.undefined) { + ensure = false; + } + + this.blocks.unshift(block); + this.ensured.unshift(ensure); +}; + +jasmine.Queue.prototype.add = function(block, ensure) { + if (ensure === jasmine.undefined) { + ensure = false; + } + + this.blocks.push(block); + this.ensured.push(ensure); +}; + +jasmine.Queue.prototype.insertNext = function(block, ensure) { + if (ensure === jasmine.undefined) { + ensure = false; + } + + this.ensured.splice((this.index + this.offset + 1), 0, ensure); + this.blocks.splice((this.index + this.offset + 1), 0, block); + this.offset++; +}; + +jasmine.Queue.prototype.start = function(onComplete) { + this.running = true; + this.onComplete = onComplete; + this.next_(); +}; + +jasmine.Queue.prototype.isRunning = function() { + return this.running; +}; + +jasmine.Queue.LOOP_DONT_RECURSE = true; + +jasmine.Queue.prototype.next_ = function() { + var self = this; + var goAgain = true; + + while (goAgain) { + goAgain = false; + + if (self.index < self.blocks.length && !(this.abort && !this.ensured[self.index])) { + var calledSynchronously = true; + var completedSynchronously = false; + + var onComplete = function () { + if (jasmine.Queue.LOOP_DONT_RECURSE && calledSynchronously) { + completedSynchronously = true; + return; + } + + if (self.blocks[self.index].abort) { + self.abort = true; + } + + self.offset = 0; + self.index++; + + var now = new Date().getTime(); + if (self.env.updateInterval && now - self.env.lastUpdate > self.env.updateInterval) { + self.env.lastUpdate = now; + self.env.setTimeout(function() { + self.next_(); + }, 0); + } else { + if (jasmine.Queue.LOOP_DONT_RECURSE && completedSynchronously) { + goAgain = true; + } else { + self.next_(); + } + } + }; + self.blocks[self.index].execute(onComplete); + + calledSynchronously = false; + if (completedSynchronously) { + onComplete(); + } + + } else { + self.running = false; + if (self.onComplete) { + self.onComplete(); + } + } + } +}; + +jasmine.Queue.prototype.results = function() { + var results = new jasmine.NestedResults(); + for (var i = 0; i < this.blocks.length; i++) { + if (this.blocks[i].results) { + results.addResult(this.blocks[i].results()); + } + } + return results; +}; + + +/** + * Runner + * + * @constructor + * @param {jasmine.Env} env + */ +jasmine.Runner = function(env) { + var self = this; + self.env = env; + self.queue = new jasmine.Queue(env); + self.before_ = []; + self.after_ = []; + self.suites_ = []; +}; + +jasmine.Runner.prototype.execute = function() { + var self = this; + if (self.env.reporter.reportRunnerStarting) { + self.env.reporter.reportRunnerStarting(this); + } + self.queue.start(function () { + self.finishCallback(); + }); +}; + +jasmine.Runner.prototype.beforeEach = function(beforeEachFunction) { + beforeEachFunction.typeName = 'beforeEach'; + this.before_.splice(0,0,beforeEachFunction); +}; + +jasmine.Runner.prototype.afterEach = function(afterEachFunction) { + afterEachFunction.typeName = 'afterEach'; + this.after_.splice(0,0,afterEachFunction); +}; + + +jasmine.Runner.prototype.finishCallback = function() { + this.env.reporter.reportRunnerResults(this); +}; + +jasmine.Runner.prototype.addSuite = function(suite) { + this.suites_.push(suite); +}; + +jasmine.Runner.prototype.add = function(block) { + if (block instanceof jasmine.Suite) { + this.addSuite(block); + } + this.queue.add(block); +}; + +jasmine.Runner.prototype.specs = function () { + var suites = this.suites(); + var specs = []; + for (var i = 0; i < suites.length; i++) { + specs = specs.concat(suites[i].specs()); + } + return specs; +}; + +jasmine.Runner.prototype.suites = function() { + return this.suites_; +}; + +jasmine.Runner.prototype.topLevelSuites = function() { + var topLevelSuites = []; + for (var i = 0; i < this.suites_.length; i++) { + if (!this.suites_[i].parentSuite) { + topLevelSuites.push(this.suites_[i]); + } + } + return topLevelSuites; +}; + +jasmine.Runner.prototype.results = function() { + return this.queue.results(); +}; +/** + * Internal representation of a Jasmine specification, or test. + * + * @constructor + * @param {jasmine.Env} env + * @param {jasmine.Suite} suite + * @param {String} description + */ +jasmine.Spec = function(env, suite, description) { + if (!env) { + throw new Error('jasmine.Env() required'); + } + if (!suite) { + throw new Error('jasmine.Suite() required'); + } + var spec = this; + spec.id = env.nextSpecId ? env.nextSpecId() : null; + spec.env = env; + spec.suite = suite; + spec.description = description; + spec.queue = new jasmine.Queue(env); + + spec.afterCallbacks = []; + spec.spies_ = []; + + spec.results_ = new jasmine.NestedResults(); + spec.results_.description = description; + spec.matchersClass = null; +}; + +jasmine.Spec.prototype.getFullName = function() { + return this.suite.getFullName() + ' ' + this.description + '.'; +}; + + +jasmine.Spec.prototype.results = function() { + return this.results_; +}; + +/** + * All parameters are pretty-printed and concatenated together, then written to the spec's output. + * + * Be careful not to leave calls to <code>jasmine.log</code> in production code. + */ +jasmine.Spec.prototype.log = function() { + return this.results_.log(arguments); +}; + +jasmine.Spec.prototype.runs = function (func) { + var block = new jasmine.Block(this.env, func, this); + this.addToQueue(block); + return this; +}; + +jasmine.Spec.prototype.addToQueue = function (block) { + if (this.queue.isRunning()) { + this.queue.insertNext(block); + } else { + this.queue.add(block); + } +}; + +/** + * @param {jasmine.ExpectationResult} result + */ +jasmine.Spec.prototype.addMatcherResult = function(result) { + this.results_.addResult(result); +}; + +jasmine.Spec.prototype.expect = function(actual) { + var positive = new (this.getMatchersClass_())(this.env, actual, this); + positive.not = new (this.getMatchersClass_())(this.env, actual, this, true); + return positive; +}; + +/** + * Waits a fixed time period before moving to the next block. + * + * @deprecated Use waitsFor() instead + * @param {Number} timeout milliseconds to wait + */ +jasmine.Spec.prototype.waits = function(timeout) { + var waitsFunc = new jasmine.WaitsBlock(this.env, timeout, this); + this.addToQueue(waitsFunc); + return this; +}; + +/** + * Waits for the latchFunction to return true before proceeding to the next block. + * + * @param {Function} latchFunction + * @param {String} optional_timeoutMessage + * @param {Number} optional_timeout + */ +jasmine.Spec.prototype.waitsFor = function(latchFunction, optional_timeoutMessage, optional_timeout) { + var latchFunction_ = null; + var optional_timeoutMessage_ = null; + var optional_timeout_ = null; + + for (var i = 0; i < arguments.length; i++) { + var arg = arguments[i]; + switch (typeof arg) { + case 'function': + latchFunction_ = arg; + break; + case 'string': + optional_timeoutMessage_ = arg; + break; + case 'number': + optional_timeout_ = arg; + break; + } + } + + var waitsForFunc = new jasmine.WaitsForBlock(this.env, optional_timeout_, latchFunction_, optional_timeoutMessage_, this); + this.addToQueue(waitsForFunc); + return this; +}; + +jasmine.Spec.prototype.fail = function (e) { + var expectationResult = new jasmine.ExpectationResult({ + passed: false, + message: e ? jasmine.util.formatException(e) : 'Exception', + trace: { stack: e.stack } + }); + this.results_.addResult(expectationResult); +}; + +jasmine.Spec.prototype.getMatchersClass_ = function() { + return this.matchersClass || this.env.matchersClass; +}; + +jasmine.Spec.prototype.addMatchers = function(matchersPrototype) { + var parent = this.getMatchersClass_(); + var newMatchersClass = function() { + parent.apply(this, arguments); + }; + jasmine.util.inherit(newMatchersClass, parent); + jasmine.Matchers.wrapInto_(matchersPrototype, newMatchersClass); + this.matchersClass = newMatchersClass; +}; + +jasmine.Spec.prototype.finishCallback = function() { + this.env.reporter.reportSpecResults(this); +}; + +jasmine.Spec.prototype.finish = function(onComplete) { + this.removeAllSpies(); + this.finishCallback(); + if (onComplete) { + onComplete(); + } +}; + +jasmine.Spec.prototype.after = function(doAfter) { + if (this.queue.isRunning()) { + this.queue.add(new jasmine.Block(this.env, doAfter, this), true); + } else { + this.afterCallbacks.unshift(doAfter); + } +}; + +jasmine.Spec.prototype.execute = function(onComplete) { + var spec = this; + if (!spec.env.specFilter(spec)) { + spec.results_.skipped = true; + spec.finish(onComplete); + return; + } + + this.env.reporter.reportSpecStarting(this); + + spec.env.currentSpec = spec; + + spec.addBeforesAndAftersToQueue(); + + spec.queue.start(function () { + spec.finish(onComplete); + }); +}; + +jasmine.Spec.prototype.addBeforesAndAftersToQueue = function() { + var runner = this.env.currentRunner(); + var i; + + for (var suite = this.suite; suite; suite = suite.parentSuite) { + for (i = 0; i < suite.before_.length; i++) { + this.queue.addBefore(new jasmine.Block(this.env, suite.before_[i], this)); + } + } + for (i = 0; i < runner.before_.length; i++) { + this.queue.addBefore(new jasmine.Block(this.env, runner.before_[i], this)); + } + for (i = 0; i < this.afterCallbacks.length; i++) { + this.queue.add(new jasmine.Block(this.env, this.afterCallbacks[i], this), true); + } + for (suite = this.suite; suite; suite = suite.parentSuite) { + for (i = 0; i < suite.after_.length; i++) { + this.queue.add(new jasmine.Block(this.env, suite.after_[i], this), true); + } + } + for (i = 0; i < runner.after_.length; i++) { + this.queue.add(new jasmine.Block(this.env, runner.after_[i], this), true); + } +}; + +jasmine.Spec.prototype.explodes = function() { + throw 'explodes function should not have been called'; +}; + +jasmine.Spec.prototype.spyOn = function(obj, methodName, ignoreMethodDoesntExist) { + if (obj == jasmine.undefined) { + throw "spyOn could not find an object to spy upon for " + methodName + "()"; + } + + if (!ignoreMethodDoesntExist && obj[methodName] === jasmine.undefined) { + throw methodName + '() method does not exist'; + } + + if (!ignoreMethodDoesntExist && obj[methodName] && obj[methodName].isSpy) { + throw new Error(methodName + ' has already been spied upon'); + } + + var spyObj = jasmine.createSpy(methodName); + + this.spies_.push(spyObj); + spyObj.baseObj = obj; + spyObj.methodName = methodName; + spyObj.originalValue = obj[methodName]; + + obj[methodName] = spyObj; + + return spyObj; +}; + +jasmine.Spec.prototype.removeAllSpies = function() { + for (var i = 0; i < this.spies_.length; i++) { + var spy = this.spies_[i]; + spy.baseObj[spy.methodName] = spy.originalValue; + } + this.spies_ = []; +}; + +/** + * Internal representation of a Jasmine suite. + * + * @constructor + * @param {jasmine.Env} env + * @param {String} description + * @param {Function} specDefinitions + * @param {jasmine.Suite} parentSuite + */ +jasmine.Suite = function(env, description, specDefinitions, parentSuite) { + var self = this; + self.id = env.nextSuiteId ? env.nextSuiteId() : null; + self.description = description; + self.queue = new jasmine.Queue(env); + self.parentSuite = parentSuite; + self.env = env; + self.before_ = []; + self.after_ = []; + self.children_ = []; + self.suites_ = []; + self.specs_ = []; +}; + +jasmine.Suite.prototype.getFullName = function() { + var fullName = this.description; + for (var parentSuite = this.parentSuite; parentSuite; parentSuite = parentSuite.parentSuite) { + fullName = parentSuite.description + ' ' + fullName; + } + return fullName; +}; + +jasmine.Suite.prototype.finish = function(onComplete) { + this.env.reporter.reportSuiteResults(this); + this.finished = true; + if (typeof(onComplete) == 'function') { + onComplete(); + } +}; + +jasmine.Suite.prototype.beforeEach = function(beforeEachFunction) { + beforeEachFunction.typeName = 'beforeEach'; + this.before_.unshift(beforeEachFunction); +}; + +jasmine.Suite.prototype.afterEach = function(afterEachFunction) { + afterEachFunction.typeName = 'afterEach'; + this.after_.unshift(afterEachFunction); +}; + +jasmine.Suite.prototype.results = function() { + return this.queue.results(); +}; + +jasmine.Suite.prototype.add = function(suiteOrSpec) { + this.children_.push(suiteOrSpec); + if (suiteOrSpec instanceof jasmine.Suite) { + this.suites_.push(suiteOrSpec); + this.env.currentRunner().addSuite(suiteOrSpec); + } else { + this.specs_.push(suiteOrSpec); + } + this.queue.add(suiteOrSpec); +}; + +jasmine.Suite.prototype.specs = function() { + return this.specs_; +}; + +jasmine.Suite.prototype.suites = function() { + return this.suites_; +}; + +jasmine.Suite.prototype.children = function() { + return this.children_; +}; + +jasmine.Suite.prototype.execute = function(onComplete) { + var self = this; + this.queue.start(function () { + self.finish(onComplete); + }); +}; +jasmine.WaitsBlock = function(env, timeout, spec) { + this.timeout = timeout; + jasmine.Block.call(this, env, null, spec); +}; + +jasmine.util.inherit(jasmine.WaitsBlock, jasmine.Block); + +jasmine.WaitsBlock.prototype.execute = function (onComplete) { + if (jasmine.VERBOSE) { + this.env.reporter.log('>> Jasmine waiting for ' + this.timeout + ' ms...'); + } + this.env.setTimeout(function () { + onComplete(); + }, this.timeout); +}; +/** + * A block which waits for some condition to become true, with timeout. + * + * @constructor + * @extends jasmine.Block + * @param {jasmine.Env} env The Jasmine environment. + * @param {Number} timeout The maximum time in milliseconds to wait for the condition to become true. + * @param {Function} latchFunction A function which returns true when the desired condition has been met. + * @param {String} message The message to display if the desired condition hasn't been met within the given time period. + * @param {jasmine.Spec} spec The Jasmine spec. + */ +jasmine.WaitsForBlock = function(env, timeout, latchFunction, message, spec) { + this.timeout = timeout || env.defaultTimeoutInterval; + this.latchFunction = latchFunction; + this.message = message; + this.totalTimeSpentWaitingForLatch = 0; + jasmine.Block.call(this, env, null, spec); +}; +jasmine.util.inherit(jasmine.WaitsForBlock, jasmine.Block); + +jasmine.WaitsForBlock.TIMEOUT_INCREMENT = 10; + +jasmine.WaitsForBlock.prototype.execute = function(onComplete) { + if (jasmine.VERBOSE) { + this.env.reporter.log('>> Jasmine waiting for ' + (this.message || 'something to happen')); + } + var latchFunctionResult; + try { + latchFunctionResult = this.latchFunction.apply(this.spec); + } catch (e) { + this.spec.fail(e); + onComplete(); + return; + } + + if (latchFunctionResult) { + onComplete(); + } else if (this.totalTimeSpentWaitingForLatch >= this.timeout) { + var message = 'timed out after ' + this.timeout + ' msec waiting for ' + (this.message || 'something to happen'); + this.spec.fail({ + name: 'timeout', + message: message + }); + + this.abort = true; + onComplete(); + } else { + this.totalTimeSpentWaitingForLatch += jasmine.WaitsForBlock.TIMEOUT_INCREMENT; + var self = this; + this.env.setTimeout(function() { + self.execute(onComplete); + }, jasmine.WaitsForBlock.TIMEOUT_INCREMENT); + } +}; + +jasmine.version_= { + "major": 1, + "minor": 3, + "build": 1, + "revision": 1354556913 +}; diff --git a/spec/spec/container.js b/spec/spec/container.js new file mode 100644 index 0000000..384aaf2 --- /dev/null +++ b/spec/spec/container.js @@ -0,0 +1,255 @@ +describe('Container', function() { + + describe('rect()', function() { + it('should increase children by 1', function() { + var initial = draw.children().length + draw.rect(100,100) + expect(draw.children().length).toBe(initial + 1) + }) + it('should create a rect', function() { + expect(draw.rect(100,100).type).toBe('rect') + }) + it('should create an instance of SVG.Rect', function() { + expect(draw.rect(100,100) instanceof SVG.Rect).toBe(true) + }) + it('should be an instance of SVG.Shape', function() { + expect(draw.rect(100,100) instanceof SVG.Shape).toBe(true) + }) + it('should be an instance of SVG.Element', function() { + expect(draw.rect(100,100) instanceof SVG.Element).toBe(true) + }) + }) + + describe('ellipse()', function() { + it('should increase children by 1', function() { + var initial = draw.children().length + draw.ellipse(100,100) + expect(draw.children().length).toBe(initial + 1) + }) + it('should create an ellipse', function() { + expect(draw.ellipse(100,100).type).toBe('ellipse') + }) + it('should create an instance of SVG.Ellipse', function() { + expect(draw.ellipse(100,100) instanceof SVG.Ellipse).toBe(true) + }) + it('should be an instance of SVG.Shape', function() { + expect(draw.ellipse(100,100) instanceof SVG.Shape).toBe(true) + }) + it('should be an instance of SVG.Element', function() { + expect(draw.ellipse(100,100) instanceof SVG.Element).toBe(true) + }) + }) + + describe('circle()', function() { + it('should increase children by 1', function() { + var initial = draw.children().length + draw.circle(100) + expect(draw.children().length).toBe(initial + 1) + }) + it('should create an ellipse', function() { + expect(draw.circle(100).type).toBe('ellipse') + }) + it('should create an instance of SVG.Ellipse', function() { + expect(draw.circle(100) instanceof SVG.Ellipse).toBe(true) + }) + it('should be an instance of SVG.Shape', function() { + expect(draw.circle(100) instanceof SVG.Shape).toBe(true) + }) + it('should be an instance of SVG.Element', function() { + expect(draw.circle(100) instanceof SVG.Element).toBe(true) + }) + }) + + describe('line()', function() { + it('should increase children by 1', function() { + var initial = draw.children().length + draw.line(0,100,100,0) + expect(draw.children().length).toBe(initial + 1) + }) + it('should create a line', function() { + expect(draw.line(0,100,100,0).type).toBe('line') + }) + it('should create an instance of SVG.Line', function() { + expect(draw.line(0,100,100,0) instanceof SVG.Line).toBe(true) + }) + it('should be an instance of SVG.Shape', function() { + expect(draw.line(0,100,100,0) instanceof SVG.Shape).toBe(true) + }) + it('should be an instance of SVG.Element', function() { + expect(draw.line(0,100,100,0) instanceof SVG.Element).toBe(true) + }) + }) + + describe('polyline()', function() { + it('should increase children by 1', function() { + var initial = draw.children().length + draw.polyline('0,0 100,0 100,100 0,100') + expect(draw.children().length).toBe(initial + 1) + }) + it('should create a polyline', function() { + expect(draw.polyline('0,0 100,0 100,100 0,100').type).toBe('polyline') + }) + it('should be an instance of SVG.Polyline', function() { + expect(draw.polyline('0,0 100,0 100,100 0,100') instanceof SVG.Polyline).toBe(true) + }) + it('should be an instance of SVG.Shape', function() { + expect(draw.polyline('0,0 100,0 100,100 0,100') instanceof SVG.Shape).toBe(true) + }) + it('should be an instance of SVG.Element', function() { + expect(draw.polyline('0,0 100,0 100,100 0,100') instanceof SVG.Element).toBe(true) + }) + }) + + describe('polygon()', function() { + it('should increase children by 1', function() { + var initial = draw.children().length + draw.polygon('0,0 100,0 100,100 0,100') + expect(draw.children().length).toBe(initial + 1) + }) + it('should create a polygon', function() { + expect(draw.polygon('0,0 100,0 100,100 0,100').type).toBe('polygon') + }) + it('should be an instance of SVG.Polygon', function() { + expect(draw.polygon('0,0 100,0 100,100 0,100') instanceof SVG.Polygon).toBe(true) + }) + it('should be an instance of SVG.Shape', function() { + expect(draw.polygon('0,0 100,0 100,100 0,100') instanceof SVG.Shape).toBe(true) + }) + it('should be an instance of SVG.Element', function() { + expect(draw.polygon('0,0 100,0 100,100 0,100') instanceof SVG.Element).toBe(true) + }) + }) + + describe('path()', function() { + it('should increase children by 1', function() { + var initial = draw.children().length + draw.path(svgPath) + expect(draw.children().length).toBe(initial + 1) + }) + it('should create a path', function() { + expect(draw.path(svgPath).type).toBe('path') + }) + it('should be an instance of SVG.Path', function() { + expect(draw.path(svgPath) instanceof SVG.Path).toBe(true) + }) + it('should be an instance of SVG.Shape', function() { + expect(draw.path(svgPath) instanceof SVG.Shape).toBe(true) + }) + it('should be an instance of SVG.Element', function() { + expect(draw.path(svgPath) instanceof SVG.Element).toBe(true) + }) + }) + + describe('image()', function() { + it('should increase children by 1', function() { + var initial = draw.children().length + draw.image(imageUrl, 100, 100) + expect(draw.children().length).toBe(initial + 1) + }) + it('should create a rect', function() { + expect(draw.image(imageUrl, 100, 100).type).toBe('image') + }) + it('should create an instance of SVG.Rect', function() { + expect(draw.image(imageUrl, 100, 100) instanceof SVG.Image).toBe(true) + }) + it('should be an instance of SVG.Shape', function() { + expect(draw.image(imageUrl, 100, 100) instanceof SVG.Shape).toBe(true) + }) + it('should be an instance of SVG.Element', function() { + expect(draw.image(imageUrl, 100, 100) instanceof SVG.Element).toBe(true) + }) + }) + + describe('text()', function() { + it('should increase children by 1', function() { + var initial = draw.children().length + draw.text(loremIpsum) + expect(draw.children().length).toBe(initial + 1) + }) + it('should create a rect', function() { + expect(draw.text(loremIpsum).type).toBe('text') + }) + it('should create an instance of SVG.Rect', function() { + expect(draw.text(loremIpsum) instanceof SVG.Text).toBe(true) + }) + it('should be an instance of SVG.Shape', function() { + expect(draw.text(loremIpsum) instanceof SVG.Shape).toBe(true) + }) + it('should be an instance of SVG.Element', function() { + expect(draw.text(loremIpsum) instanceof SVG.Element).toBe(true) + }) + }) + + describe('clear()', function() { + it('should remove all children', function() { + draw.rect(100,100) + draw.clear() + expect(draw.children().length).toBe(0) + }) + }) + + describe('each()', function() { + it('should iterate over all children', function() { + var children = [] + + draw.rect(100,100) + draw.ellipse(100, 100) + draw.polygon() + + draw.each(function() { + children.push(this.type) + }) + + expect(children).toEqual(['rect', 'ellipse', 'polygon']) + }) + it('should only include the its own children', function() { + var children = [] + , group = draw.group() + + draw.rect(100,200) + draw.circle(300) + + group.rect(100,100) + group.ellipse(100, 100) + group.polygon() + + group.each(function() { + children.push(this) + }) + + expect(children).toEqual(group.children()) + }) + }) + + describe('viewbox()', function() { + it('should set the viewbox when four arguments are provided', function() { + draw.viewbox(0,0,100,100) + expect(draw.node.getAttribute('viewBox')).toBe('0 0 100 100') + }) + it('should set the viewbox when an object is provided as first argument', function() { + draw.viewbox({ x: 0, y: 0, width: 50, height: 50, zoom: 1 }) + expect(draw.node.getAttribute('viewBox')).toBe('0 0 50 50') + }) + it('should get the viewbox if no arguments are given', function() { + draw.viewbox(0,0,100,100) + expect(draw.viewbox()).toEqual({ x: 0, y: 0, width: 100, height: 100, zoom: 1 }) + }) + it('should define the zoom of the viewbox in relation to the canvas size', function() { + draw.size(100,100).viewbox(0,0,50,50) + expect(draw.viewbox().zoom).toEqual(100 / 50) + }) + }) + + +}) + + + + + + + + + + + diff --git a/spec/spec/doc.js b/spec/spec/doc.js new file mode 100644 index 0000000..1d5eaa5 --- /dev/null +++ b/spec/spec/doc.js @@ -0,0 +1,11 @@ +describe('Doc', function() { + + it('should be an instance of SVG.Container', function() { + expect(draw instanceof SVG.Container).toBe(true) + }) + + it('should have a defs element', function() { + expect(draw instanceof SVG.Container).toBe(true) + }) + +})
\ No newline at end of file diff --git a/spec/spec/element.js b/spec/spec/element.js new file mode 100644 index 0000000..03f8db7 --- /dev/null +++ b/spec/spec/element.js @@ -0,0 +1,212 @@ +describe('Element', function() { + + afterEach(function() { + draw.clear() + }) + + it('should create a circular reference on the node', function() { + var rect = draw.rect(100,100) + expect(rect.node.instance).toBe(rect) + }) + + describe('attr()', function() { + var rect + + beforeEach(function() { + rect = draw.rect(100,100) + }) + + it('should set one attribute when two arguments are given', function() { + rect.attr('fill', '#ff0066') + expect(rect.node.getAttribute('fill')).toBe('#ff0066') + }) + it('should set various attributes when an object is given', function() { + rect.attr({ fill: '#00ff66', stroke: '#ff2233', 'stroke-width': 10 }) + expect(rect.node.getAttribute('fill')).toBe('#00ff66') + expect(rect.node.getAttribute('stroke')).toBe('#ff2233') + expect(rect.node.getAttribute('stroke-width')).toBe('10') + }) + it('should get the value of the string value given as first argument', function() { + rect.attr('fill', '#ff0066') + expect(rect.attr('fill')).toEqual('#ff0066') + }) + it('should get an object with all attributes without any arguments', function() { + rect.attr({ fill: '#00ff66', stroke: '#ff2233' }) + var attr = rect.attr() + expect(attr.fill).toBe('#00ff66') + expect(attr.stroke).toBe('#ff2233') + }) + it('should remove an attribute if the second argument is explicitly set to null', function() { + rect.attr('stroke-width', 10) + expect(rect.node.getAttribute('stroke-width')).toBe('10') + rect.attr('stroke-width', null) + expect(rect.node.getAttribute('stroke-width')).toBe(null) + }) + it('should correctly parse numeric values as a getter', function() { + rect.attr('stroke-width', 11) + expect(rect.node.getAttribute('stroke-width')).toBe('11') + expect(rect.attr('stroke-width')).toBe(11) + }) + it('should correctly parse negative numeric values as a getter', function() { + rect.attr('x', -120) + expect(rect.node.getAttribute('x')).toBe('-120') + expect(rect.attr('x')).toBe(-120) + }) + it('should get the "style" attribute as a string', function() { + rect.style('cursor', 'pointer') + expect(rect.attr('style')).toBe('cursor:pointer;') + }) + it('should redirect to the style() method when setting a style string', function() { + rect.attr('style', 'cursor:move;') + expect(rect.node.getAttribute('style')).toBe('cursor:move;') + }) + }) + + describe('style()', function() { + it('should set the style with key and value arguments', function() { + var rect = draw.rect(100,100).style('cursor', 'crosshair') + expect(rect.node.getAttribute('style')).toBe('cursor:crosshair;') + }) + it('should set multiple styles with an object as the first argument', function() { + var rect = draw.rect(100,100).style({ cursor: 'help', display: 'block' }) + expect(rect.node.getAttribute('style')).toBe('cursor:help;display:block;') + }) + it('should get a style with a string key as the fists argument', function() { + var rect = draw.rect(100,100).style({ cursor: 'progress', display: 'block' }) + expect(rect.style('cursor')).toBe('progress') + }) + it('should get a style with a string key as the fists argument', function() { + var rect = draw.rect(100,100).style({ cursor: 's-resize', display: 'none' }) + expect(rect.style()).toBe('cursor:s-resize;display:none;') + }) + it('should remove a style if the value is an empty string', function() { + var rect = draw.rect(100,100).style({ cursor: 'n-resize', display: '' }) + expect(rect.style()).toBe('cursor:n-resize;') + }) + it('should remove a style if the value explicitly set to null', function() { + var rect = draw.rect(100,100).style('cursor', 'w-resize') + expect(rect.style()).toBe('cursor:w-resize;') + rect.style('cursor', null) + expect(rect.style()).toBe('') + }) + }) + + describe('transform()', function() { + it('should set the translation of and element', function() { + var rect = draw.rect(100,100).transform({ x: 10, y: 10 }) + expect(rect.node.getAttribute('transform')).toBe('translate(10,10)') + }) + it('should set the scaleX of and element', function() { + var rect = draw.rect(100,100).transform({ scaleX: 0.1 }) + expect(rect.node.getAttribute('transform')).toBe('scale(0.1,1)') + }) + it('should set the scaleY of and element', function() { + var rect = draw.rect(100,100).transform({ scaleY: 10 }) + expect(rect.node.getAttribute('transform')).toBe('scale(1,10)') + }) + it('should set the skewX of and element', function() { + var rect = draw.rect(100,100).transform({ skewX: 0.1 }) + expect(rect.node.getAttribute('transform')).toBe('skewX(0.1)') + }) + it('should set the skewY of and element', function() { + var rect = draw.rect(100,100).transform({ skewY: 10 }) + expect(rect.node.getAttribute('transform')).toBe('skewY(10)') + }) + it('should rotate the element around its centre if no rotation point is given', function() { + var rect = draw.rect(100,100).transform({ rotation: 45 }) + expect(rect.node.getAttribute('transform')).toBe('rotate(45,50,50)') + }) + it('should rotate the element around the given rotation point', function() { + var rect = draw.rect(100,100).transform({ rotation: 55, cx: 80, cy:2 }) + expect(rect.node.getAttribute('transform')).toBe('rotate(55,80,2)') + }) + it('should transform element using a matrix', function() { + var rect = draw.rect(100,100).transform({ a: 0.5, c: 0.5 }) + expect(rect.node.getAttribute('transform')).toBe('matrix(0.5,0,0.5,1,0,0)') + }) + }) + + describe('data()', function() { + it('should set a data attribute and convert value to json', function() { + var rect = draw.rect(100,100).data('test', 'value') + expect(rect.node.getAttribute('data-test')).toBe('"value"') + }) + it('should set a data attribute and not convert value to json if flagged raw', function() { + var rect = draw.rect(100,100).data('test', 'value', true) + expect(rect.node.getAttribute('data-test')).toBe('value') + }) + it('should get data value in ony one argument is passed', function() { + var rect = draw.rect(100,100).data('test', 101) + expect(rect.data('test')).toBe(101) + }) + it('should maintain data type for a number', function() { + var rect = draw.rect(100,100).data('test', 101) + expect(typeof rect.data('test')).toBe('number') + }) + it('should maintain data type for an object', function() { + var rect = draw.rect(100,100).data('test', { string: 'value', array: [1,2,3] }) + expect(typeof rect.data('test')).toBe('object') + expect(Array.isArray(rect.data('test').array)).toBe(true) + }) + }) + + describe('remove()', function() { + it('should remove an element and return it', function() { + var rect = draw.rect(100,100) + expect(rect.remove()).toBe(rect) + }) + it('should remove an element from its parent', function() { + var rect = draw.rect(100,100) + rect.remove() + expect(draw.has(rect)).toBe(false) + }) + }) + + describe('bbox()', function() { + it('should return an instance of SVG.BBox', function() { + var rect = draw.rect(100,100) + expect(rect.bbox() instanceof SVG.BBox).toBe(true) + }) + it('should return the correct bounding box', function() { + var rect = draw.rect(105,210).move(2,12) + var box = rect.bbox() + expect(box.x).toBe(2) + expect(box.y).toBe(12) + expect(box.width).toBe(105) + expect(box.height).toBe(210) + }) + }) + + describe('doc()', function() { + it('should return the parent document', function() { + var rect = draw.rect(100,100) + expect(rect.doc()).toBe(draw) + }) + }) + + describe('parent', function() { + it('should contain the parent svg', function() { + var rect = draw.rect(100,100) + expect(rect.parent).toBe(draw) + }) + it('should contain the parent group when in a group', function() { + var group = draw.group() + , rect = group.rect(100,100) + expect(rect.parent).toBe(group) + }) + }) + + describe('clone()', function() { + it('should make an exact copy of the element', function() { + var rect = draw.rect(100,100).center(321,567).fill('#f06') + clone = rect.clone() + expect(rect.attr('id', null).attr()).toEqual(clone.attr('id', null).attr()) + }) + it('should assign a new id to the cloned element', function() { + var rect = draw.rect(100,100).center(321,567).fill('#f06') + clone = rect.clone() + expect(rect.attr('id')).not.toEqual(clone.attr('id')) + }) + }) + +})
\ No newline at end of file diff --git a/spec/spec/ellipse.js b/spec/spec/ellipse.js new file mode 100644 index 0000000..00215f8 --- /dev/null +++ b/spec/spec/ellipse.js @@ -0,0 +1,105 @@ +describe('Ellipse', function() { + var ellipse + + beforeEach(function() { + ellipse = draw.ellipse(240,90) + }) + + afterEach(function() { + draw.clear() + }) + + describe('x()', function() { + it('should return the value of x without an argument', function() { + expect(ellipse.x()).toBe(0) + }) + it('should set the value of x with the first argument', function() { + ellipse.x(123) + var box = ellipse.bbox() + expect(box.x).toBe(123) + }) + }) + + describe('y()', function() { + it('should return the value of y without an argument', function() { + expect(ellipse.y()).toBe(0) + }) + it('should set the value of cy with the first argument', function() { + ellipse.y(345) + var box = ellipse.bbox() + expect(box.y).toBe(345) + }) + }) + + describe('cx()', function() { + it('should return the value of cx without an argument', function() { + expect(ellipse.cx()).toBe(120) + }) + it('should set the value of cx with the first argument', function() { + ellipse.cx(123) + var box = ellipse.bbox() + expect(box.cx).toBe(123) + }) + }) + + describe('cy()', function() { + it('should return the value of cy without an argument', function() { + expect(ellipse.cy()).toBe(45) + }) + it('should set the value of cy with the first argument', function() { + ellipse.cy(345) + var box = ellipse.bbox() + expect(box.cy).toBe(345) + }) + }) + + describe('move()', function() { + it('should set the x and y position', function() { + ellipse.move(123,456) + var box = ellipse.bbox() + expect(box.x).toBe(123) + expect(box.y).toBe(456) + }) + }) + + describe('center()', function() { + it('should set the cx and cy position', function() { + ellipse.center(321,567) + var box = ellipse.bbox() + expect(box.cx).toBe(321) + expect(box.cy).toBe(567) + }) + }) + + describe('size()', function() { + it('should define the rx and ry of the element', function() { + ellipse.size(987,654) + expect(ellipse.node.getAttribute('rx')).toBe((987 / 2).toString()) + expect(ellipse.node.getAttribute('ry')).toBe((654 / 2).toString()) + }) + }) + + describe('scale()', function() { + it('should scale the element universally with one argument', function() { + var box = ellipse.scale(2).bbox() + + expect(box.width).toBe(ellipse.attr('rx') * 2 * 2) + expect(box.height).toBe(ellipse.attr('ry') * 2 * 2) + }) + it('should scale the element over individual x and y axes with two arguments', function() { + var box = ellipse.scale(2, 3.5).bbox() + + expect(box.width).toBe(ellipse.attr('rx') * 2 * 2) + expect(box.height).toBe(ellipse.attr('ry') * 2 * 3.5) + }) + }) + +}) + + + + + + + + diff --git a/spec/spec/gradient.js b/spec/spec/gradient.js new file mode 100644 index 0000000..db16e92 --- /dev/null +++ b/spec/spec/gradient.js @@ -0,0 +1,18 @@ +describe('Gradient', function() { + var rect = draw.rect(100,100) + , gradient = draw.gradient('linear', function(stop) { + stop.at({ offset: 0, color: '#333', opacity: 1 }) + stop.at({ offset: 100, color: '#fff', opacity: 1 }) + }) + + it('should be an instance of SVG.Gradient', function() { + expect(gradient instanceof SVG.Gradient).toBe(true) + }) + + describe('fill()', function() { + it('should return the id of the gradient wrapped in url()', function() { + expect(gradient.fill()).toBe('url(#' + gradient.attr('id') + ')') + }) + }) + +})
\ No newline at end of file diff --git a/spec/spec/helper.js b/spec/spec/helper.js new file mode 100644 index 0000000..f6cebaa --- /dev/null +++ b/spec/spec/helper.js @@ -0,0 +1,21 @@ +/* create canavs */ +var canvas = document.createElement('div') +canvas.id = 'canvas' +document.getElementsByTagName('body')[0].appendChild(canvas) +draw = SVG(canvas).size(100,100) + +/* raw path data */ +svgPath = 'M88.006,61.994c3.203,0,6.216-1.248,8.481-3.514C98.752,56.215,100,53.203,100,50c0-3.204-1.248-6.216-3.513-8.481 c-2.266-2.265-5.278-3.513-8.481-3.513c-2.687,0-5.237,0.877-7.327,2.496h-7.746l5.479-5.479 c5.891-0.757,10.457-5.803,10.457-11.896c0-6.614-5.381-11.995-11.994-11.995c-6.093,0-11.14,4.567-11.896,10.457l-5.479,5.479 v-7.747c1.618-2.089,2.495-4.641,2.495-7.327c0-3.204-1.247-6.216-3.513-8.481C56.216,1.248,53.204,0,50,0 c-3.204,0-6.216,1.248-8.481,3.513c-2.265,2.265-3.513,5.277-3.513,8.481c0,2.686,0.877,5.237,2.495,7.327v7.747l-5.479-5.479 c-0.757-5.89-5.803-10.457-11.896-10.457c-6.614,0-11.995,5.381-11.995,11.995c0,6.093,4.567,11.139,10.458,11.896l5.479,5.479 h-7.747c-2.089-1.619-4.641-2.496-7.327-2.496c-3.204,0-6.216,1.248-8.481,3.513C1.248,43.784,0,46.796,0,50 c0,3.203,1.248,6.216,3.513,8.48c2.265,2.266,5.277,3.514,8.481,3.514c2.686,0,5.237-0.877,7.327-2.496h7.747l-5.479,5.479 c-5.891,0.757-10.458,5.804-10.458,11.896c0,6.614,5.381,11.994,11.995,11.994c6.093,0,11.139-4.566,11.896-10.457l5.479-5.479 v7.749c-3.63,4.7-3.291,11.497,1.018,15.806C43.784,98.752,46.796,100,50,100c3.204,0,6.216-1.248,8.481-3.514 c4.309-4.309,4.647-11.105,1.018-15.806v-7.749l5.479,5.479c0.757,5.891,5.804,10.457,11.896,10.457 c6.613,0,11.994-5.38,11.994-11.994c0-6.093-4.566-11.14-10.457-11.896l-5.479-5.479h7.746 C82.769,61.117,85.319,61.994,88.006,61.994z M76.874,68.354c4.705,0,8.52,3.814,8.52,8.521c0,4.705-3.814,8.52-8.52,8.52 s-8.52-3.814-8.52-8.52l-12.33-12.33V81.98c3.327,3.328,3.327,8.723,0,12.049c-3.327,3.328-8.722,3.328-12.049,0 c-3.327-3.326-3.327-8.721,0-12.049V64.544l-12.33,12.33c0,4.705-3.814,8.52-8.52,8.52s-8.52-3.814-8.52-8.52 c0-4.706,3.814-8.521,8.52-8.521l12.33-12.33H18.019c-3.327,3.328-8.722,3.328-12.049,0c-3.327-3.326-3.327-8.721,0-12.048 s8.722-3.327,12.049,0h17.438l-12.33-12.33c-4.706,0-8.52-3.814-8.52-8.52c0-4.706,3.814-8.52,8.52-8.52s8.52,3.814,8.52,8.52 l12.33,12.33V18.019c-3.327-3.327-3.327-8.722,0-12.049s8.722-3.327,12.049,0s3.327,8.722,0,12.049v17.438l12.33-12.33 c0-4.706,3.814-8.52,8.52-8.52s8.52,3.814,8.52,8.52c0,4.705-3.814,8.52-8.52,8.52l-12.33,12.33h17.438 c3.327-3.327,8.722-3.327,12.049,0s3.327,8.722,0,12.048c-3.327,3.328-8.722,3.328-12.049,0H64.544L76.874,68.354z' + +/* image url */ +imageUrl = '' + +/* lorem ipsum text */ +loremIpsum = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras sodales\n imperdiet auctor. Nunc ultrices lectus at erat dictum pharetra\n elementum ante posuere. Duis turpis risus, blandit nec elementum et,\n posuere eget lacus. Aliquam et risus magna, eu aliquet nibh. Fusce\n consequat mi quis purus varius sagittis euismod urna interdum.\n Curabitur aliquet orci quis felis semper vulputate. Vestibulum ac nisi\n magna, id dictum diam. Proin sed metus vel magna blandit\n sodales. Pellentesque at neque ultricies nunc euismod rutrum ut in\n lorem. Mauris euismod tellus in tellus tempus interdum. Phasellus\n mattis sapien et leo feugiat dictum. Vestibulum at volutpat velit.' + +/* approximately helper */ +function approximately(number, precision) { + precision = precision == null ? 2.5 : precision + + return Math.round(number / precision) * precision +}
\ No newline at end of file diff --git a/spec/spec/image.js b/spec/spec/image.js new file mode 100644 index 0000000..05f56b2 --- /dev/null +++ b/spec/spec/image.js @@ -0,0 +1,113 @@ +describe('Image', function() { + var image + + beforeEach(function() { + image = draw.image(imageUrl, 100, 100) + }) + + afterEach(function() { + draw.clear() + }) + + describe('x()', function() { + it('should return the value of x without an argument', function() { + expect(image.x()).toBe(0) + }) + it('should set the value of x with the first argument', function() { + image.x(123) + var box = image.bbox() + expect(box.x).toBe(123) + }) + }) + + describe('y()', function() { + it('should return the value of y without an argument', function() { + expect(image.y()).toBe(0) + }) + it('should set the value of y with the first argument', function() { + image.y(345) + var box = image.bbox() + expect(box.y).toBe(345) + }) + }) + + describe('cx()', function() { + it('should return the value of cx without an argument', function() { + expect(image.cx()).toBe(50) + }) + it('should set the value of cx with the first argument', function() { + image.cx(123) + var box = image.bbox() + expect(box.cx).toBe(123) + }) + }) + + describe('cy()', function() { + it('should return the value of cy without an argument', function() { + expect(image.cy()).toBe(50) + }) + it('should set the value of cy with the first argument', function() { + image.cy(345) + var box = image.bbox() + expect(box.cy).toBe(345) + }) + }) + + describe('move()', function() { + it('should set the x and y position', function() { + image.move(123,456) + expect(image.node.getAttribute('x')).toBe('123') + expect(image.node.getAttribute('y')).toBe('456') + }) + }) + + describe('center()', function() { + it('should set the cx and cy position', function() { + image.center(321,567) + var box = image.bbox() + expect(box.cx).toBe(321) + expect(box.cy).toBe(567) + }) + }) + + describe('size()', function() { + it('should define the width and height of the element', function() { + image.size(987,654) + expect(image.node.getAttribute('width')).toBe('987') + expect(image.node.getAttribute('height')).toBe('654') + }) + }) + + describe('scale()', function() { + it('should scale the element universally with one argument', function() { + var box = image.scale(2).bbox() + + expect(box.width).toBe(image.attr('width') * 2) + expect(box.height).toBe(image.attr('height') * 2) + }) + it('should scale the element over individual x and y axes with two arguments', function() { + var box = image.scale(2, 3.5).bbox() + + expect(box.width).toBe(image.attr('width') * 2) + expect(box.height).toBe(image.attr('height') * 3.5) + }) + }) + +}) + + + + + + + + + + + + + + + + + diff --git a/spec/spec/line.js b/spec/spec/line.js new file mode 100644 index 0000000..870ac92 --- /dev/null +++ b/spec/spec/line.js @@ -0,0 +1,110 @@ +describe('Line', function() { + var line + + beforeEach(function() { + line = draw.line(0,100,100,0) + }) + + afterEach(function() { + draw.clear() + }) + + describe('x()', function() { + it('should return the value of x without an argument', function() { + expect(line.x()).toBe(0) + }) + it('should set the value of x with the first argument', function() { + line.x(123) + var box = line.bbox() + expect(box.x).toBe(123) + }) + }) + + describe('y()', function() { + it('should return the value of y without an argument', function() { + expect(line.y()).toBe(0) + }) + it('should set the value of y with the first argument', function() { + line.y(345) + var box = line.bbox() + expect(box.y).toBe(345) + }) + }) + + describe('cx()', function() { + it('should return the value of cx without an argument', function() { + expect(line.cx()).toBe(50) + }) + it('should set the value of cx with the first argument', function() { + line.cx(123) + var box = line.bbox() + expect(box.cx).toBe(123) + }) + }) + + describe('cy()', function() { + it('should return the value of cy without an argument', function() { + expect(line.cy()).toBe(50) + }) + it('should set the value of cy with the first argument', function() { + line.cy(345) + var box = line.bbox() + expect(box.cy).toBe(345) + }) + }) + + describe('move()', function() { + it('should set the x and y position', function() { + line.move(123,456) + expect(line.node.getAttribute('x1')).toBe('123') + expect(line.node.getAttribute('y1')).toBe('556') + expect(line.node.getAttribute('x2')).toBe('223') + expect(line.node.getAttribute('y2')).toBe('456') + }) + }) + + describe('center()', function() { + it('should set the cx and cy position', function() { + line.center(321,567) + var box = line.bbox() + expect(line.node.getAttribute('x1')).toBe('271') + expect(line.node.getAttribute('y1')).toBe('617') + expect(line.node.getAttribute('x2')).toBe('371') + expect(line.node.getAttribute('y2')).toBe('517') + }) + }) + + describe('size()', function() { + it('should define the width and height of the element', function() { + line.size(987,654) + expect(line.node.getAttribute('x1')).toBe('0') + expect(line.node.getAttribute('y1')).toBe('654') + expect(line.node.getAttribute('x2')).toBe('987') + expect(line.node.getAttribute('y2')).toBe('0') + }) + }) + + describe('scale()', function() { + it('should scale the element universally with one argument', function() { + var box = line.scale(2).bbox() + + expect(box.width).toBe((line.attr('x2') - line.attr('x1')) * 2) + expect(box.height).toBe((line.attr('y1') - line.attr('y2')) * 2) + }) + it('should scale the element over individual x and y axes with two arguments', function() { + var box = line.scale(2, 3.5).bbox() + + expect(box.width).toBe((line.attr('x2') - line.attr('x1')) * 2) + expect(box.height).toBe((line.attr('y1') - line.attr('y2')) * 3.5) + }) + }) + +}) + + + + + + + + diff --git a/spec/spec/path.js b/spec/spec/path.js new file mode 100644 index 0000000..2ba269e --- /dev/null +++ b/spec/spec/path.js @@ -0,0 +1,112 @@ +describe('Path', function() { + var path + + beforeEach(function() { + path = draw.path(svgPath) + }) + + afterEach(function() { + draw.clear() + }) + + describe('x()', function() { + it('should return the value of x without an argument', function() { + expect(path.x()).toBe(0) + }) + it('should set the value of x with the first argument', function() { + path.x(123) + var box = path.bbox() + expect(box.x).toBe(123) + }) + }) + + describe('y()', function() { + it('should return the value of y without an argument', function() { + expect(path.y()).toBe(0) + }) + it('should set the value of y with the first argument', function() { + path.y(345) + var box = path.bbox() + expect(box.y).toBe(345) + }) + }) + + describe('cx()', function() { + it('should return the value of cx without an argument', function() { + expect(path.cx()).toBe(50) + }) + it('should set the value of cx with the first argument', function() { + path.cx(123) + var box = path.bbox() + expect(box.cx).toBe(123) + }) + }) + + describe('cy()', function() { + it('should return the value of cy without an argument', function() { + expect(path.cy()).toBe(50) + }) + it('should set the value of cy with the first argument', function() { + path.cy(345) + var box = path.bbox() + expect(box.cy).toBe(345) + }) + }) + + describe('move()', function() { + it('should set the x and y position', function() { + path.move(123,456) + var box = path.bbox() + expect(box.x).toBe(123) + expect(box.y).toBe(456) + }) + it('should set the x and y position when scaled to half its size', function() { + path.scale(0.5).move(123,456) + var box = path.bbox() + expect(box.x).toBe(123) + expect(box.y).toBe(456) + }) + }) + + describe('center()', function() { + it('should set the cx and cy position', function() { + path.center(321,567) + var box = path.bbox() + expect(box.x).toBe(271) + expect(box.y).toBe(517) + }) + }) + + describe('size()', function() { + it('should define the width and height of the element', function() { + path.size(987,654) + var box = path.bbox() + expect(approximately(box.width, 0.1)).toBe(987) + expect(approximately(box.height, 0.1)).toBe(654) + }) + }) + + describe('scale()', function() { + it('should scale the element universally with one argument', function() { + var box = path.scale(2).bbox() + + expect(box.width).toBe(path._offset.width * 2) + expect(box.height).toBe(path._offset.height * 2) + }) + it('should scale the element over individual x and y axes with two arguments', function() { + var box = path.scale(2, 3.5).bbox() + + expect(box.width).toBe(path._offset.width * 2) + expect(box.height).toBe(path._offset.height * 3.5) + }) + }) + +}) + + + + + + + + diff --git a/spec/spec/polygon.js b/spec/spec/polygon.js new file mode 100644 index 0000000..2d4cac5 --- /dev/null +++ b/spec/spec/polygon.js @@ -0,0 +1,106 @@ +describe('Polygon', function() { + var polygon + + beforeEach(function() { + polygon = draw.polygon('0,0 100,0 100,100 0,100') + }) + + afterEach(function() { + draw.clear() + }) + + describe('x()', function() { + it('should return the value of x without an argument', function() { + expect(polygon.x()).toBe(0) + }) + it('should set the value of x with the first argument', function() { + polygon.x(123) + var box = polygon.bbox() + expect(box.x).toBe(123) + }) + }) + + describe('y()', function() { + it('should return the value of y without an argument', function() { + expect(polygon.y()).toBe(0) + }) + it('should set the value of y with the first argument', function() { + polygon.y(345) + var box = polygon.bbox() + expect(box.y).toBe(345) + }) + }) + + describe('cx()', function() { + it('should return the value of cx without an argument', function() { + expect(polygon.cx()).toBe(50) + }) + it('should set the value of cx with the first argument', function() { + polygon.cx(123) + var box = polygon.bbox() + expect(box.cx).toBe(123) + }) + }) + + describe('cy()', function() { + it('should return the value of cy without an argument', function() { + expect(polygon.cy()).toBe(50) + }) + it('should set the value of cy with the first argument', function() { + polygon.cy(345) + var box = polygon.bbox() + expect(box.cy).toBe(345) + }) + }) + + describe('move()', function() { + it('should set the x and y position', function() { + polygon.move(123,456) + var box = polygon.bbox() + expect(box.x).toBe(123) + expect(box.y).toBe(456) + }) + }) + + describe('center()', function() { + it('should set the cx and cy position', function() { + polygon.center(321,567) + var box = polygon.bbox() + expect(box.x).toBe(271) + expect(box.y).toBe(517) + }) + }) + + describe('size()', function() { + it('should define the width and height of the element', function() { + polygon.size(987,654) + var box = polygon.bbox() + expect(approximately(box.width, 0.1)).toBe(987) + expect(approximately(box.height, 0.1)).toBe(654) + }) + }) + + describe('scale()', function() { + it('should scale the element universally with one argument', function() { + var box = polygon.scale(2).bbox() + + expect(box.width).toBe(polygon._offset.width * 2) + expect(box.height).toBe(polygon._offset.height * 2) + }) + it('should scale the element over individual x and y axes with two arguments', function() { + var box = polygon.scale(2, 3.5).bbox() + + expect(box.width).toBe(polygon._offset.width * 2) + expect(box.height).toBe(polygon._offset.height * 3.5) + }) + }) + +}) + + + + + + + + diff --git a/spec/spec/polyline.js b/spec/spec/polyline.js new file mode 100644 index 0000000..5fef850 --- /dev/null +++ b/spec/spec/polyline.js @@ -0,0 +1,106 @@ +describe('Polyline', function() { + var polyline + + beforeEach(function() { + polyline = draw.polyline('0,0 100,0 100,100 0,100') + }) + + afterEach(function() { + draw.clear() + }) + + describe('x()', function() { + it('should return the value of x without an argument', function() { + expect(polyline.x()).toBe(0) + }) + it('should set the value of x with the first argument', function() { + polyline.x(123) + var box = polyline.bbox() + expect(box.x).toBe(123) + }) + }) + + describe('y()', function() { + it('should return the value of y without an argument', function() { + expect(polyline.y()).toBe(0) + }) + it('should set the value of y with the first argument', function() { + polyline.y(345) + var box = polyline.bbox() + expect(box.y).toBe(345) + }) + }) + + describe('cx()', function() { + it('should return the value of cx without an argument', function() { + expect(polyline.cx()).toBe(50) + }) + it('should set the value of cx with the first argument', function() { + polyline.cx(123) + var box = polyline.bbox() + expect(box.cx).toBe(123) + }) + }) + + describe('cy()', function() { + it('should return the value of cy without an argument', function() { + expect(polyline.cy()).toBe(50) + }) + it('should set the value of cy with the first argument', function() { + polyline.cy(345) + var box = polyline.bbox() + expect(box.cy).toBe(345) + }) + }) + + describe('move()', function() { + it('should set the x and y position', function() { + polyline.move(123,456) + var box = polyline.bbox() + expect(box.x).toBe(123) + expect(box.y).toBe(456) + }) + }) + + describe('center()', function() { + it('should set the cx and cy position', function() { + polyline.center(321,567) + var box = polyline.bbox() + expect(box.x).toBe(271) + expect(box.y).toBe(517) + }) + }) + + describe('size()', function() { + it('should define the width and height of the element', function() { + polyline.size(987,654) + var box = polyline.bbox() + expect(approximately(box.width, 0.1)).toBe(987) + expect(approximately(box.height, 0.1)).toBe(654) + }) + }) + + describe('scale()', function() { + it('should scale the element universally with one argument', function() { + var box = polyline.scale(2).bbox() + + expect(box.width).toBe(polyline._offset.width * 2) + expect(box.height).toBe(polyline._offset.height * 2) + }) + it('should scale the element over individual x and y axes with two arguments', function() { + var box = polyline.scale(2, 3.5).bbox() + + expect(box.width).toBe(polyline._offset.width * 2) + expect(box.height).toBe(polyline._offset.height * 3.5) + }) + }) + +}) + + + + + + + + diff --git a/spec/spec/rect.js b/spec/spec/rect.js new file mode 100644 index 0000000..8452ba5 --- /dev/null +++ b/spec/spec/rect.js @@ -0,0 +1,104 @@ +describe('Rect', function() { + var rect + + beforeEach(function() { + rect = draw.rect(220,100) + }) + + afterEach(function() { + draw.clear() + }) + + describe('x()', function() { + it('should return the value of x without an argument', function() { + expect(rect.x()).toBe(0) + }) + it('should set the value of x with the first argument', function() { + rect.x(123) + var box = rect.bbox() + expect(box.x).toBe(123) + }) + }) + + describe('y()', function() { + it('should return the value of y without an argument', function() { + expect(rect.y()).toBe(0) + }) + it('should set the value of y with the first argument', function() { + rect.y(345) + var box = rect.bbox() + expect(box.y).toBe(345) + }) + }) + + describe('cx()', function() { + it('should return the value of cx without an argument', function() { + expect(rect.cx()).toBe(110) + }) + it('should set the value of cx with the first argument', function() { + rect.cx(123) + var box = rect.bbox() + expect(box.cx).toBe(123) + }) + }) + + describe('cy()', function() { + it('should return the value of cy without an argument', function() { + expect(rect.cy()).toBe(50) + }) + it('should set the value of cy with the first argument', function() { + rect.cy(345) + var box = rect.bbox() + expect(box.cy).toBe(345) + }) + }) + + describe('move()', function() { + it('should set the x and y position', function() { + rect.move(123,456) + expect(rect.node.getAttribute('x')).toBe('123') + expect(rect.node.getAttribute('y')).toBe('456') + }) + }) + + describe('center()', function() { + it('should set the cx and cy position', function() { + rect.center(321,567) + var box = rect.bbox() + expect(box.cx).toBe(321) + expect(box.cy).toBe(567) + }) + }) + + describe('size()', function() { + it('should define the width and height of the element', function() { + rect.size(987,654) + expect(rect.node.getAttribute('width')).toBe('987') + expect(rect.node.getAttribute('height')).toBe('654') + }) + }) + + describe('scale()', function() { + it('should scale the element universally with one argument', function() { + var box = rect.scale(2).bbox() + + expect(box.width).toBe(rect.attr('width') * 2) + expect(box.height).toBe(rect.attr('height') * 2) + }) + it('should scale the element over individual x and y axes with two arguments', function() { + var box = rect.scale(2, 3.5).bbox() + + expect(box.width).toBe(rect.attr('width') * 2) + expect(box.height).toBe(rect.attr('height') * 3.5) + }) + }) + +}) + + + + + + + + diff --git a/spec/spec/svg.js b/spec/spec/svg.js new file mode 100644 index 0000000..5d3837f --- /dev/null +++ b/spec/spec/svg.js @@ -0,0 +1,90 @@ +describe('SVG', function() { + + describe('()', function() { + var canvas, wrapper + + beforeEach(function() { + wrapper = document.createElement('div') + document.getElementsByTagName('body')[0].appendChild(wrapper) + canvas = SVG(wrapper) + }) + + afterEach(function() { + wrapper.parentNode.removeChild(wrapper) + }) + + it('should create a new svg canvas', function() { + expect(canvas.type).toBe('svg') + }) + it('should create an instance of SVG.Doc', function() { + expect(canvas instanceof SVG.Doc).toBe(true) + }) + }) + + describe('create()', function() { + it('should create an element with given node name and return it', function() { + var element = SVG.create('rect') + + expect(element.nodeName).toBe('rect') + }) + it('should increase the global id sequence', function() { + var did = SVG.did + , element = SVG.create('rect') + + expect(did + 1).toBe(SVG.did) + }) + it('should add a unique id containing the node name', function() { + var did = SVG.did + , element = SVG.create('rect') + + expect(element.getAttribute('id')).toBe('SvgjsRect' + did) + }) + }) + + describe('extend()', function() { + it('should add all functions in the given object to the target object', function() { + SVG.extend(SVG.Rect, { + soft: function() { + return this.opacity(0.2) + } + }) + + expect(typeof SVG.Rect.prototype.soft).toBe('function') + expect(draw.rect(100,100).soft().attr('opacity')).toBe(0.2) + }) + it('should accept and extend multiple modules at once', function() { + SVG.extend(SVG.Rect, SVG.Ellipse, SVG.Path, { + soft: function() { + return this.opacity(0.5) + } + }) + + expect(typeof SVG.Rect.prototype.soft).toBe('function') + expect(draw.rect(100,100).soft().attr('opacity')).toBe(0.5) + expect(typeof SVG.Ellipse.prototype.soft).toBe('function') + expect(draw.ellipse(100,100).soft().attr('opacity')).toBe(0.5) + expect(typeof SVG.Path.prototype.soft).toBe('function') + expect(draw.path().soft().attr('opacity')).toBe(0.5) + }) + it('should ignone non existant objects', function() { + SVG.extend(SVG.Rect, SVG.Bogus, { + soft: function() { + return this.opacity(0.3) + } + }) + + expect(typeof SVG.Rect.prototype.soft).toBe('function') + expect(draw.rect(100,100).soft().attr('opacity')).toBe(0.3) + expect(typeof SVG.Bogus).toBe('undefined') + }) + }) + + describe('get()', function() { + it('should get an element\'s instance by id', function() { + var rect = draw.rect(111,333) + + expect(SVG.get(rect.attr('id'))).toBe(rect) + }) + }) + +})
\ No newline at end of file diff --git a/spec/spec/text.js b/spec/spec/text.js new file mode 100644 index 0000000..b1af24e --- /dev/null +++ b/spec/spec/text.js @@ -0,0 +1,114 @@ +// IMPORTANT!!! +// The native getBBox() on text elements is not accurate to the pixel. +// Therefore some values are treated with the approximately() function. + +describe('Text', function() { + var text + + beforeEach(function() { + text = draw.text(loremIpsum).size(5) + }) + + afterEach(function() { + draw.clear() + }) + + describe('x()', function() { + it('should return the value of x without an argument', function() { + expect(text.x()).toBe(0) + }) + it('should set the value of x with the first argument', function() { + text.x(123) + var box = text.bbox() + expect(approximately(box.x)).toBe(approximately(123)) + }) + it('should set the value of x based on the anchor with the first argument', function() { + text.x(123, true) + var box = text.bbox() + expect(approximately(box.x)).toBe(approximately(123)) + }) + }) + + describe('y()', function() { + it('should return the value of y without an argument', function() { + expect(text.y()).toBe(0) + }) + it('should set the value of y with the first argument', function() { + text.y(345) + var box = text.bbox() + expect(approximately(box.y)).toBe(approximately(345)) + }) + it('should set the value of y based on the anchor with the first argument', function() { + text.y(345, true) + var box = text.bbox() + expect(approximately(box.y)).toBe(approximately(345)) + }) + }) + + describe('cx()', function() { + it('should return the value of cx without an argument', function() { + var box = text.bbox() + expect(text.cx()).toBe(box.width / 2) + }) + it('should set the value of cx with the first argument', function() { + text.cx(123) + var box = text.bbox() + expect(box.cx).toBe(123) + }) + it('should set the value of cx based on the anchor with the first argument', function() { + text.cx(123, true) + var box = text.bbox() + expect(box.cx).toBe(123) + }) + }) + + describe('cy()', function() { + it('should return the value of cy without an argument', function() { + var box = text.bbox() + expect(text.cy()).toBe(box.cy) + }) + it('should set the value of cy with the first argument', function() { + text.cy(345) + var box = text.bbox() + expect(approximately(box.cy)).toBe(approximately(345)) + }) + it('should set the value of cy based on the anchor with the first argument', function() { + text.cy(345, true) + var box = text.bbox() + expect(approximately(box.cy)).toBe(approximately(345 + box.height / 2)) + }) + }) + + describe('move()', function() { + it('should set the x and y position', function() { + text.move(123,456) + expect(text.lines[0].node.getAttribute('x')).toBe('123') + expect(text.node.getAttribute('y')).toBe('456') + }) + }) + + describe('center()', function() { + it('should set the cx and cy position', function() { + text.center(321,567) + var box = text.bbox() + expect(box.cx).toBe(321) + expect(approximately(box.cy)).toBe(approximately(567)) + }) + }) + + describe('size()', function() { + it('should define the width and height of the element', function() { + text.size(50) + expect(text.style('font-size')).toBe(50) + }) + }) + +}) + + + + + + + + diff --git a/src/arrange.js b/src/arrange.js index 3ef486f..157c91c 100644 --- a/src/arrange.js +++ b/src/arrange.js @@ -20,7 +20,7 @@ SVG.extend(SVG.Element, { } // Send given element one step forward , forward: function() { - return this.parent.remove(this).put(this, this.position() + 1) + return this.parent.removeElement(this).put(this, this.position() + 1) } // Send given element one step backward , backward: function() { @@ -29,20 +29,20 @@ SVG.extend(SVG.Element, { var i = this.position() if (i > 1) - this.parent.remove(this).add(this, i - 1) + this.parent.removeElement(this).add(this, i - 1) return this } // Send given element all the way to the front , front: function() { - return this.parent.remove(this).put(this) + return this.parent.removeElement(this).put(this) } // Send given element all the way to the back , back: function() { this.parent.level() if (this.position() > 1) - this.parent.remove(this).add(this, 0) + this.parent.removeElement(this).add(this, 0) return this } diff --git a/src/bbox.js b/src/bbox.js index c67d7c2..f58e77b 100644 --- a/src/bbox.js +++ b/src/bbox.js @@ -7,12 +7,12 @@ SVG.BBox = function(element) { this.x = box.x + element.trans.x this.y = box.y + element.trans.y - /* add the center */ - this.cx = this.x + box.width / 2 - this.cy = this.x + box.height / 2 - /* plain width and height */ - this.width = box.width - this.height = box.height + this.width = box.width * element.trans.scaleX + this.height = box.height * element.trans.scaleY + + /* add the center */ + this.cx = this.x + this.width / 2 + this.cy = this.y + this.height / 2 }
\ No newline at end of file diff --git a/src/clip.js b/src/clip.js new file mode 100644 index 0000000..9562162 --- /dev/null +++ b/src/clip.js @@ -0,0 +1,28 @@ + +SVG.Clip = function Clip() { + this.constructor.call(this, SVG.create('clipPath')) +} + +// Inherit from SVG.Container +SVG.Clip.prototype = new SVG.Container + +SVG.extend(SVG.Element, { + + // Distribute clipPath to svg element + clipWith: function(element) { + /* use given clip or create a new one */ + this.clip = element instanceof SVG.Clip ? element : this.parent.clip().add(element) + + return this.attr('clip-path', 'url(#' + this.clip.attr('id') + ')') + } + +}) + +// Add container method +SVG.extend(SVG.Container, { + // Create clipping element + clip: function() { + return this.defs().put(new SVG.Clip) + } + +}) diff --git a/src/color.js b/src/color.js index 89c811d..bd4b6b0 100644 --- a/src/color.js +++ b/src/color.js @@ -155,10 +155,10 @@ SVG.Color.test = function(color) { // Test if given value is a rgb object SVG.Color.isRgb = function(color) { - return typeof color.r == 'number' + return color && typeof color.r == 'number' } // Test if given value is a hsb object SVG.Color.isHsb = function(color) { - return typeof color.h == 'number' + return color && typeof color.h == 'number' }
\ No newline at end of file diff --git a/src/container.js b/src/container.js index 3549bee..3983366 100644 --- a/src/container.js +++ b/src/container.js @@ -7,55 +7,55 @@ SVG.Container.prototype = new SVG.Element // SVG.extend(SVG.Container, { + // Returns all child elements + children: function() { + return this._children || (this._children = []) + } // Add given element at a position - add: function(element, index) { +, add: function(element, i) { if (!this.has(element)) { /* define insertion index if none given */ - index = index == null ? this.children().length : index + i = i == null ? this.children().length : i /* remove references from previous parent */ if (element.parent) { - var i = element.parent.children().indexOf(element) - element.parent.children().splice(i, 1) + var index = element.parent.children().indexOf(element) + element.parent.children().splice(index, 1) } /* add element references */ - this.children().splice(index, 0, element) - this.node.insertBefore(element.node, this.node.childNodes[index] || null) + this.children().splice(i, 0, element) + this.node.insertBefore(element.node, this.node.childNodes[i] || null) element.parent = this } return this } - // Basically does the same as `add()` but returns the added element -, put: function(element, index) { - this.add(element, index) + // Basically does the same as `add()` but returns the added element instead +, put: function(element, i) { + this.add(element, i) return element } // Checks if the given element is a child , has: function(element) { return this.children().indexOf(element) >= 0 } - // Returns all child elements -, children: function() { - return this._children || (this._children = []) - } // Iterates over all children and invokes a given block , each: function(block) { var index, children = this.children() - + for (index = 0, length = children.length; index < length; index++) if (children[index] instanceof SVG.Shape) block.apply(children[index], [index, children]) - + return this } // Remove a child element at a position -, remove: function(element) { - var index = this.children().indexOf(element) +, removeElement: function(element) { + var i = this.children().indexOf(element) - this.children().splice(index, 1) + this.children().splice(i, 1) this.node.removeChild(element.node) element.parent = null @@ -63,15 +63,15 @@ SVG.extend(SVG.Container, { } // Returns defs element , defs: function() { - return this._defs || (this._defs = this.put(new SVG.Defs(), 0)) + return this._defs || (this._defs = this.put(new SVG.Defs, 0)) } // Re-level defs to first positon in element stack , level: function() { - return this.remove(this.defs()).put(this.defs(), 0) + return this.removeElement(this.defs()).put(this.defs(), 0) } // Create a group element , group: function() { - return this.put(new SVG.G()) + return this.put(new SVG.G) } // Create a rect element , rect: function(width, height) { @@ -91,15 +91,15 @@ SVG.extend(SVG.Container, { } // Create a wrapped polyline element , polyline: function(points) { - return this.put(new SVG.Wrap(new SVG.Polyline())).plot(points) + return this.put(new SVG.Polyline).plot(points) } // Create a wrapped polygon element , polygon: function(points) { - return this.put(new SVG.Wrap(new SVG.Polygon())).plot(points) + return this.put(new SVG.Polygon).plot(points) } // Create a wrapped path element , path: function(data) { - return this.put(new SVG.Wrap(new SVG.Path())).plot(data) + return this.put(new SVG.Path).plot(data) } // Create image element, load image and set its size , image: function(source, width, height) { @@ -112,7 +112,7 @@ SVG.extend(SVG.Container, { } // Create nested svg document , nested: function() { - return this.put(new SVG.Nested()) + return this.put(new SVG.Nested) } // Create gradient element in defs , gradient: function(type, block) { @@ -124,7 +124,7 @@ SVG.extend(SVG.Container, { } // Create masking element , mask: function() { - return this.defs().put(new SVG.Mask()) + return this.defs().put(new SVG.Mask) } // Get first child, skipping the defs node , first: function() { @@ -135,20 +135,22 @@ SVG.extend(SVG.Container, { return this.children()[this.children().length - 1] } // Get the viewBox and calculate the zoom value -, viewbox: function() { - /* act as a getter if there are no arguments */ +, viewbox: function(v) { if (arguments.length == 0) + /* act as a getter if there are no arguments */ return new SVG.ViewBox(this) /* otherwise act as a setter */ - return this.attr('viewBox', Array.prototype.slice.call(arguments).join(' ')) + v = arguments.length == 1 ? + [v.x, v.y, v.width, v.height] : + Array.prototype.slice.call(arguments) + + return this.attr('viewBox', v.join(' ')) } // Remove all elements in this container , clear: function() { - this._children = [] - - while (this.node.hasChildNodes()) - this.node.removeChild(this.node.lastChild) + for (var i = this.children().length - 1; i >= 0; i--) + this.removeElement(this.children()[i]) return this } diff --git a/src/default.js b/src/default.js index abcac88..4efc226 100644 --- a/src/default.js +++ b/src/default.js @@ -4,28 +4,28 @@ SVG.default = { matrix: '1,0,0,1,0,0' // Default attribute values -, attrs: function() { - return { - /* fill and stroke */ - 'fill-opacity': 1 - , 'stroke-opacity': 1 - , 'stroke-width': 0 - , fill: '#000' - , stroke: '#000' - , opacity: 1 - /* position */ - , x: 0 - , y: 0 - , cx: 0 - , cy: 0 - /* size */ - , width: 0 - , height: 0 - /* radius */ - , r: 0 - , rx: 0 - , ry: 0 - } +, attrs: { + /* fill and stroke */ + 'fill-opacity': 1 + , 'stroke-opacity': 1 + , 'stroke-width': 0 + , fill: '#000' + , stroke: '#000' + , opacity: 1 + /* position */ + , x: 0 + , y: 0 + , cx: 0 + , cy: 0 + /* size */ + , width: 0 + , height: 0 + /* radius */ + , r: 0 + , rx: 0 + , ry: 0 + /* gradient */ + , offset: 0 } // Default transformation values diff --git a/src/element.js b/src/element.js index a78a641..b8cbf50 100644 --- a/src/element.js +++ b/src/element.js @@ -3,8 +3,8 @@ // SVG.Element = function(node) { - /* initialize attribute store with defaults */ - this.attrs = SVG.default.attrs() + /* make stroke value accessible dynamically */ + this._stroke = SVG.default.attrs.stroke /* initialize style store */ this.styles = {} @@ -15,28 +15,29 @@ SVG.Element = function(node) { /* keep reference to the element node */ if (this.node = node) { this.type = node.nodeName - this.attrs.id = node.getAttribute('id') + this.node.instance = this } - } // SVG.extend(SVG.Element, { // Move over x-axis x: function(x) { + if (x) x /= this.trans.scaleX return this.attr('x', x) } // Move over y-axis , y: function(y) { + if (y) y /= this.trans.scaleY return this.attr('y', y) } // Move by center over x-axis , cx: function(x) { - return this.x(x - this.bbox().width / 2) + return x == null ? this.bbox().cx : this.x(x - this.bbox().width / 2) } // Move by center over y-axis , cy: function(y) { - return this.y(y - this.bbox().height / 2) + return y == null ? this.bbox().cy : this.y(y - this.bbox().height / 2) } // Move element to given x and y values , move: function(x, y) { @@ -55,40 +56,30 @@ SVG.extend(SVG.Element, { } // Clone element , clone: function() { - var clone + var clone , attr + , type = this.type - /* if this is a wrapped shape */ - if (this instanceof SVG.Wrap) { - /* build new wrapped shape */ - clone = this.parent[this.child.node.nodeName]() - clone.attrs = this.attrs - - /* copy child attributes and transformations */ - clone.child.trans = this.child.trans - clone.child.attr(this.child.attrs).transform({}) - - /* re-plot shape */ - if (clone.plot) - clone.plot(this.child.attrs[this.child instanceof SVG.Path ? 'd' : 'points']) - - } else { - var name = this.node.nodeName - - /* invoke shape method with shape-specific arguments */ - clone = name == 'rect' ? - this.parent[name](this.attrs.width, this.attrs.height) : - name == 'ellipse' ? - this.parent[name](this.attrs.rx * 2, this.attrs.ry * 2) : - name == 'image' ? - this.parent[name](this.src) : - name == 'text' ? - this.parent[name](this.content) : - name == 'g' ? - this.parent.group() : - this.parent[name]() - - clone.attr(this.attrs) - } + /* invoke shape method with shape-specific arguments */ + clone = type == 'rect' || type == 'ellipse' ? + this.parent[type](0,0) : + type == 'line' ? + this.parent[type](0,0,0,0) : + type == 'image' ? + this.parent[type](this.src) : + type == 'text' ? + this.parent[type](this.content) : + type == 'path' ? + this.parent[type](this.attr('d')) : + type == 'polyline' || type == 'polygon' ? + this.parent[type](this.attr('points')) : + type == 'g' ? + this.parent.group() : + this.parent[type]() + + /* apply attributes attributes */ + attr = this.attr() + delete attr.id + clone.attr(attr) /* copy transformations */ clone.trans = this.trans @@ -99,28 +90,36 @@ SVG.extend(SVG.Element, { // Remove element , remove: function() { if (this.parent) - this.parent.remove(this) + this.parent.removeElement(this) return this } // Get parent document -, doc: function() { - return this._parent(SVG.Doc) - } - // Get parent nested document -, nested: function() { - return this._parent(SVG.Nested) +, doc: function(type) { + return this._parent(type || SVG.Doc) } // Set svg element attribute , attr: function(a, v, n) { - if (arguments.length < 2) { + if (a == null) { + /* get an object of attributes */ + a = {} + v = this.node.attributes + for (n = v.length - 1; n >= 0; n--) + a[v[n].nodeName] = v[n].nodeValue + + return a + + } else if (typeof a == 'object') { /* apply every attribute individually if an object is passed */ - if (typeof a == 'object') - for (v in a) - this.attr(v, a[v]) + for (v in a) this.attr(v, a[v]) + + } else if (v === null) { + /* remove value */ + this.node.removeAttribute(a) + } else if (v == null) { /* act as a getter for style attributes */ - else if (this._isStyle(a)) + if (this._isStyle(a)) { return a == 'text' ? this.content : a == 'leading' ? @@ -128,41 +127,38 @@ SVG.extend(SVG.Element, { this.style(a) /* act as a getter if the first and only argument is not an object */ - else - return this.attrs[a] || this.node.getAttribute(a) + } else { + v = this.node.getAttribute(a) + return v == null ? + SVG.default.attrs[a] : + SVG.regex.test(v, 'isNumber') ? + parseFloat(v) : v + } - } else if (v === null) { - /* remove value */ - this.node.removeAttribute(a) - } else if (a == 'style') { /* redirect to the style method */ return this.style(v) } else { - /* store value */ - this.attrs[a] = v - /* treat x differently on text elements */ - if (a == 'x' && this._isText()) { - for (var i = this.lines.length - 1; i >= 0; i--) - this.lines[i].attr(a, v) + if (a == 'x' && this instanceof SVG.Text) + for (n = this.lines.length - 1; n >= 0; n--) + this.lines[n].attr(a, v) - /* set the actual attribute */ - } else { - /* BUG FIX: some browsers will render a stroke if a color is given even though stroke width is 0 */ - if (a == 'stroke-width') - this.attr('stroke', parseFloat(v) > 0 ? this.attrs.stroke : null) + /* BUG FIX: some browsers will render a stroke if a color is given even though stroke width is 0 */ + if (a == 'stroke-width') + this.attr('stroke', parseFloat(v) > 0 ? this._stroke : null) + else if (a == 'stroke') + this._stroke = v + + /* ensure hex color */ + if (SVG.Color.test(v) || SVG.Color.isRgb(v) || SVG.Color.isHsb(v)) + v = new SVG.Color(v).toHex() - /* ensure hex color */ - if (SVG.Color.test(v) || SVG.Color.isRgb(v) || SVG.Color.isHsb(v)) - v = new SVG.Color(v).toHex() - - /* set give attribute on node */ - n != null ? - this.node.setAttributeNS(n, a, v) : - this.node.setAttribute(a, v) - } + /* set give attribute on node */ + n != null ? + this.node.setAttributeNS(n, a, v) : + this.node.setAttribute(a, v) /* if the passed argument belongs to the style as well, add it there */ if (this._isStyle(a)) { @@ -243,10 +239,15 @@ SVG.extend(SVG.Element, { /* add translation */ if (o.x != 0 || o.y != 0) - transform.push('translate(' + o.x + ',' + o.y + ')') + transform.push('translate(' + o.x / o.scaleX + ',' + o.y / o.scaleY + ')') + + /* add offset translation */ + if (this._offset) + transform.push('translate(' + (-this._offset.x) + ',' + (-this._offset.y) + ')') /* add only te required transformations */ - this.node.setAttribute('transform', transform.join(' ')) + if (transform.length > 0) + this.node.setAttribute('transform', transform.join(' ')) return this } @@ -277,7 +278,7 @@ SVG.extend(SVG.Element, { return this.styles[s] } - } else if (v === null) { + } else if (v === null || SVG.regex.test(v, 'isBlank')) { /* remove value */ delete this.styles[s] @@ -346,12 +347,8 @@ SVG.extend(SVG.Element, { return element } // Private: tester method for style detection -, _isStyle: function(attr) { - return typeof attr == 'string' ? SVG.regex.isStyle.test(attr) : false - } - // Private: element type tester -, _isText: function() { - return this instanceof SVG.Text +, _isStyle: function(a) { + return typeof a == 'string' ? SVG.regex.test(a, 'isStyle') : false } // Private: parse a matrix string , _parseMatrix: function(o) { @@ -373,4 +370,4 @@ SVG.extend(SVG.Element, { return o } -}) +})
\ No newline at end of file diff --git a/src/ellipse.js b/src/ellipse.js index 1f9ef41..598c250 100644 --- a/src/ellipse.js +++ b/src/ellipse.js @@ -10,19 +10,19 @@ SVG.Ellipse.prototype = new SVG.Shape SVG.extend(SVG.Ellipse, { // Move over x-axis x: function(x) { - return this.cx(x + this.attrs.rx) + return x == null ? this.cx() - this.attr('rx') : this.cx(x + this.attr('rx')) } // Move over y-axis , y: function(y) { - return this.cy(y + this.attrs.ry) + return y == null ? this.cy() - this.attr('ry') : this.cy(y + this.attr('ry')) } // Move by center over x-axis , cx: function(x) { - return this.attr('cx', x) + return x == null ? this.attr('cx') : this.attr('cx', x / this.trans.scaleX) } // Move by center over y-axis , cy: function(y) { - return this.attr('cy', y) + return y == null ? this.attr('cy') : this.attr('cy', y / this.trans.scaleY) } // Custom size function , size: function(width, height) { @@ -6,99 +6,122 @@ SVG.FX = function(element) { // SVG.extend(SVG.FX, { // Add animation parameters and start animation - animate: function(duration, ease) { - /* ensure default duration and easing */ - duration = duration == null ? 1000 : duration - ease = ease || '<>' + animate: function(d, ease, delay) { + var fx = this - var akeys, tkeys, skeys - , element = this.target - , fx = this - , start = new Date().getTime() - , finish = start + duration + /* dissect object if one is passed */ + if (typeof d == 'object') { + delay = d.delay + ease = d.ease + d = d.duration + } - /* start animation */ - this.interval = setInterval(function(){ - // This code was borrowed from the emile.js micro framework by Thomas Fuchs, aka MadRobby. - var i, key - , time = new Date().getTime() - , pos = time > finish ? 1 : (time - start) / duration - - /* collect attribute keys */ - if (akeys == null) { - akeys = [] - for (key in fx.attrs) - akeys.push(key) - } - - /* collect transformation keys */ - if (tkeys == null) { - tkeys = [] - for (key in fx.trans) - tkeys.push(key) - } - - /* collect style keys */ - if (skeys == null) { - skeys = [] - for (key in fx.styles) - skeys.push(key) - } - - /* apply easing */ - pos = ease == '<>' ? - (-Math.cos(pos * Math.PI) / 2) + 0.5 : - ease == '>' ? - Math.sin(pos * Math.PI / 2) : - ease == '<' ? - -Math.cos(pos * Math.PI / 2) + 1 : - ease == '-' ? - pos : - typeof ease == 'function' ? - ease(pos) : - pos - - /* run all x-position properties */ - if (fx._x) - element.x(fx._at(fx._x, pos)) - else if (fx._cx) - element.cx(fx._at(fx._cx, pos)) - - /* run all y-position properties */ - if (fx._y) - element.y(fx._at(fx._y, pos)) - else if (fx._cy) - element.cy(fx._at(fx._cy, pos)) + /* delay animation */ + this.timeout = setTimeout(function() { - /* run all size properties */ - if (fx._size) - element.size(fx._at(fx._size.width, pos), fx._at(fx._size.height, pos)) + /* ensure default duration and easing */ + d = d == null ? 1000 : d + ease = ease || '<>' - /* animate attributes */ - for (i = akeys.length - 1; i >= 0; i--) - element.attr(akeys[i], fx._at(fx.attrs[akeys[i]], pos)) - - /* animate transformations */ - for (i = tkeys.length - 1; i >= 0; i--) - element.transform(tkeys[i], fx._at(fx.trans[tkeys[i]], pos)) - - /* animate styles */ - for (i = skeys.length - 1; i >= 0; i--) - element.style(skeys[i], fx._at(fx.styles[skeys[i]], pos)) - - /* callback for each keyframe */ - if (fx._during) - fx._during.call(element, pos, function(from, to) { - return fx._at({ from: from, to: to }, pos) - }) - - /* finish off animation */ - if (time > finish) { - clearInterval(fx.interval) - fx._after ? fx._after.apply(element, [fx]) : fx.stop() - } + var akeys, tkeys, skeys + , interval = 1000 / 60 + , element = fx.target + , start = new Date().getTime() + , finish = start + d + + /* start animation */ + fx.interval = setInterval(function(){ + // This code was borrowed from the emile.js micro framework by Thomas Fuchs, aka MadRobby. + var i, key + , time = new Date().getTime() + , pos = time > finish ? 1 : (time - start) / d + + /* collect attribute keys */ + if (akeys == null) { + akeys = [] + for (key in fx.attrs) + akeys.push(key) + } + + /* collect transformation keys */ + if (tkeys == null) { + tkeys = [] + for (key in fx.trans) + tkeys.push(key) + } + + /* collect style keys */ + if (skeys == null) { + skeys = [] + for (key in fx.styles) + skeys.push(key) + } + + /* apply easing */ + pos = ease == '<>' ? + (-Math.cos(pos * Math.PI) / 2) + 0.5 : + ease == '>' ? + Math.sin(pos * Math.PI / 2) : + ease == '<' ? + -Math.cos(pos * Math.PI / 2) + 1 : + ease == '-' ? + pos : + typeof ease == 'function' ? + ease(pos) : + pos + + /* run all x-position properties */ + if (fx._x) + element.x(fx._at(fx._x, pos)) + else if (fx._cx) + element.cx(fx._at(fx._cx, pos)) + + /* run all y-position properties */ + if (fx._y) + element.y(fx._at(fx._y, pos)) + else if (fx._cy) + element.cy(fx._at(fx._cy, pos)) + + /* run all size properties */ + if (fx._size) + element.size(fx._at(fx._size.width, pos), fx._at(fx._size.height, pos)) + + /* run all viewbox properties */ + if (fx._viewbox) + element.viewbox( + fx._at(fx._viewbox.x, pos) + , fx._at(fx._viewbox.y, pos) + , fx._at(fx._viewbox.width, pos) + , fx._at(fx._viewbox.height, pos) + ) + + /* animate attributes */ + for (i = akeys.length - 1; i >= 0; i--) + element.attr(akeys[i], fx._at(fx.attrs[akeys[i]], pos)) + + /* animate transformations */ + for (i = tkeys.length - 1; i >= 0; i--) + element.transform(tkeys[i], fx._at(fx.trans[tkeys[i]], pos)) + + /* animate styles */ + for (i = skeys.length - 1; i >= 0; i--) + element.style(skeys[i], fx._at(fx.styles[skeys[i]], pos)) + + /* callback for each keyframe */ + if (fx._during) + fx._during.call(element, pos, function(from, to) { + return fx._at({ from: from, to: to }, pos) + }) + + /* finish off animation */ + if (time > finish) { + clearInterval(fx.interval) + fx._after ? fx._after.apply(element, [fx]) : fx.stop() + } + + }, d > interval ? interval : d) - }, duration > 10 ? 10 : duration) + }, delay || 0) return this } @@ -153,29 +176,25 @@ SVG.extend(SVG.FX, { } // Animatable x-axis , x: function(x) { - var b = this.bbox() - this._x = { from: b.x, to: x } + this._x = { from: this.target.x(), to: x } return this } // Animatable y-axis , y: function(y) { - var b = this.bbox() - this._y = { from: b.y, to: y } + this._y = { from: this.target.y(), to: y } return this } // Animatable center x-axis , cx: function(x) { - var b = this.bbox() - this._cx = { from: b.cx, to: x } + this._cx = { from: this.target.cx(), to: x } return this } // Animatable center y-axis , cy: function(y) { - var b = this.bbox() - this._cy = { from: b.cy, to: y } + this._cy = { from: this.target.cy(), to: y } return this } @@ -205,6 +224,21 @@ SVG.extend(SVG.FX, { return this } + // Add animatable viewbox +, viewbox: function(x, y, width, height) { + if (this.target instanceof SVG.Container) { + var box = this.target.viewbox() + + this._viewbox = { + x: { from: box.x, to: x } + , y: { from: box.y, to: y } + , width: { from: box.width, to: width } + , height: { from: box.height, to: height } + } + } + + return this + } // Add callback for each keyframe , during: function(during) { this._during = during @@ -220,6 +254,7 @@ SVG.extend(SVG.FX, { // Stop running animation , stop: function() { /* stop current animation */ + clearTimeout(this.timeout) clearInterval(this.interval) /* reset storage for properties that need animation */ @@ -233,10 +268,11 @@ SVG.extend(SVG.FX, { delete this._size delete this._after delete this._during + delete this._viewbox return this } - // Private: at position according to from and to + // Private: calculate position according to from and to , _at: function(o, pos) { /* number recalculation */ return typeof o.from == 'number' ? @@ -259,7 +295,7 @@ SVG.extend(SVG.FX, { /* convert FROM unit */ match = SVG.regex.unit.exec(o.from.toString()) - from = parseFloat(match[1]) + from = parseFloat(match ? match[1] : 0) /* convert TO unit */ match = SVG.regex.unit.exec(o.to) @@ -291,12 +327,13 @@ SVG.extend(SVG.FX, { // SVG.extend(SVG.Element, { // Get fx module or create a new one, then animate with given duration and ease - animate: function(duration, ease) { - return (this.fx || (this.fx = new SVG.FX(this))).stop().animate(duration, ease) + animate: function(d, ease, delay) { + return (this.fx || (this.fx = new SVG.FX(this))).stop().animate(d, ease, delay) }, // Stop current animation; this is an alias to the fx instance stop: function() { - this.fx.stop() + if (this.fx) + this.fx.stop() return this } diff --git a/src/gradient.js b/src/gradient.js index 4c30b43..6a2155e 100644 --- a/src/gradient.js +++ b/src/gradient.js @@ -52,8 +52,7 @@ SVG.extend(SVG.Gradient, { // SVG.extend(SVG.Defs, { - - /* define gradient */ + // define gradient gradient: function(type, block) { var element = this.put(new SVG.Gradient(type)) @@ -78,8 +77,7 @@ SVG.Stop.prototype = new SVG.Element() // SVG.extend(SVG.Stop, { - - /* add color stops */ + // add color stops update: function(o) { var index , attr = ['opacity', 'color'] @@ -90,7 +88,7 @@ SVG.extend(SVG.Stop, { this.style('stop-' + attr[index], o[attr[index]]) /* set attributes */ - return this.attr('offset', (o.offset != null ? o.offset : this.attrs.offset || 0) + '%') + return this.attr('offset', (o.offset != null ? o.offset : this.attr('offset')) + '%') } }) diff --git a/src/group.js b/src/group.js index a9f046f..f960391 100644 --- a/src/group.js +++ b/src/group.js @@ -8,11 +8,11 @@ SVG.G.prototype = new SVG.Container SVG.extend(SVG.G, { // Move over x-axis x: function(x) { - return this.transform('x', x) + return x == null ? this.trans.x : this.transform('x', x) } // Move over y-axis , y: function(y) { - return this.transform('y', y) + return y == null ? this.trans.y : this.transform('y', y) } // Get defs , defs: function() { diff --git a/src/image.js b/src/image.js index bc60c0e..7546936 100644 --- a/src/image.js +++ b/src/image.js @@ -3,14 +3,13 @@ SVG.Image = function() { } // Inherit from SVG.Element -SVG.Image.prototype = new SVG.Shape() +SVG.Image.prototype = new SVG.Shape SVG.extend(SVG.Image, { - /* (re)load image */ + // (re)load image load: function(url) { - this.src = url - return (url ? this.attr('xlink:href', url, SVG.xlink) : this) + return (url ? this.attr('xlink:href', (this.src = url), SVG.xlink) : this) } })
\ No newline at end of file diff --git a/src/line.js b/src/line.js index 7407983..893fe62 100644 --- a/src/line.js +++ b/src/line.js @@ -11,35 +11,37 @@ SVG.extend(SVG.Line, { x: function(x) { var b = this.bbox() - return this.attr({ - x1: this.attrs.x1 - b.x + x - , x2: this.attrs.x2 - b.x + x + return x == null ? b.x : this.attr({ + x1: this.attr('x1') - b.x + x + , x2: this.attr('x2') - b.x + x }) } // Move over y-axis , y: function(y) { var b = this.bbox() - return this.attr({ - y1: this.attrs.y1 - b.y + y - , y2: this.attrs.y2 - b.y + y + return y == null ? b.y : this.attr({ + y1: this.attr('y1') - b.y + y + , y2: this.attr('y2') - b.y + y }) } // Move by center over x-axis , cx: function(x) { - return this.x(x - this.bbox().width / 2) + var half = this.bbox().width / 2 + return x == null ? this.x() + half : this.x(x - half) } // Move by center over y-axis , cy: function(y) { - return this.y(y - this.bbox().height / 2) + var half = this.bbox().height / 2 + return y == null ? this.y() + half : this.y(y - half) } // Set line size by width and height , size: function(width, height) { var b = this.bbox() return this - .attr(this.attrs.x1 < this.attrs.x2 ? 'x2' : 'x1', b.x + width) - .attr(this.attrs.y1 < this.attrs.y2 ? 'y2' : 'y1', b.y + height) + .attr(this.attr('x1') < this.attr('x2') ? 'x2' : 'x1', b.x + width) + .attr(this.attr('y1') < this.attr('y2') ? 'y2' : 'y1', b.y + height) } -})
\ No newline at end of file +}) diff --git a/src/mask.js b/src/mask.js index f863e8d..12fc13b 100644 --- a/src/mask.js +++ b/src/mask.js @@ -6,7 +6,6 @@ SVG.Mask = function() { SVG.Mask.prototype = new SVG.Container SVG.extend(SVG.Element, { - // Distribute mask to svg element maskWith: function(element) { /* use given mask or create a new one */ diff --git a/src/path.js b/src/path.js index 4f53892..ab5221a 100644 --- a/src/path.js +++ b/src/path.js @@ -3,19 +3,11 @@ SVG.Path = function() { } // Inherit from SVG.Shape -SVG.Path.prototype = new SVG.Shape() +SVG.Path.prototype = new SVG.Shape SVG.extend(SVG.Path, { - // Move over x-axis - x: function(x) { - return this.transform('x', x) - } - // Move over y-axis -, y: function(y) { - return this.transform('y', y) - } - // Set path data -, plot: function(data) { + // Private: Native plot + _plot: function(data) { return this.attr('d', data || 'M0,0') } diff --git a/src/plotable.js b/src/plotable.js new file mode 100644 index 0000000..023d769 --- /dev/null +++ b/src/plotable.js @@ -0,0 +1,36 @@ + +SVG.extend(SVG.Polyline, SVG.Polygon, SVG.Path, { + // Move over x-axis + x: function(x) { + return x == null ? this.bbox().x : this.transform('x', x) + } + // Move over y-axis +, y: function(y) { + return y == null ? this.bbox().y : this.transform('y', y) + } + // Set the actual size in pixels +, size: function(width, height) { + var scale = width / this._offset.width + + return this.transform({ + scaleX: scale + , scaleY: height != null ? height / this._offset.height : scale + }) + } + // Set path data +, plot: function(data) { + var x = this.trans.scaleX + , y = this.trans.scaleY + + /* native plot */ + this._plot(data) + + /* get and store the actual offset of the element */ + this._offset = this.transform({ scaleX: 1, scaleY: 1 }).bbox() + this._offset.x -= this.trans.x + this._offset.y -= this.trans.y + + return this.transform({ scaleX: x, scaleY: y }) + } + +})
\ No newline at end of file diff --git a/src/poly.js b/src/poly.js index ce5a70c..16a1cae 100644 --- a/src/poly.js +++ b/src/poly.js @@ -1,12 +1,3 @@ -SVG.Poly = { - // Set polygon data with default zero point if no data is passed - plot: function(points) { - this.attr('points', points || '0,0') - - return this - } -} - SVG.Polyline = function() { this.constructor.call(this, SVG.create('polyline')) } @@ -14,9 +5,6 @@ SVG.Polyline = function() { // Inherit from SVG.Shape SVG.Polyline.prototype = new SVG.Shape -// Add polygon-specific functions -SVG.extend(SVG.Polyline, SVG.Poly) - SVG.Polygon = function() { this.constructor.call(this, SVG.create('polygon')) } @@ -25,4 +13,19 @@ SVG.Polygon = function() { SVG.Polygon.prototype = new SVG.Shape // Add polygon-specific functions -SVG.extend(SVG.Polygon, SVG.Poly)
\ No newline at end of file +SVG.extend(SVG.Polyline, SVG.Polygon, { + // Private: Native plot + _plot: function(p) { + if (Array.isArray(p)) { + var i, l, points = [] + + for (i = 0, l = p.length; i < l; i++) + points.push(p[i].join(',')) + + p = points.length == 0 ? points.join(' ') : '0,0' + } + + return this.attr('points', p || '0,0') + } + +})
\ No newline at end of file diff --git a/src/regex.js b/src/regex.js index 3639358..7b268f6 100644 --- a/src/regex.js +++ b/src/regex.js @@ -1,7 +1,12 @@ // Storage for regular expressions SVG.regex = { + /* test a given value */ + test: function(value, test) { + return this[test].test(value) + } + /* parse unit value */ - unit: /^([\d\.]+)([a-z%]{0,2})$/ +, unit: /^([\d\.]+)([a-z%]{0,2})$/ /* parse hex value */ , hex: /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i @@ -30,4 +35,7 @@ SVG.regex = { /* test for blank string */ , isBlank: /^(\s+)?$/ + /* test for numeric string */ +, isNumber: /^-?[\d\.]+$/ + }
\ No newline at end of file diff --git a/src/sugar.js b/src/sugar.js index 2edb429..27b0537 100644 --- a/src/sugar.js +++ b/src/sugar.js @@ -33,11 +33,11 @@ var _colorPrefix = function(type, attr) { SVG.extend(SVG.Element, SVG.FX, { // Rotation - rotate: function(deg, cx, cy) { + rotate: function(deg, x, y) { return this.transform({ rotation: deg || 0 - , cx: cx - , cy: cy + , cx: x + , cy: y }) } // Skew @@ -27,7 +27,7 @@ SVG.did = 1000 // Get next named element id SVG.eid = function(name) { - return 'Svgjs' + name.charAt(0).toUpperCase() + name.slice(1) + 'Element' + (SVG.did++) + return 'Svgjs' + name.charAt(0).toUpperCase() + name.slice(1) + (SVG.did++) } // Method for element creation @@ -41,7 +41,7 @@ SVG.create = function(name) { return element } - // Method for extending objects +// Method for extending objects SVG.extend = function() { var modules, methods, key, i @@ -57,6 +57,12 @@ SVG.extend = function() { modules[i].prototype[key] = methods[key] } +// Method for getting an eleemnt by id +SVG.get = function(id) { + var node = document.getElementById(id) + if (node) return node.instance +} + // svg support test SVG.supported = (function() { return !! document.createElementNS && diff --git a/src/text.js b/src/text.js index 3feb514..b3765e6 100644 --- a/src/text.js +++ b/src/text.js @@ -8,7 +8,7 @@ SVG.Text = function() { /* define default style */ this.styles = { 'font-size': 16 - , 'font-family': 'Helvetica' + , 'font-family': 'Helvetica, Arial, sans-serif' , 'text-anchor': 'start' } @@ -19,8 +19,37 @@ SVG.Text = function() { SVG.Text.prototype = new SVG.Shape SVG.extend(SVG.Text, { + // Move over x-axis + x: function(x, a) { + /* act as getter */ + if (x == null) return a ? this.attr('x') : this.bbox().x + + /* set x taking anchor in mind */ + if (!a) { + a = this.style('text-anchor') + x = a == 'start' ? x : a == 'end' ? x + this.bbox().width : x + this.bbox().width / 2 + } + + return this.attr('x', x) + } + // Move center over x-axis +, cx: function(x, a) { + return x == null ? this.bbox().cx : this.x(x - this.bbox().width / 2) + } + // Move center over y-axis +, cy: function(y, a) { + return y == null ? this.bbox().cy : this.y(a ? y : y - this.bbox().height / 2) + } + // Move element to given x and y values +, move: function(x, y, a) { + return this.x(x, a).y(y) + } + // Move element by its center +, center: function(x, y, a) { + return this.cx(x, a).cy(y, a) + } // Set the text content - text: function(text) { +, text: function(text) { /* act as getter */ if (text == null) return this.content @@ -38,8 +67,7 @@ SVG.extend(SVG.Text, { for (i = 0, il = lines.length; i < il; i++) this.tspan(lines[i]) - /* set style */ - return this.attr('style', this.style()) + return this.attr('textLength', 1).attr('textLength', null) } // Create a tspan , tspan: function(text) { @@ -51,17 +79,6 @@ SVG.extend(SVG.Text, { return tspan.attr('style', this.style()) } - // Move element by its center -, center: function(x, y) { - var anchor = this.style('text-anchor') - , box = this.bbox() - , x = anchor == 'start' ? - x - box.width / 2 : - anchor == 'end' ? - x + box.width / 2 : x - - return this.move(x, y - box.height / 2) - } // Set font size , size: function(size) { return this.attr('font-size', size) @@ -85,8 +102,8 @@ SVG.extend(SVG.Text, { /* define position of all lines */ for (i = 0, il = this.lines.length; i < il; i++) this.lines[i].attr({ - dy: size * this._leading - (i == 0 ? size * 0.3 : 0) - , x: (this.attrs.x || 0) + dy: size * this._leading - (i == 0 ? size * 0.276666666 : 0) + , x: (this.attr('x') || 0) , style: this.style() }) diff --git a/src/wrap.js b/src/wrap.js deleted file mode 100644 index 1caaaad..0000000 --- a/src/wrap.js +++ /dev/null @@ -1,82 +0,0 @@ -SVG.Wrap = function(element) { - this.constructor.call(this, SVG.create('g')) - - /* insert and store child */ - this.node.insertBefore(element.node, null) - this.child = element - this.type = element.node.nodeName -} - -// inherit from SVG.Shape -SVG.Wrap.prototype = new SVG.Shape() - -SVG.extend(SVG.Wrap, { - // Move over x-axis - x: function(x) { - return this.transform('x', x) - } - // Move over y-axis -, y: function(y) { - return this.transform('y', y) - } - // Set the actual size in pixels -, size: function(width, height) { - var scale = width / this._b.width - - this.child.transform({ - scaleX: scale - , scaleY: height != null ? height / this._b.height : scale - }) - - return this - } - // Move by center -, center: function(x, y) { - return this.move( - x + (this._b.width * this.child.trans.scaleX) / -2 - , y + (this._b.height * this.child.trans.scaleY) / -2 - ) - } - // Create distributed attr -, attr: function(a, v, n) { - /* call individual attributes if an object is given */ - if (typeof a == 'object') { - for (v in a) this.attr(v, a[v]) - - /* act as a getter if only one argument is given */ - } else if (arguments.length < 2) { - return a == 'transform' ? this.attrs[a] : this.child.attrs[a] - - /* apply locally for certain attributes */ - } else if (a == 'transform') { - this.attrs[a] = v - - n != null ? - this.node.setAttributeNS(n, a, v) : - this.node.setAttribute(a, v) - - /* apply attributes to child */ - } else { - this.child.attr(a, v, n) - } - - return this - } - // Distribute plot method to child -, plot: function(data) { - /* plot new shape */ - this.child.plot(data) - - /* get and store new bbox */ - this._b = this.child.bbox() - - /* reposition element withing wrapper */ - this.child.transform({ - x: -this._b.x - , y: -this._b.y - }) - - return this - } - -})
\ No newline at end of file |