From d865bf0810f5ef6d18935eb44d71e089fb71d715 Mon Sep 17 00:00:00 2001 From: Dmitry Baranovskiy Date: Fri, 25 Oct 2013 13:59:41 -0700 Subject: [PATCH] Getting rid of elemental.js. Fix for issue #50 --- Gruntfile.js | 1 - package.json | 3 +-- src/svg.js | 31 ++++++++++++------------------- 3 files changed, 13 insertions(+), 22 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 6f1584b..3ad0b68 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -30,7 +30,6 @@ module.exports = function(grunt) { "./node_modules/eve/eve.js", "./src/amd-banner.js", "./src/mina.js", - "./node_modules/elemental.js/elemental.js", "./src/svg.js", "./src/path.js", "./src/set.js", diff --git a/package.json b/package.json index 7fa8b9d..3a6282c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Snap.svg", - "version": "0.1.0", + "version": "0.1.1", "description": "JavaScript Vector Library", "main": "Gruntfile.js", "repository": { @@ -17,7 +17,6 @@ "mocha": "*", "expect.js": "*", "eve": "*", - "elemental.js": "~0.2.4", "dr.js": "~0.0.10" } } diff --git a/src/svg.js b/src/svg.js index faec271..8d731d9 100644 --- a/src/svg.js +++ b/src/svg.js @@ -71,6 +71,7 @@ var has = "hasOwnProperty", objectToString = Object.prototype.toString, ISURL = /^url\(['"]?([^\)]+?)['"]?\)$/i, colourRegExp = /^\s*((#[a-f\d]{6})|(#[a-f\d]{3})|rgba?\(\s*([\d\.]+%?\s*,\s*[\d\.]+%?\s*,\s*[\d\.]+%?(?:\s*,\s*[\d\.]+%?)?)\s*\)|hsba?\(\s*([\d\.]+(?:deg|\xb0|%)?\s*,\s*[\d\.]+%?\s*,\s*[\d\.]+(?:%?\s*,\s*[\d\.]+)?%?)\s*\)|hsla?\(\s*([\d\.]+(?:deg|\xb0|%)?\s*,\s*[\d\.]+%?\s*,\s*[\d\.]+(?:%?\s*,\s*[\d\.]+)?%?)\s*\))\s*$/i, + isnan = {"NaN": 1, "Infinity": 1, "-Infinity": 1}, bezierrg = /^(?:cubic-)?bezier\(([^,]+),([^,]+),([^,]+),([^\)]+)\)/, reURLValue = /^url\(#?([^)]+)\)$/, spaces = "\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029", @@ -138,7 +139,7 @@ function getAttrs(el) { function is(o, type) { type = Str.prototype.toLowerCase.call(type); if (type == "finite") { - return isFinite(o); + return !isnan[has](+o); } if (type == "array" && (o instanceof Array || Array.isArray && Array.isArray(o))) { @@ -2291,24 +2292,16 @@ function arrayFirstValue(arr) { \*/ Snap.parse = function (svg) { var f = glob.doc.createDocumentFragment(), - pointer = f; - eve.on("elemental.tag", function (data, extra, raw) { - var tag = $(data); - extra && $(tag, extra); - pointer.appendChild(tag); - pointer = tag; - }); - eve.on("elemental.text", function (text) { - pointer.appendChild(glob.doc.createTextNode(text)); - }); - eve.on("elemental./tag", function () { - pointer = pointer.parentNode; - }); - eve.on("elemental.eof", function () { - eve.off("elemental.*"); - eve("snap.parsed", f); - }); - elemental().parse(svg).end(); + div = glob.doc.createElement("div"); + svg = "" + svg + ""; + div.innerHTML = svg; + svg = div.getElementsByTagName("svg")[0]; + if (svg) { + while (svg.firstChild) { + f.appendChild(svg.firstChild); + } + } + div.innerHTML = E; return new Fragment(f); }; function Fragment(frag) {