haskal
/
asciiflow2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tweaked rendering logic for lines next to each other

This commit is contained in:
Lewis Hemens 2014-04-27 14:30:54 +01:00
parent b63c778cc3
commit c188da9df9
3 changed files with 305 additions and 260 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

506
js-compiled.js
View File

@ -2,9 +2,9 @@ var f;
try { try {
throw 1; throw 1;
} catch (aa) { } catch (aa) {
window.Q = window.Q || {}; window.U = window.U || {};
} }
var h = ["+", "\u2012", "\u2013", "-"], m = [">", "<", "^", "v"], ba = h.concat(m), n = "ontouchstart" in window || "onmsgesturechange" in window; var h = ["+", "\u2012", "\u2013", "-", "|"], m = [">", "<", "^", "v"], ba = h.concat(m), n = "ontouchstart" in window || "onmsgesturechange" in window;
function p(a, b) { function p(a, b) {
this.x = a; this.x = a;
this.y = b; this.y = b;
@ -27,46 +27,47 @@ p.prototype.length = function() {
p.prototype.scale = function(a) { p.prototype.scale = function(a) {
return new p(this.x * a, this.y * a); return new p(this.x * a, this.y * a);
}; };
function s(a, b) { function t(a, b) {
this.w = Math.min(a.x, b.x); this.w = Math.min(a.x, b.x);
this.A = Math.min(a.y, b.y); this.A = Math.min(a.y, b.y);
this.I = Math.max(a.x, b.x); this.I = Math.max(a.x, b.x);
this.J = Math.max(a.y, b.y); this.J = Math.max(a.y, b.y);
} }
function u(a) { function ca(a) {
return new p(a.w, a.A); return new p(a.w, a.A);
} }
s.prototype.contains = function(a) { t.prototype.contains = function(a) {
return a.x >= this.w && a.x <= this.I && a.y >= this.A && a.y <= this.J; return a.x >= this.w && a.x <= this.I && a.y >= this.A && a.y <= this.J;
}; };
var v = new p(-1, 0), w = new p(1, 0), x = new p(0, -1), A = new p(0, 1), B = [v, w, x, A]; var v = new p(-1, 0), w = new p(1, 0), x = new p(0, -1), y = new p(0, 1), A = [v, w, x, y];
function ca() { function da() {
this.h = this.value = null; this.h = this.value = null;
} }
function C(a) { function B(a) {
return null != a.h ? a.h : a.value; return null != a.h ? a.h : a.value;
} }
function E(a) { function C(a) {
return-1 != ba.indexOf(C(a)); return-1 != ba.indexOf(B(a));
} }
function da(a, b, c, d) { function ea(a, b, d, c) {
this.left = a; this.left = a;
this.right = b; this.right = b;
this.l = c; this.k = d;
this.j = d; this.i = c;
this.P = this.L = this.Q = this.M = !1;
} }
function F(a) { function D(a) {
return a.left + a.right + a.l + a.j; return a.left + a.right + a.k + a.i;
}
function ea(a, b) {
this.position = a;
this.value = b;
} }
function fa(a, b) { function fa(a, b) {
this.position = a;
this.value = b;
}
function ga(a, b) {
this.position = a; this.position = a;
this.n = b; this.n = b;
} }
;function ga(a) { ;function ha(a) {
this.state = a; this.state = a;
this.canvas = document.getElementById("ascii-canvas"); this.canvas = document.getElementById("ascii-canvas");
this.context = this.canvas.getContext("2d"); this.context = this.canvas.getContext("2d");
@ -74,88 +75,88 @@ function fa(a, b) {
this.offset = new p(9E3, 5100); this.offset = new p(9E3, 5100);
this.f = !0; this.f = !0;
this.B = !1; this.B = !1;
ha(this); ia(this);
} }
function ha(a) { function ia(a) {
a.canvas.width = document.documentElement.clientWidth; a.canvas.width = document.documentElement.clientWidth;
a.canvas.height = document.documentElement.clientHeight; a.canvas.height = document.documentElement.clientHeight;
a.f = !0; a.f = !0;
} }
ga.prototype.animate = function() { ha.prototype.animate = function() {
if (this.f || this.state.f) { if (this.f || this.state.f) {
this.f = !1, this.state.f = !1, ia(this); this.f = !1, this.state.f = !1, ja(this);
} }
var a = this; var a = this;
window.requestAnimationFrame(function() { window.requestAnimationFrame(function() {
a.animate(); a.animate();
}); });
}; };
function ia(a) { function ja(a) {
var b = a.context; var b = a.context;
b.setTransform(1, 0, 0, 1, 0, 0); b.setTransform(1, 0, 0, 1, 0, 0);
b.clearRect(0, 0, a.canvas.width, a.canvas.height); b.clearRect(0, 0, a.canvas.width, a.canvas.height);
b.scale(a.zoom, a.zoom); b.scale(a.zoom, a.zoom);
b.translate(a.canvas.width / 2 / a.zoom, a.canvas.height / 2 / a.zoom); b.translate(a.canvas.width / 2 / a.zoom, a.canvas.height / 2 / a.zoom);
var c = r(G(a, new p(0, 0)), new p(3, 3)), d = G(a, new p(a.canvas.width, a.canvas.height)).add(new p(3, 3)); var d = r(E(a, new p(0, 0)), new p(3, 3)), c = E(a, new p(a.canvas.width, a.canvas.height)).add(new p(3, 3));
c.x = Math.max(0, Math.min(c.x, 2E3));
d.x = Math.max(0, Math.min(d.x, 2E3)); d.x = Math.max(0, Math.min(d.x, 2E3));
c.y = Math.max(0, Math.min(c.y, 600)); c.x = Math.max(0, Math.min(c.x, 2E3));
d.y = Math.max(0, Math.min(d.y, 600)); d.y = Math.max(0, Math.min(d.y, 600));
c.y = Math.max(0, Math.min(c.y, 600));
b.lineWidth = "1"; b.lineWidth = "1";
b.strokeStyle = "#EEEEEE"; b.strokeStyle = "#EEEEEE";
b.beginPath(); b.beginPath();
for (var e = c.x;e < d.x;e++) { for (var e = d.x;e < c.x;e++) {
b.moveTo(9 * e - a.offset.x, 0 - a.offset.y), b.lineTo(9 * e - a.offset.x, 17 * a.state.cells.length - a.offset.y); b.moveTo(9 * e - a.offset.x, 0 - a.offset.y), b.lineTo(9 * e - a.offset.x, 17 * a.state.cells.length - a.offset.y);
} }
for (e = c.y;e < d.y;e++) { for (e = d.y;e < c.y;e++) {
b.moveTo(0 - a.offset.x, 17 * e - a.offset.y), b.lineTo(9 * a.state.cells.length - a.offset.x, 17 * e - a.offset.y); b.moveTo(0 - a.offset.x, 17 * e - a.offset.y), b.lineTo(9 * a.state.cells.length - a.offset.x, 17 * e - a.offset.y);
} }
a.context.stroke(); a.context.stroke();
e = !a.B; e = !a.B;
b.font = "15px Courier New"; b.font = "15px Courier New";
for (var g = c.x;g < d.x;g++) { for (var g = d.x;g < c.x;g++) {
for (var l = c.y;l < d.y;l++) { for (var l = d.y;l < c.y;l++) {
var k = H(a.state, new p(g, l)); var k = F(a.state, new p(g, l));
if (E(k) || null != k.h && " " != C(k)) { if (C(k) || null != k.h && " " != B(k)) {
a.context.fillStyle = null != k.h ? "#DEF" : "#F5F5F5", b.fillRect(9 * g - a.offset.x, 17 * (l - 1) - a.offset.y, 9, 17); a.context.fillStyle = null != k.h ? "#DEF" : "#F5F5F5", b.fillRect(9 * g - a.offset.x, 17 * (l - 1) - a.offset.y, 9, 17);
} }
var y = ja(a.state, new p(g, l)); var s = G(a.state, new p(g, l));
null == y || E(k) && !e || (a.context.fillStyle = "#000000", b.fillText(y, 9 * g - a.offset.x, 17 * l - a.offset.y - 3)); null == s || C(k) && !e || (a.context.fillStyle = "#000000", b.fillText(s, 9 * g - a.offset.x, 17 * l - a.offset.y - 3));
} }
} }
if (a.B) { if (a.B) {
b.lineWidth = "1"; b.lineWidth = "1";
b.strokeStyle = "#000000"; b.strokeStyle = "#000000";
b.beginPath(); b.beginPath();
for (e = c.x;e < d.x;e++) { for (e = d.x;e < c.x;e++) {
for (k = !1, g = c.y;g < d.y;g++) { for (k = !1, g = d.y;g < c.y;g++) {
l = H(a.state, new p(e, g)), E(l) && g != d.y - 1 || !k || (b.moveTo(9 * e - a.offset.x + 4.5, 17 * k - a.offset.y - 8.5), b.lineTo(9 * e - a.offset.x + 4.5, 17 * (g - 1) - a.offset.y - 8.5), k = !1), E(l) && !k && (k = g); l = F(a.state, new p(e, g)), C(l) && g != c.y - 1 || !k || (b.moveTo(9 * e - a.offset.x + 4.5, 17 * k - a.offset.y - 8.5), b.lineTo(9 * e - a.offset.x + 4.5, 17 * (g - 1) - a.offset.y - 8.5), k = !1), C(l) && !k && (k = g);
} }
} }
for (g = c.y;g < d.y;g++) { for (g = d.y;g < c.y;g++) {
for (k = !1, e = c.x;e < d.x;e++) { for (k = !1, e = d.x;e < c.x;e++) {
l = H(a.state, new p(e, g)), E(l) && e != d.x - 1 || !k || (b.moveTo(9 * k - a.offset.x + 4.5, 17 * g - a.offset.y - 8.5), b.lineTo(9 * (e - 1) - a.offset.x + 4.5, 17 * g - a.offset.y - 8.5), k = !1), E(l) && !k && (k = e); l = F(a.state, new p(e, g)), C(l) && e != c.x - 1 || !k || (b.moveTo(9 * k - a.offset.x + 4.5, 17 * g - a.offset.y - 8.5), b.lineTo(9 * (e - 1) - a.offset.x + 4.5, 17 * g - a.offset.y - 8.5), k = !1), C(l) && !k && (k = e);
} }
} }
a.context.stroke(); a.context.stroke();
} }
} }
function G(a, b) { function E(a, b) {
return new p(Math.min(Math.max(1, Math.round(((new p((b.x - a.canvas.width / 2) / a.zoom + a.offset.x, (b.y - a.canvas.height / 2) / a.zoom + a.offset.y)).x - 4.5) / 9)), 1998), Math.min(Math.max(1, Math.round(((new p((b.x - a.canvas.width / 2) / a.zoom + a.offset.x, (b.y - a.canvas.height / 2) / a.zoom + a.offset.y)).y + 8.5) / 17)), 598)); return new p(Math.min(Math.max(1, Math.round(((new p((b.x - a.canvas.width / 2) / a.zoom + a.offset.x, (b.y - a.canvas.height / 2) / a.zoom + a.offset.y)).x - 4.5) / 9)), 1998), Math.min(Math.max(1, Math.round(((new p((b.x - a.canvas.width / 2) / a.zoom + a.offset.x, (b.y - a.canvas.height / 2) / a.zoom + a.offset.y)).y + 8.5) / 17)), 598));
} }
;function I(a, b, c, d, e) { ;function I(a, b, d, c, e) {
e = e || "+"; e = e || "+";
var g = new s(b, c), l = g.w, k = g.A, y = g.I, g = g.J, z = d ? c.x : b.x; var g = new t(b, d), l = g.w, k = g.A, s = g.I, g = g.J, z = c ? d.x : b.x;
for (d = d ? b.y : c.y;l++ < y;) { for (c = c ? b.y : d.y;l++ < s;) {
var t = new p(l, d), D = a.getContext(new p(l, d)); var u = new p(l, c), H = a.getContext(new p(l, c));
" " == e && 2 == D.l + D.j || J(a, t, e); " " == e && 2 == H.k + H.i || J(a, u, e);
} }
for (;k++ < g;) { for (;k++ < g;) {
t = new p(z, k), D = a.getContext(new p(z, k)), " " == e && 2 == D.left + D.right || J(a, t, e); u = new p(z, k), H = a.getContext(new p(z, k)), " " == e && 2 == H.left + H.right || J(a, u, e);
} }
K(a, b, e); K(a, b, e);
K(a, c, e); K(a, d, e);
J(a, new p(z, d), e); J(a, new p(z, c), e);
} }
function L(a) { function L(a) {
this.state = a; this.state = a;
@ -174,14 +175,14 @@ f.move = function(a) {
f.end = function() { f.end = function() {
N(this.state); N(this.state);
}; };
f.k = function() { f.l = function() {
return "crosshair"; return "crosshair";
}; };
f.g = function() { f.g = function() {
}; };
function O(a, b) { function O(a, b) {
this.state = a; this.state = a;
this.R = b; this.V = b;
this.a = null; this.a = null;
} }
f = O.prototype; f = O.prototype;
@ -190,14 +191,14 @@ f.start = function(a) {
}; };
f.move = function(a) { f.move = function(a) {
M(this.state); M(this.state);
var b = this.state.getContext(this.a), c = this.state.getContext(a); var b = this.state.getContext(this.a), d = this.state.getContext(a);
I(this.state, this.a, a, b.l && b.j || c.left && c.right); I(this.state, this.a, a, b.k && b.i || d.left && d.right);
this.R && K(this.state, a, "^"); this.V && K(this.state, a, "^");
}; };
f.end = function() { f.end = function() {
N(this.state); N(this.state);
}; };
f.k = function() { f.l = function() {
return "crosshair"; return "crosshair";
}; };
f.g = function() { f.g = function() {
@ -221,7 +222,7 @@ f.move = function(a) {
f.end = function() { f.end = function() {
N(this.state); N(this.state);
}; };
f.k = function() { f.l = function() {
return "crosshair"; return "crosshair";
}; };
f.g = function(a) { f.g = function(a) {
@ -237,7 +238,7 @@ f.start = function(a) {
N(this.state); N(this.state);
$("#text-tool-input").val(""); $("#text-tool-input").val("");
this.a = a; this.a = a;
a = C(H(this.state, this.a)); a = B(F(this.state, this.a));
K(this.state, this.a, null == a ? "\u2009" : a); K(this.state, this.a, null == a ? "\u2009" : a);
}; };
f.move = function() { f.move = function() {
@ -249,14 +250,14 @@ f.end = function() {
}); });
})); }));
}; };
f.k = function() { f.l = function() {
return "pointer"; return "pointer";
}; };
f.g = function() { f.g = function() {
var a = $("#text-tool-input").val(); var a = $("#text-tool-input").val();
M(this.state); M(this.state);
for (var b = 0, c = 0, d = 0;d < a.length;d++) { for (var b = 0, d = 0, c = 0;c < a.length;c++) {
"\n" == a[d] ? (c++, b = 0) : (K(this.state, this.b.add(new p(b, c)), a[d]), b++); "\n" == a[c] ? (d++, b = 0) : (K(this.state, this.b.add(new p(b, d)), a[c]), b++);
} }
}; };
function P(a) { function P(a) {
@ -273,8 +274,8 @@ f.move = function(a) {
this.b = a; this.b = a;
var b = Math.min(this.a.x, this.b.x); var b = Math.min(this.a.x, this.b.x);
a = Math.min(this.a.y, this.b.y); a = Math.min(this.a.y, this.b.y);
for (var c = Math.max(this.a.x, this.b.x), d = Math.max(this.a.y, this.b.y);b <= c;b++) { for (var d = Math.max(this.a.x, this.b.x), c = Math.max(this.a.y, this.b.y);b <= d;b++) {
for (var e = a;e <= d;e++) { for (var e = a;e <= c;e++) {
K(this.state, new p(b, e), "\u2009"); K(this.state, new p(b, e), "\u2009");
} }
} }
@ -282,7 +283,7 @@ f.move = function(a) {
f.end = function() { f.end = function() {
N(this.state); N(this.state);
}; };
f.k = function() { f.l = function() {
return "crosshair"; return "crosshair";
}; };
f.g = function() { f.g = function() {
@ -295,35 +296,35 @@ f = ma.prototype;
f.start = function(a) { f.start = function(a) {
var b; var b;
if (n) { if (n) {
if (E(H(this.state, a))) { if (C(F(this.state, a))) {
b = a; b = a;
} else { } else {
b = B.concat([v.add(x), v.add(A), w.add(x), w.add(A)]); b = A.concat([v.add(x), v.add(y), w.add(x), w.add(y)]);
var c = null, d = 0, e; var d = null, c = 0, e;
for (e in b) { for (e in b) {
var g = a.add(b[e]), l = F(this.state.getContext(g)); var g = a.add(b[e]), l = D(this.state.getContext(g));
E(H(this.state, g)) && l > d && (c = b[e], d = l); C(F(this.state, g)) && l > c && (d = b[e], c = l);
} }
b = null == c ? a : a.add(c); b = null == d ? a : a.add(d);
} }
} else { } else {
b = a; b = a;
} }
this.a = b; this.a = b;
this.e = null; this.e = null;
if (E(H(this.state, this.a))) { if (C(F(this.state, this.a))) {
this.state.getContext(this.a); this.state.getContext(this.a);
b = []; b = [];
for (var k in B) { for (var k in A) {
var c = na(this, this.a, B[k]), y; var d = na(this, this.a, A[k]), s;
for (y in c) { for (s in d) {
if (d = c[y], e = 0 != B[k].x, g = -1 != m.indexOf(C(H(this.state, a))), l = -1 != m.indexOf(C(H(this.state, d))), 1 == F(this.state.getContext(d))) { if (c = d[s], e = 0 != A[k].x, g = -1 != m.indexOf(B(F(this.state, a))), l = -1 != m.indexOf(B(F(this.state, c))), 1 == D(this.state.getContext(c))) {
b.push({position:d, o:e, P:g, O:l}); b.push({position:c, o:e, T:g, S:l});
} else { } else {
for (var z in B) { for (var z in A) {
if (0 != B[k].add(B[z]).length() && 2 != B[k].add(B[z]).length()) { if (0 != A[k].add(A[z]).length() && 2 != A[k].add(A[z]).length()) {
var t = na(this, d, B[z]); var u = na(this, c, A[z]);
0 != t.length && (t = t[0], b.push({position:t, o:e, P:g, S:l, O:-1 != m.indexOf(C(H(this.state, t)))})); 0 != u.length && (u = u[0], b.push({position:u, o:e, T:g, W:l, S:-1 != m.indexOf(B(F(this.state, u)))}));
} }
} }
} }
@ -342,24 +343,24 @@ f.move = function(a) {
I(this.state, a, this.e[b].position, this.e[b].o); I(this.state, a, this.e[b].position, this.e[b].o);
} }
for (b in this.e) { for (b in this.e) {
this.e[b].P && K(this.state, a, "^"), this.e[b].O && K(this.state, this.e[b].position, "^"), this.e[b].S && K(this.state, new p(this.e[b].o ? this.e[b].position.x : a.x, this.e[b].o ? a.y : this.e[b].position.y), "^"); this.e[b].T && K(this.state, a, "^"), this.e[b].S && K(this.state, this.e[b].position, "^"), this.e[b].W && K(this.state, new p(this.e[b].o ? this.e[b].position.x : a.x, this.e[b].o ? a.y : this.e[b].position.y), "^");
} }
}; };
f.end = function() { f.end = function() {
N(this.state); N(this.state);
}; };
function na(a, b, c) { function na(a, b, d) {
for (var d = b.clone(), e = [];;) { for (var c = b.clone(), e = [];;) {
var g = d.add(c); var g = c.add(d);
if (!E(H(a.state, g))) { if (!C(F(a.state, g))) {
return q(b, d) || e.push(d), e; return q(b, c) || e.push(c), e;
} }
d = g; c = g;
3 == F(a.state.getContext(d)) && e.push(d); 3 == D(a.state.getContext(c)) && e.push(c);
} }
} }
f.k = function(a) { f.l = function(a) {
return E(H(this.state, a)) ? "pointer" : "default"; return C(F(this.state, a)) ? "pointer" : "default";
}; };
f.g = function() { f.g = function() {
}; };
@ -371,14 +372,14 @@ function oa(a) {
} }
f = oa.prototype; f = oa.prototype;
f.start = function(a) { f.start = function(a) {
null != this.a && null != this.b && (new s(this.a, this.b)).contains(a) ? (this.p = a, pa(this), qa(this, a)) : (this.a = a, this.b = null, this.K = !1, this.move(a)); null != this.a && null != this.b && (new t(this.a, this.b)).contains(a) ? (this.p = a, pa(this), qa(this, a)) : (this.a = a, this.b = null, this.K = !1, this.move(a));
}; };
function pa(a) { function pa(a) {
var b = a.state.i.filter(function(a) { var b = a.state.j.filter(function(a) {
return null != C(a.n) && "\u2009" != C(a.n); return null != B(a.n) && "\u2009" != B(a.n);
}), c = u(new s(a.a, a.b)); }), d = ca(new t(a.a, a.b));
a.v = b.map(function(a) { a.v = b.map(function(a) {
return new ea(r(a.position, c), C(a.n)); return new fa(r(a.position, d), B(a.n));
}); });
} }
f.move = function(a) { f.move = function(a) {
@ -388,11 +389,11 @@ f.move = function(a) {
if (!0 != this.K) { if (!0 != this.K) {
this.b = a; this.b = a;
M(this.state); M(this.state);
a = new s(this.a, a); a = new t(this.a, a);
for (var b = a.w;b <= a.I;b++) { for (var b = a.w;b <= a.I;b++) {
for (var c = a.A;c <= a.J;c++) { for (var d = a.A;d <= a.J;d++) {
var d = new p(b, c), e = C(H(this.state, d)); var c = new p(b, d), e = B(F(this.state, c));
K(this.state, d, null == e ? "\u2009" : e); K(this.state, c, null == e ? "\u2009" : e);
} }
} }
} }
@ -401,15 +402,15 @@ f.move = function(a) {
function qa(a, b) { function qa(a, b) {
a.F = b; a.F = b;
M(a.state); M(a.state);
var c = new P(a.state); var d = new P(a.state);
c.start(a.a); d.start(a.a);
c.move(a.b); d.move(a.b);
c = r(a.F, a.p).add(u(new s(a.a, a.b))); d = r(a.F, a.p).add(ca(new t(a.a, a.b)));
ra(a, c); ra(a, d);
} }
function ra(a, b) { function ra(a, b) {
for (var c in a.v) { for (var d in a.v) {
K(a.state, a.v[c].position.add(b), a.v[c].value); K(a.state, a.v[d].position.add(b), a.v[d].value);
} }
} }
f.end = function() { f.end = function() {
@ -417,8 +418,8 @@ f.end = function() {
this.F = this.p = null; this.F = this.p = null;
this.K = !0; this.K = !0;
}; };
f.k = function(a) { f.l = function(a) {
return null != this.a && null != this.b && (new s(this.a, this.b)).contains(a) ? "pointer" : "default"; return null != this.a && null != this.b && (new t(this.a, this.b)).contains(a) ? "pointer" : "default";
}; };
f.g = function(a) { f.g = function(a) {
if (null != this.a && null != this.b && ("<copy>" != a && "<cut>" != a || pa(this), "<cut>" == a)) { if (null != this.a && null != this.b && ("<copy>" != a && "<cut>" != a || pa(this), "<cut>" == a)) {
@ -429,201 +430,202 @@ f.g = function(a) {
} }
"<paste>" == a && (ra(this, this.a), N(this.state)); "<paste>" == a && (ra(this, this.a), N(this.state));
}; };
function R() { function Q() {
this.cells = Array(2E3); this.cells = Array(2E3);
this.i = []; this.j = [];
this.f = !0; this.f = !0;
this.N = []; this.R = [];
this.M = []; this.O = [];
for (var a = 0;a < this.cells.length;a++) { for (var a = 0;a < this.cells.length;a++) {
this.cells[a] = Array(600); this.cells[a] = Array(600);
for (var b = 0;b < this.cells[a].length;b++) { for (var b = 0;b < this.cells[a].length;b++) {
this.cells[a][b] = new ca; this.cells[a][b] = new da;
} }
} }
} }
R.prototype.clear = function() { Q.prototype.clear = function() {
for (var a = 0;a < this.cells.length;a++) { for (var a = 0;a < this.cells.length;a++) {
for (var b = 0;b < this.cells[a].length;b++) { for (var b = 0;b < this.cells[a].length;b++) {
null != C(this.cells[a][b]) && K(this, new p(a, b), "\u2009"); null != B(this.cells[a][b]) && K(this, new p(a, b), "\u2009");
} }
} }
N(this); N(this);
}; };
function H(a, b) { function F(a, b) {
return a.cells[b.x][b.y]; return a.cells[b.x][b.y];
} }
function K(a, b, c) { function K(a, b, d) {
var d = H(a, b); var c = F(a, b);
a.i.push(new fa(b, d)); a.j.push(new ga(b, c));
d.h = c; c.h = d;
a.f = !0; a.f = !0;
} }
function J(a, b, c) { function J(a, b, d) {
C(H(a, b)) != c && K(a, b, c); B(F(a, b)) != d && K(a, b, d);
} }
function M(a) { function M(a) {
for (var b in a.i) { for (var b in a.j) {
a.i[b].n.h = null; a.j[b].n.h = null;
} }
a.i.length = 0; a.j.length = 0;
} }
function ja(a, b) { function G(a, b) {
var c = H(a, b), c = null != c.h ? c.h : c.value; var d = F(a, b), c = null != d.h ? d.h : d.value, d = -1 != h.indexOf(c), e = -1 != m.indexOf(c);
if ("+" != c && "^" != c) { if (!d && !e) {
return c; return c;
} }
var d = a.getContext(b); c = a.getContext(b);
if (d.left && d.right && !d.l && !d.j) { if (c.left && c.right && !c.k && !c.i) {
return "-"; return "-";
} }
if (!d.left && !d.right && d.l && d.j) { if (!c.left && !c.right && c.k && c.i) {
return "|"; return "|";
} }
if (4 == F(d)) { if (4 == D(c)) {
return "-"; return "-";
} }
if ("+" == c && 3 == F(d)) { if (e && 3 == D(c)) {
return "+"; if (!c.left) {
}
if ("^" == c && 3 == F(d)) {
if (!d.left) {
return "<"; return "<";
} }
if (!d.l) { if (!c.k) {
return "^"; return "^";
} }
if (!d.j) { if (!c.i) {
return "v"; return "v";
} }
if (!d.right) { if (!c.right) {
return ">"; return ">";
} }
} }
if ("^" == c && 1 == F(d)) { if ((d || e) && 3 == D(c)) {
if (d.left) { return c.M = C(F(a, b.add(v).add(x))), c.Q = C(F(a, b.add(w).add(x))), c.L = C(F(a, b.add(v).add(y))), c.P = C(F(a, b.add(w).add(y))), !c.right && c.M && c.L || !c.left && c.Q && c.P ? "|" : !c.i && c.M && c.Q || !c.k && c.P && c.L ? "-" : "+";
}
if (e && 1 == D(c)) {
if (c.left) {
return ">"; return ">";
} }
if (d.l) { if (c.k) {
return "v"; return "v";
} }
if (d.j) { if (c.i) {
return "^"; return "^";
} }
if (d.right) { if (c.right) {
return "<"; return "<";
} }
} }
return c; return "+";
} }
R.prototype.getContext = function(a) { Q.prototype.getContext = function(a) {
var b = E(H(this, a.add(v))), c = E(H(this, a.add(w))), d = E(H(this, a.add(x))); var b = C(F(this, a.add(v))), d = C(F(this, a.add(w))), c = C(F(this, a.add(x)));
a = E(H(this, a.add(A))); a = C(F(this, a.add(y)));
return new da(b, c, d, a); return new ea(b, d, c, a);
}; };
function N(a, b) { function N(a, b) {
var c = [], d = a.i.map(function(a) { var d = [], c = a.j.map(function(a) {
return a.position.x.toString() + a.position.y.toString(); return a.position.x.toString() + a.position.y.toString();
}), e = a.i.filter(function(a, b) { }), e = a.j.filter(function(a, b) {
return d.indexOf(d[b]) == b; return c.indexOf(c[b]) == b;
}); });
a.i.length = 0; a.j.length = 0;
for (var g in e) { for (var g in e) {
var l = e[g].n; var l = e[g].position, k = e[g].n;
c.push(new ea(e[g].position, null != l.value ? l.value : " ")); d.push(new fa(l, null != k.value ? k.value : " "));
var k = C(l); var s = B(k);
if ("\u2009" == k || " " == k) { if ("\u2009" == s || " " == s) {
k = null; s = null;
} }
l.h = null; C(k) && (s = G(a, l));
l.value = k; k.h = null;
k.value = s;
} }
e = b ? a.M : a.N; e = b ? a.O : a.R;
0 < c.length && (50 < e.length && e.shift(), e.push(c)); 0 < d.length && (50 < e.length && e.shift(), e.push(d));
a.f = !0; a.f = !0;
} }
function sa(a) { function sa(a) {
if (0 != a.N.length) { if (0 != a.R.length) {
var b = a.N.pop(), c; var b = a.R.pop(), d;
for (c in b) { for (d in b) {
var d = b[c]; var c = b[d];
K(a, d.position, d.value); K(a, c.position, c.value);
} }
N(a, !0); N(a, !0);
} }
} }
function ta(a) { function ta(a) {
if (0 != a.M.length) { if (0 != a.O.length) {
var b = a.M.pop(), c; var b = a.O.pop(), d;
for (c in b) { for (d in b) {
var d = b[c]; var c = b[d];
K(a, d.position, d.value); K(a, c.position, c.value);
} }
N(a); N(a);
} }
} }
function S(a) { function R(a) {
for (var b = new p(Number.MAX_VALUE, Number.MAX_VALUE), c = new p(-1, -1), d = 0;d < a.cells.length;d++) { for (var b = new p(Number.MAX_VALUE, Number.MAX_VALUE), d = new p(-1, -1), c = 0;c < a.cells.length;c++) {
for (var e = 0;e < a.cells[d].length;e++) { for (var e = 0;e < a.cells[c].length;e++) {
null != C(a.cells[d][e]) && (d < b.x && (b.x = d), e < b.y && (b.y = e), d > c.x && (c.x = d), e > c.y && (c.y = e)); null != B(a.cells[c][e]) && (c < b.x && (b.x = c), e < b.y && (b.y = e), c > d.x && (d.x = c), e > d.y && (d.y = e));
} }
} }
if (0 > c.x) { if (0 > d.x) {
return ""; return "";
} }
for (var g = "", e = b.y;e <= c.y;e++) { for (var g = "", e = b.y;e <= d.y;e++) {
for (var l = "", d = b.x;d <= c.x;d++) { for (var l = "", c = b.x;c <= d.x;c++) {
var k = ja(a, new p(d, e)), l = l + (null == k ? " " : k) var k = G(a, new p(c, e)), l = l + (null == k ? " " : k)
} }
g += l.replace("\\s+$/g", "") + "\n"; g += l.replace("\\s+$/g", "") + "\n";
} }
return g; return g;
} }
function ua(a, b, c) { function ua(a, b, d) {
b = b.split("\n"); b = b.split("\n");
for (var d = new p(0, Math.round(b.length / 2)), e = 0;e < b.length;e++) { for (var c = new p(0, Math.round(b.length / 2)), e = 0;e < b.length;e++) {
d.x = Math.max(d.x, Math.round(b[e].length / 2)); c.x = Math.max(c.x, Math.round(b[e].length / 2));
} }
for (e = 0;e < b.length;e++) { for (e = 0;e < b.length;e++) {
for (var g = b[e], l = 0;l < g.length;l++) { for (var g = b[e], l = 0;l < g.length;l++) {
var k = g.charAt(l); var k = g.charAt(l);
-1 != h.indexOf(k) && (k = "+"); -1 != h.indexOf(k) && (k = "+");
-1 != m.indexOf(k) && (k = "^"); -1 != m.indexOf(k) && (k = "^");
K(a, r((new p(l, e)).add(c), d), k); K(a, r((new p(l, e)).add(d), c), k);
} }
} }
} }
;function T(a, b) { ;function S(a, b) {
this.view = a; this.view = a;
this.state = b; this.state = b;
this.d = new L(b); this.d = new L(b);
this.mode = 0; this.mode = 0;
this.r(); this.r();
} }
T.prototype.u = function(a) { S.prototype.u = function(a) {
var b = G(this.view, a); var b = E(this.view, a);
null == this.s && (this.s = b); null == this.s && (this.s = b);
q(b, this.s) || (this.view.canvas.style.cursor = this.d.k(b)); q(b, this.s) || (this.view.canvas.style.cursor = this.d.l(b));
2 != this.mode || q(b, this.s) || this.d.move(b); 2 != this.mode || q(b, this.s) || this.d.move(b);
if (1 == this.mode) { if (1 == this.mode) {
var c = this.view; var d = this.view;
a = this.H.add(r(this.G, a).scale(1 / this.view.zoom)); a = this.H.add(r(this.G, a).scale(1 / this.view.zoom));
c.offset = a; d.offset = a;
c.f = !0; d.f = !0;
} }
this.s = b; this.s = b;
}; };
function U(a) { function T(a) {
2 == a.mode && a.d.end(); 2 == a.mode && a.d.end();
a.mode = 0; a.mode = 0;
a.G = null; a.G = null;
a.H = null; a.H = null;
a.s = null; a.s = null;
} }
T.prototype.r = function() { S.prototype.r = function() {
var a = this; var a = this;
$(window).resize(function() { $(window).resize(function() {
ha(a.view); ia(a.view);
}); });
$("#draw-tools > button.tool").click(function(a) { $("#draw-tools > button.tool").click(function(a) {
$("#text-tool-widget").hide(0); $("#text-tool-widget").hide(0);
@ -647,7 +649,7 @@ T.prototype.r = function() {
$(".dialog").removeClass("visible"); $(".dialog").removeClass("visible");
$("#" + a + "-dialog").toggleClass("visible"); $("#" + a + "-dialog").toggleClass("visible");
"import-button" == a && ($("#import-area").val(""), $("#import-area").focus()); "import-button" == a && ($("#import-area").val(""), $("#import-area").focus());
"export-button" == a && ($("#export-area").val(S(this.state)), $("#export-area").select()); "export-button" == a && ($("#export-area").val(R(this.state)), $("#export-area").select());
"clear-button" == a && this.state.clear(); "clear-button" == a && this.state.clear();
"undo-button" == a && sa(this.state); "undo-button" == a && sa(this.state);
"redo-button" == a && ta(this.state); "redo-button" == a && ta(this.state);
@ -657,7 +659,7 @@ T.prototype.r = function() {
}.bind(this)); }.bind(this));
$("#import-submit-button").click(function() { $("#import-submit-button").click(function() {
this.state.clear(); this.state.clear();
ua(this.state, $("#import-area").val(), G(this.view, new p(this.view.canvas.width / 2, this.view.canvas.height / 2))); ua(this.state, $("#import-area").val(), E(this.view, new p(this.view.canvas.width / 2, this.view.canvas.height / 2)));
N(this.state); N(this.state);
$("#import-area").val(""); $("#import-area").val("");
$(".dialog").removeClass("visible"); $(".dialog").removeClass("visible");
@ -678,17 +680,17 @@ T.prototype.r = function() {
a.ctrlKey || a.metaKey || 13 == a.keyCode || this.d.g(String.fromCharCode(a.keyCode)); a.ctrlKey || a.metaKey || 13 == a.keyCode || this.d.g(String.fromCharCode(a.keyCode));
}.bind(this)); }.bind(this));
$(window).keydown(function(a) { $(window).keydown(function(a) {
var c = null; var d = null;
if (a.ctrlKey || a.metaKey) { if (a.ctrlKey || a.metaKey) {
67 == a.keyCode && (c = "<copy>"), 86 == a.keyCode && (c = "<paste>"), 90 == a.keyCode && sa(this.state), 89 == a.keyCode && ta(this.state), 88 == a.keyCode && (c = "<cut>"); 67 == a.keyCode && (d = "<copy>"), 86 == a.keyCode && (d = "<paste>"), 90 == a.keyCode && sa(this.state), 89 == a.keyCode && ta(this.state), 88 == a.keyCode && (d = "<cut>");
} }
8 == a.keyCode && (c = "<backspace>"); 8 == a.keyCode && (d = "<backspace>");
13 == a.keyCode && (c = "<enter>"); 13 == a.keyCode && (d = "<enter>");
38 == a.keyCode && (c = "<up>"); 38 == a.keyCode && (d = "<up>");
40 == a.keyCode && (c = "<down>"); 40 == a.keyCode && (d = "<down>");
37 == a.keyCode && (c = "<left>"); 37 == a.keyCode && (d = "<left>");
39 == a.keyCode && (c = "<right>"); 39 == a.keyCode && (d = "<right>");
null != c && this.d.g(c); null != d && this.d.g(d);
}.bind(this)); }.bind(this));
$("#text-tool-input, #freeform-tool-input").keyup(function() { $("#text-tool-input, #freeform-tool-input").keyup(function() {
this.d.g(""); this.d.g("");
@ -752,7 +754,7 @@ function Ca(a, b) {
} }
function xa(a) { function xa(a) {
$("#drive-dialog").addClass("visible"); $("#drive-dialog").addClass("visible");
var b = S(a.state); var b = R(a.state);
5 < b.length && b != a.D && a.save(); 5 < b.length && b != a.D && a.save();
za(a); za(a);
} }
@ -760,15 +762,15 @@ function za(a) {
W(window.gapi.client.request({path:"/drive/v2/files", params:{q:"mimeType = 'text/plain' and trashed = false"}, method:"GET"}), function(a) { W(window.gapi.client.request({path:"/drive/v2/files", params:{q:"mimeType = 'text/plain' and trashed = false"}, method:"GET"}), function(a) {
$("#drive-file-list").children().remove(); $("#drive-file-list").children().remove();
a = a.items; a = a.items;
for (var c in a) { for (var d in a) {
var d = document.createElement("li"), e = document.createElement("a"); var c = document.createElement("li"), e = document.createElement("a");
d.appendChild(e); c.appendChild(e);
e.href = "#" + a[c].id; e.href = "#" + a[d].id;
$(e).click(function() { $(e).click(function() {
$("#drive-dialog").removeClass("visible"); $("#drive-dialog").removeClass("visible");
}); });
e.innerHTML = a[c].title; e.innerHTML = a[d].title;
$("#drive-file-list").append(d); $("#drive-file-list").append(c);
} }
}.bind(a)); }.bind(a));
} }
@ -777,17 +779,17 @@ function W(a, b) {
a.execute(function(a) { a.execute(function(a) {
a.error || b(a); a.error || b(a);
}); });
} catch (c) { } catch (d) {
} }
} }
function Aa(a) { function Aa(a) {
S(a.state) != a.D && a.file && a.file.editable && a.save(); R(a.state) != a.D && a.file && a.file.editable && a.save();
window.setTimeout(function() { window.setTimeout(function() {
Aa(this); Aa(this);
}.bind(a), 5E3); }.bind(a), 5E3);
} }
va.prototype.save = function() { va.prototype.save = function() {
var a = S(this.state); var a = R(this.state);
$("#drive-save-state").text("Saving..."); $("#drive-save-state").text("Saving...");
W(Da(this, a), function(b) { W(Da(this, a), function(b) {
Ca(this, b); Ca(this, b);
@ -805,25 +807,25 @@ function Ea(a) {
Fa(a.file.downloadUrl, function(a) { Fa(a.file.downloadUrl, function(a) {
$("#drive-save-state").text("Loaded"); $("#drive-save-state").text("Loaded");
this.state.clear(); this.state.clear();
ua(this.state, a, G(this.view, new p(this.view.canvas.width / 2, this.view.canvas.height / 2))); ua(this.state, a, E(this.view, new p(this.view.canvas.width / 2, this.view.canvas.height / 2)));
this.D = S(this.state); this.D = R(this.state);
}.bind(a)); }.bind(a));
} }
function Da(a, b) { function Da(a, b) {
var c = "\r\n---------314159265358979323846\r\nContent-Type: application/json\r\n\r\n" + JSON.stringify({title:null == a.file ? "Untitled ASCII Diagram" : a.file.title, mimeType:"text/plain"}) + "\r\n---------314159265358979323846\r\nContent-Type: text/plain\r\n\r\n" + b + "\r\n---------314159265358979323846--"; var d = "\r\n---------314159265358979323846\r\nContent-Type: application/json\r\n\r\n" + JSON.stringify({title:null == a.file ? "Untitled ASCII Diagram" : a.file.title, mimeType:"text/plain"}) + "\r\n---------314159265358979323846\r\nContent-Type: text/plain\r\n\r\n" + b + "\r\n---------314159265358979323846--";
return window.gapi.client.request({path:"/upload/drive/v2/files" + (null == a.file ? "" : "/" + a.file.id), method:null == a.file ? "POST" : "PUT", params:{uploadType:"multipart"}, headers:{"Content-Type":'multipart/mixed; boundary="-------314159265358979323846"'}, body:c}); return window.gapi.client.request({path:"/upload/drive/v2/files" + (null == a.file ? "" : "/" + a.file.id), method:null == a.file ? "POST" : "PUT", params:{uploadType:"multipart"}, headers:{"Content-Type":'multipart/mixed; boundary="-------314159265358979323846"'}, body:d});
} }
function Fa(a, b) { function Fa(a, b) {
var c = window.gapi.auth.getToken().access_token, d = new XMLHttpRequest; var d = window.gapi.auth.getToken().access_token, c = new XMLHttpRequest;
d.open("GET", a); c.open("GET", a);
d.setRequestHeader("Authorization", "Bearer " + c); c.setRequestHeader("Authorization", "Bearer " + d);
d.onload = function() { c.onload = function() {
b(d.responseText); b(c.responseText);
}; };
d.onerror = function() { c.onerror = function() {
b(null); b(null);
}; };
d.send(); c.send();
} }
;function Ga(a) { ;function Ga(a) {
this.c = a; this.c = a;
@ -834,26 +836,26 @@ Ga.prototype.r = function() {
$(a).bind("mousewheel", function(a) { $(a).bind("mousewheel", function(a) {
a = this.c.view.zoom * (0 < a.originalEvent.wheelDelta ? 1.1 : 0.9); a = this.c.view.zoom * (0 < a.originalEvent.wheelDelta ? 1.1 : 0.9);
a = Math.max(Math.min(a, 5), 0.2); a = Math.max(Math.min(a, 5), 0.2);
var c = this.c.view; var d = this.c.view;
c.zoom = a; d.zoom = a;
c.f = !0; d.f = !0;
}.bind(this)); }.bind(this));
$(a).mousedown(function(a) { $(a).mousedown(function(a) {
if (a.ctrlKey || a.metaKey) { if (a.ctrlKey || a.metaKey) {
var c = this.c; var d = this.c;
a = new p(a.clientX, a.clientY); a = new p(a.clientX, a.clientY);
c.mode = 1; d.mode = 1;
c.G = a; d.G = a;
c.H = c.view.offset; d.H = d.view.offset;
} else { } else {
c = this.c, a = new p(a.clientX, a.clientY), c.mode = 2, c.d.start(G(c.view, a)); d = this.c, a = new p(a.clientX, a.clientY), d.mode = 2, d.d.start(E(d.view, a));
} }
}.bind(this)); }.bind(this));
$(a).mouseup(function() { $(a).mouseup(function() {
U(this.c); T(this.c);
}.bind(this)); }.bind(this));
$(a).mouseleave(function() { $(a).mouseleave(function() {
U(this.c); T(this.c);
}.bind(this)); }.bind(this));
$(a).mousemove(function(a) { $(a).mousemove(function(a) {
this.c.u(new p(a.clientX, a.clientY)); this.c.u(new p(a.clientX, a.clientY));
@ -865,19 +867,19 @@ function X(a) {
this.r(); this.r();
} }
function Ha(a, b) { function Ha(a, b) {
a.L = b; a.N = b;
a.U = $.now(); a.Y = $.now();
a.m = !1; a.m = !1;
window.setTimeout(function() { window.setTimeout(function() {
if (!this.m && !this.C && null != this.L) { if (!this.m && !this.C && null != this.N) {
var a = this.c; var a = this.c;
a.mode = 2; a.mode = 2;
a.d.start(G(a.view, b)); a.d.start(E(a.view, b));
} }
}.bind(a), 150); }.bind(a), 150);
} }
X.prototype.u = function(a) { X.prototype.u = function(a) {
if (!this.m && 150 > $.now() - this.U && 6 < r(a, this.L).length()) { if (!this.m && 150 > $.now() - this.Y && 6 < r(a, this.N).length()) {
this.m = !0; this.m = !0;
var b = this.c; var b = this.c;
b.mode = 1; b.mode = 1;
@ -888,7 +890,7 @@ X.prototype.u = function(a) {
}; };
X.prototype.reset = function() { X.prototype.reset = function() {
this.C = this.m = !1; this.C = this.m = !1;
this.L = null; this.N = null;
}; };
X.prototype.r = function() { X.prototype.r = function() {
var a = this.c.view.canvas; var a = this.c.view.canvas;
@ -898,13 +900,13 @@ X.prototype.r = function() {
Ha(this, new p(a.originalEvent.touches[0].pageX, a.originalEvent.touches[0].pageY)); Ha(this, new p(a.originalEvent.touches[0].pageX, a.originalEvent.touches[0].pageY));
} else { } else {
if (1 < a.originalEvent.touches.length) { if (1 < a.originalEvent.touches.length) {
var c = new p(a.originalEvent.touches[0].pageX, a.originalEvent.touches[0].pageY); var d = new p(a.originalEvent.touches[0].pageX, a.originalEvent.touches[0].pageY);
a = new p(a.originalEvent.touches[1].pageX, a.originalEvent.touches[1].pageY); a = new p(a.originalEvent.touches[1].pageX, a.originalEvent.touches[1].pageY);
U(this.c); T(this.c);
this.C = !0; this.C = !0;
this.m = !1; this.m = !1;
this.V = r(c, a).length(); this.Z = r(d, a).length();
this.T = this.c.view.zoom; this.X = this.c.view.zoom;
} }
} }
}.bind(this)); }.bind(this));
@ -914,19 +916,19 @@ X.prototype.r = function() {
this.u(new p(a.originalEvent.touches[0].pageX, a.originalEvent.touches[0].pageY)); this.u(new p(a.originalEvent.touches[0].pageX, a.originalEvent.touches[0].pageY));
} else { } else {
if (1 < a.originalEvent.touches.length) { if (1 < a.originalEvent.touches.length) {
var c = new p(a.originalEvent.touches[0].pageX, a.originalEvent.touches[0].pageY); var d = new p(a.originalEvent.touches[0].pageX, a.originalEvent.touches[0].pageY);
a = new p(a.originalEvent.touches[1].pageX, a.originalEvent.touches[1].pageY); a = new p(a.originalEvent.touches[1].pageX, a.originalEvent.touches[1].pageY);
this.C && (c = this.T * r(c, a).length() / this.V, c = Math.max(Math.min(c, 5), 0.5), a = this.c.view, a.zoom = c, a.f = !0); this.C && (d = this.X * r(d, a).length() / this.Z, d = Math.max(Math.min(d, 5), 0.5), a = this.c.view, a.zoom = d, a.f = !0);
} }
} }
}.bind(this)); }.bind(this));
$(a).bind("touchend", function(a) { $(a).bind("touchend", function(a) {
a.preventDefault(); a.preventDefault();
this.reset(); this.reset();
U(this.c); T(this.c);
}.bind(this)); }.bind(this));
}; };
var Y = new R, Z = new ga(Y), Ia = new T(Z, Y); var Y = new Q, Z = new ha(Y), Ia = new S(Z, Y);
new X(Ia); new X(Ia);
new Ga(Ia); new Ga(Ia);
new va(Y, Z); new va(Y, Z);

14
js-lib/common.js
View File

@ -20,7 +20,7 @@ try {
/** @const */ var SPECIAL_ARROW_UP = '^'; /** @const */ var SPECIAL_ARROW_UP = '^';
/** @const */ var SPECIAL_ARROW_RIGHT = '>'; /** @const */ var SPECIAL_ARROW_RIGHT = '>';
/** @const */ var SPECIAL_ARROW_DOWN = 'v'; /** @const */ var SPECIAL_ARROW_DOWN = 'v';
/** @const */ var SPECIAL_VALUES = ['+', '\u2012', '\u2013', '-']; /** @const */ var SPECIAL_VALUES = ['+', '\u2012', '\u2013', '-', '|'];
/** @const */ var ALT_SPECIAL_VALUES = ['>', '<', '^', 'v']; /** @const */ var ALT_SPECIAL_VALUES = ['>', '<', '^', 'v'];
/** @const */ var ALL_SPECIAL_VALUES = SPECIAL_VALUES.concat(ALT_SPECIAL_VALUES); /** @const */ var ALL_SPECIAL_VALUES = SPECIAL_VALUES.concat(ALT_SPECIAL_VALUES);
@ -190,6 +190,10 @@ ascii.CellContext = function(left, right, up, down) {
/** @type {boolean} */ this.right = right; /** @type {boolean} */ this.right = right;
/** @type {boolean} */ this.up = up; /** @type {boolean} */ this.up = up;
/** @type {boolean} */ this.down = down; /** @type {boolean} */ this.down = down;
/** @type {boolean} */ this.leftup = false;
/** @type {boolean} */ this.rightup = false;
/** @type {boolean} */ this.leftdown = false;
/** @type {boolean} */ this.rightdown = false;
}; };
/** /**
@ -200,6 +204,14 @@ ascii.CellContext.prototype.sum = function() {
return this.left + this.right + this.up + this.down; return this.left + this.right + this.up + this.down;
}; };
/**
* Returns the total number of surrounding special cells.
* @return {number}
*/
ascii.CellContext.prototype.extendedSum = function() {
return this.left + this.right + this.up + this.down + this.leftup + this.leftdown + this.rightup + this.rightdown;
};
/** /**
* A pair of a vector and a string value. Used in history management. * A pair of a vector and a string value. Used in history management.
* @constructor * @constructor

45
js-lib/state.js
View File

@ -95,7 +95,9 @@ ascii.State.prototype.clearDraw = function() {
ascii.State.prototype.getDrawValue = function(position) { ascii.State.prototype.getDrawValue = function(position) {
var cell = this.getCell(position); var cell = this.getCell(position);
var value = cell.scratchValue != null ? cell.scratchValue : cell.value; var value = cell.scratchValue != null ? cell.scratchValue : cell.value;
if (value != SPECIAL_VALUE && value != ALT_SPECIAL_VALUE) { var isSpecial = SPECIAL_VALUES.indexOf(value) != -1;
var isAltSpecial = ALT_SPECIAL_VALUES.indexOf(value) != -1;
if (!isSpecial && !isAltSpecial) {
return value; return value;
} }
@ -111,10 +113,7 @@ ascii.State.prototype.getDrawValue = function(position) {
if (context.sum() == 4) { if (context.sum() == 4) {
return SPECIAL_LINE_H; return SPECIAL_LINE_H;
} }
if (value == SPECIAL_VALUE && context.sum() == 3) { if (isAltSpecial && context.sum() == 3) {
return SPECIAL_VALUE;
}
if (value == ALT_SPECIAL_VALUE && context.sum() == 3) {
if (!context.left) { if (!context.left) {
return SPECIAL_ARROW_LEFT; return SPECIAL_ARROW_LEFT;
} }
@ -128,7 +127,24 @@ ascii.State.prototype.getDrawValue = function(position) {
return SPECIAL_ARROW_RIGHT; return SPECIAL_ARROW_RIGHT;
} }
} }
if (value == ALT_SPECIAL_VALUE && context.sum() == 1) { if ((isSpecial || isAltSpecial) && context.sum() == 3) {
this.extendContext(position, context);
if (!context.right && context.leftup && context.leftdown) {
return SPECIAL_LINE_V;
}
if (!context.left && context.rightup && context.rightdown) {
return SPECIAL_LINE_V;
}
if (!context.down && context.leftup && context.rightup) {
return SPECIAL_LINE_H;
}
if (!context.up && context.rightdown && context.leftdown) {
return SPECIAL_LINE_H;
}
return SPECIAL_VALUE;
}
if (isAltSpecial && context.sum() == 1) {
if (context.left) { if (context.left) {
return SPECIAL_ARROW_RIGHT; return SPECIAL_ARROW_RIGHT;
} }
@ -142,7 +158,7 @@ ascii.State.prototype.getDrawValue = function(position) {
return SPECIAL_ARROW_LEFT; return SPECIAL_ARROW_LEFT;
} }
} }
return value; return SPECIAL_VALUE;
}; };
/** /**
@ -157,6 +173,17 @@ ascii.State.prototype.getContext = function(position) {
return new ascii.CellContext(left, right, up, down); return new ascii.CellContext(left, right, up, down);
}; };
/**
* @param {ascii.Vector} position
* @param {ascii.CellContext} context
*/
ascii.State.prototype.extendContext = function(position, context) {
context.leftup = this.getCell(position.add(DIR_LEFT).add(DIR_UP)).isSpecial();
context.rightup = this.getCell(position.add(DIR_RIGHT).add(DIR_UP)).isSpecial();
context.leftdown = this.getCell(position.add(DIR_LEFT).add(DIR_DOWN)).isSpecial();
context.rightdown = this.getCell(position.add(DIR_RIGHT).add(DIR_DOWN)).isSpecial();
};
/** /**
* Ends the current draw, commiting anything currently drawn the scratchpad. * Ends the current draw, commiting anything currently drawn the scratchpad.
* @param {boolean=} opt_undo * @param {boolean=} opt_undo
@ -187,6 +214,10 @@ ascii.State.prototype.commitDraw = function(opt_undo) {
if (newValue == ERASE_CHAR || newValue == ' ') { if (newValue == ERASE_CHAR || newValue == ' ') {
newValue = null; newValue = null;
} }
// Let's store the actual drawed value, so behaviour matches what the user sees.
if (cell.isSpecial()) {
newValue = this.getDrawValue(position);
}
cell.scratchValue = null; cell.scratchValue = null;
cell.value = newValue; cell.value = newValue;
} }