zcy
/
snap.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved elemental.js to 3rd party folder, fixed Savage(<SVG element>) work

master
Dmitry Baranovskiy 2013-08-09 22:13:22 +10:00
parent 537e249baf
commit d07cb4cf1b
8 changed files with 68 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Gruntfile.js
View File

@ -29,7 +29,7 @@ module.exports = function(grunt) {
src: [
"./eve/eve.js",
"mina.js",
"elemental.js",
"./third-party/elemental.js",
"svg.js",
"savage.path.js",
"savage.set.js",
@ -40,12 +40,8 @@ module.exports = function(grunt) {
}
});
// These plugins provide necessary tasks.
grunt.loadNpmTasks("grunt-contrib-concat");
grunt.loadNpmTasks("grunt-contrib-uglify");
// Default task.
grunt.registerTask("default", ["concat", "uglify"]);
};

3
package.json
View File

@ -12,6 +12,7 @@
"devDependencies": {
"grunt": "~0.4.1",
"grunt-contrib-uglify": "~0.2.0",
"grunt-contrib-concat": "~0.3.0"
"grunt-contrib-concat": "~0.3.0",
"eslint-grunt": "0.0.4"
}
}

4
savage-min.js vendored
View File

File diff suppressed because one or more lines are too long

34
savage.js
View File

@ -28,7 +28,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
// build: 2013-08-05
// build: 2013-08-09
// Copyright (c) 2013 Adobe Systems Incorporated. All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
@ -907,13 +907,14 @@ Savage.version = "0.0.1";
function Savage(w, h) {
if (w) {
if (w.tagName) {
return new Element(w);
return wrap(w);
}
if (w instanceof Element) {
return w;
}
if (h == null) {
return new Element(glob.doc.querySelector(w));
w = glob.doc.querySelector(w);
return wrap(w);
}
}
w = w == null ? "100%" : w;
@ -2140,7 +2141,7 @@ function unit2px(el, name, value) {
= (Element)
\*/
Savage.select = function (query) {
return new Element(glob.doc.querySelector(query));
return wrap(glob.doc.querySelector(query));
};
/*\
* Savage.selectAll
@ -2155,7 +2156,7 @@ Savage.selectAll = function (query) {
var nodelist = glob.doc.querySelectorAll(query),
set = (Savage.set || Array)();
for (var i = 0; i < nodelist.length; i++) {
set.push(new Element(nodelist[i]));
set.push(wrap(nodelist[i]));
}
return set;
};
@ -2322,13 +2323,13 @@ function arrayFirstValue(arr) {
this.removed = true;
};
elproto.select = function (query) {
return new Element(this.node.querySelector(query));
return wrap(this.node.querySelector(query));
};
elproto.selectAll = function (query) {
var nodelist = this.node.querySelectorAll(query),
set = (Savage.set || Array)();
for (var i = 0; i < nodelist.length; i++) {
set.push(new Element(nodelist[i]));
set.push(wrap(nodelist[i]));
}
return set;
};
@ -2359,7 +2360,7 @@ function arrayFirstValue(arr) {
var clone = this.node.cloneNode(true);
// TODO replace with this.insertAfter()
this.node.parentNode.insertBefore(clone, this.node);
return new Element(clone);
return wrap(clone);
};
elproto.pattern = function (x, y, width, height) {
var p = make("pattern", this.paper.defs);
@ -2418,13 +2419,12 @@ function arrayFirstValue(arr) {
};
}
elproto.animate = function (attrs, ms, callback) {
var anims = [], eq;
for (var key in attrs) if (attrs[has](key)) {
if (this.equal) {
eq = this.equal(key, Str(attrs[key]));
anims.push(mina(eq.from, eq.to, ms, applyAttr(this, key, eq.f)));
var eq = this.equal(key, Str(attrs[key]));
return mina(eq.from, eq.to, ms, applyAttr(this, key, eq.f));
} else {
anims.push(mina(+this.attr(key), +attrs[key], ms, applyAttr(this, key)));
return mina(+this.attr(key), +attrs[key], ms, applyAttr(this, key));
}
}
};
@ -2474,7 +2474,7 @@ Savage.fragment = function () {
function make(name, parent) {
var res = $(name);
parent.appendChild(res);
var el = new Element(res);
var el = wrap(res);
el.type = name;
return el;
}
@ -2516,9 +2516,15 @@ function Paper(w, h) {
return res;
}
function wrap(dom) {
if (!dom) {
return dom;
}
if (dom instanceof Element || dom instanceof Fragment) {
return dom;
}
if (dom.tagName == "svg") {
return new Paper(dom);
}
return new Element(dom);
}
(function (proto) {
@ -3437,7 +3443,7 @@ Savage.plugin(function (Savage, Element, Paper, glob) {
z = z > 1 ? 1 : z < 0 ? 0 : z;
var z2 = z / 2,
n = 12,
Tvalues = [-0.1252,0.1252,-0.3678,0.3678,-0.5873,0.5873,-0.7699,0.7699,-0.9041,0.9041,-0.9816,0.9816],
Tvalues = [-.1252,.1252,-.3678,.3678,-.5873,.5873,-.7699,.7699,-.9041,.9041,-.9816,.9816],
Cvalues = [0.2491,0.2491,0.2335,0.2335,0.2032,0.2032,0.1601,0.1601,0.1069,0.1069,0.0472,0.0472],
sum = 0;
for (var i = 0; i < n; i++) {

2
savage.path.js
View File

@ -207,7 +207,7 @@ Savage.plugin(function (Savage, Element, Paper, glob) {
z = z > 1 ? 1 : z < 0 ? 0 : z;
var z2 = z / 2,
n = 12,
Tvalues = [-0.1252,0.1252,-0.3678,0.3678,-0.5873,0.5873,-0.7699,0.7699,-0.9041,0.9041,-0.9816,0.9816],
Tvalues = [-.1252,.1252,-.3678,.3678,-.5873,.5873,-.7699,.7699,-.9041,.9041,-.9816,.9816],
Cvalues = [0.2491,0.2491,0.2335,0.2335,0.2032,0.2032,0.1601,0.1601,0.1069,0.1069,0.0472,0.0472],
sum = 0;
for (var i = 0; i < n; i++) {

30
svg.js
View File

@ -3,13 +3,14 @@ Savage.version = "0.0.1";
function Savage(w, h) {
if (w) {
if (w.tagName) {
return new Element(w);
return wrap(w);
}
if (w instanceof Element) {
return w;
}
if (h == null) {
return new Element(glob.doc.querySelector(w));
w = glob.doc.querySelector(w);
return wrap(w);
}
}
w = w == null ? "100%" : w;
@ -1236,7 +1237,7 @@ function unit2px(el, name, value) {
= (Element)
\*/
Savage.select = function (query) {
return new Element(glob.doc.querySelector(query));
return wrap(glob.doc.querySelector(query));
};
/*\
* Savage.selectAll
@ -1251,7 +1252,7 @@ Savage.selectAll = function (query) {
var nodelist = glob.doc.querySelectorAll(query),
set = (Savage.set || Array)();
for (var i = 0; i < nodelist.length; i++) {
set.push(new Element(nodelist[i]));
set.push(wrap(nodelist[i]));
}
return set;
};
@ -1418,13 +1419,13 @@ function arrayFirstValue(arr) {
this.removed = true;
};
elproto.select = function (query) {
return new Element(this.node.querySelector(query));
return wrap(this.node.querySelector(query));
};
elproto.selectAll = function (query) {
var nodelist = this.node.querySelectorAll(query),
set = (Savage.set || Array)();
for (var i = 0; i < nodelist.length; i++) {
set.push(new Element(nodelist[i]));
set.push(wrap(nodelist[i]));
}
return set;
};
@ -1455,7 +1456,7 @@ function arrayFirstValue(arr) {
var clone = this.node.cloneNode(true);
// TODO replace with this.insertAfter()
this.node.parentNode.insertBefore(clone, this.node);
return new Element(clone);
return wrap(clone);
};
elproto.pattern = function (x, y, width, height) {
var p = make("pattern", this.paper.defs);
@ -1514,13 +1515,12 @@ function arrayFirstValue(arr) {
};
}
elproto.animate = function (attrs, ms, callback) {
var anims = [], eq;
for (var key in attrs) if (attrs[has](key)) {
if (this.equal) {
eq = this.equal(key, Str(attrs[key]));
anims.push(mina(eq.from, eq.to, ms, applyAttr(this, key, eq.f)));
var eq = this.equal(key, Str(attrs[key]));
return mina(eq.from, eq.to, ms, applyAttr(this, key, eq.f));
} else {
anims.push(mina(+this.attr(key), +attrs[key], ms, applyAttr(this, key)));
return mina(+this.attr(key), +attrs[key], ms, applyAttr(this, key));
}
}
};
@ -1570,7 +1570,7 @@ Savage.fragment = function () {
function make(name, parent) {
var res = $(name);
parent.appendChild(res);
var el = new Element(res);
var el = wrap(res);
el.type = name;
return el;
}
@ -1612,9 +1612,15 @@ function Paper(w, h) {
return res;
}
function wrap(dom) {
if (!dom) {
return dom;
}
if (dom instanceof Element || dom instanceof Fragment) {
return dom;
}
if (dom.tagName == "svg") {
return new Paper(dom);
}
return new Element(dom);
}
(function (proto) {

29
test/test.html
View File

@ -13,7 +13,7 @@
<link rel="stylesheet" href="mocha/mocha.css">
<script src="../eve/eve.js"></script>
<script src="../mina.js"></script>
<script src="../elemental.js"></script>
<script src="../third-party/elemental.js"></script>
<script src="../svg.js"></script>
<script src="../savage.path.js"></script>
<script src="../savage.set.js"></script>
@ -41,7 +41,7 @@
describe("Check for Paper Creation", function () {
it("creates simple paper 20 × 10", function () {
var s = Savage(20, 10);
var S = document.querySelector("svg");
var S = s.node;
expect(S).to.not.be(null);
expect(S.getAttribute("width")).to.be("20");
expect(S.getAttribute("height")).to.be("10");
@ -49,20 +49,36 @@
});
it("removal of paper", function () {
var s = Savage(20, 10);
var S = document.querySelector("svg");
var S = s.node;
expect(S).to.not.be(null);
s.remove();
S = document.querySelector("svg");
expect(S).to.be(null);
S = document.querySelectorAll("svg").length;
expect(S).to.be(1);
});
it("creates simple paper 20% × 10em", function () {
var s = Savage("20%", "10em");
var S = document.querySelector("svg");
var S = s.node;
expect(S).to.not.be(null);
expect(S.getAttribute("width")).to.be("20%");
expect(S.getAttribute("height")).to.be("10em");
s.remove();
});
it("converts existing SVG element to paper", function () {
var S = document.getElementById("svgroot");
var s = Savage(S);
expect(document.querySelector("#svgroot circle")).to.be(null);
var c = s.circle(10, 20, 5);
expect(document.querySelectorAll("#svgroot circle").length).to.be(1);
c.remove();
});
it("converts existing SVG element to paper (as query)", function () {
var S = document.getElementById("svgroot");
var s = Savage("#svgroot");
expect(document.querySelector("#svgroot circle")).to.be(null);
var c = s.circle(10, 20, 5);
expect(document.querySelectorAll("#svgroot circle").length).to.be(1);
c.remove();
});
});
describe("Primitives creation", function () {
var s;
@ -511,5 +527,6 @@
mocha.run();
};
</script>
<svg id="svgroot"></svg>
</body>
</html>

0
elemental.js → third-party/elemental.js vendored
View File