remove old oekaki; see vichan-devel#20

6 files changed, 0 insertions, 1273 deletions

diff --git a/js/jscolor/arrow.gif b/js/jscolor/arrow.gif
deleted file mode 100644
index 246478a8..00000000
--- a/js/jscolor/arrow.gif
+++ /dev/null
diff --git a/js/jscolor/cross.gif b/js/jscolor/cross.gif
deleted file mode 100644
index 0ee9c7ac..00000000
--- a/js/jscolor/cross.gif
+++ /dev/null
diff --git a/js/jscolor/hs.png b/js/jscolor/hs.png
deleted file mode 100644
index 3d94486c..00000000
--- a/js/jscolor/hs.png
+++ /dev/null
diff --git a/js/jscolor/hv.png b/js/jscolor/hv.png
deleted file mode 100644
index 1c5e01f8..00000000
--- a/js/jscolor/hv.png
+++ /dev/null
diff --git a/js/jscolor/jscolor.js b/js/jscolor/jscolor.js
deleted file mode 100644
index 712ab9a3..00000000
--- a/js/jscolor/jscolor.js
+++ /dev/null
@@ -1,995 +0,0 @@
-/**

- * jscolor, JavaScript Color Picker

- *

- * @version 1.4.1

- * @license GNU Lesser General Public License, http://www.gnu.org/copyleft/lesser.html

- * @author  Jan Odvarko, http://odvarko.cz

- * @created 2008-06-15

- * @updated 2013-04-08

- * @link    http://jscolor.com

- */

-

-

-var jscolor = {

-

-

-	dir : '', // location of jscolor directory (leave empty to autodetect)

-	bindClass : 'color', // class name

-	binding : true, // automatic binding via <input class="...">

-	preloading : true, // use image preloading?

-

-

-	install : function() {

-		jscolor.addEvent(window, 'load', jscolor.init);

-	},

-

-

-	init : function() {

-		if(jscolor.binding) {

-			jscolor.bind();

-		}

-		if(jscolor.preloading) {

-			jscolor.preload();

-		}

-	},

-

-

-	getDir : function() {

-		if(!jscolor.dir) {

-			var detected = jscolor.detectDir();

-			jscolor.dir = detected!==false ? detected : 'jscolor/';

-		}

-		return jscolor.dir;

-	},

-

-

-	detectDir : function() {

-		var base = location.href;

-

-		var e = document.getElementsByTagName('base');

-		for(var i=0; i<e.length; i+=1) {

-			if(e[i].href) { base = e[i].href; }

-		}

-

-		var e = document.getElementsByTagName('script');

-		for(var i=0; i<e.length; i+=1) {

-			if(e[i].src && /(^|\/)jscolor\.js([?#].*)?$/i.test(e[i].src)) {

-				var src = new jscolor.URI(e[i].src);

-				var srcAbs = src.toAbsolute(base);

-				srcAbs.path = srcAbs.path.replace(/[^\/]+$/, ''); // remove filename

-				srcAbs.query = null;

-				srcAbs.fragment = null;

-				return srcAbs.toString();

-			}

-		}

-		return false;

-	},

-

-

-	bind : function() {

-		var matchClass = new RegExp('(^|\\s)('+jscolor.bindClass+')\\s*(\\{[^}]*\\})?', 'i');

-		var e = document.getElementsByTagName('input');

-		for(var i=0; i<e.length; i+=1) {

-			var m;

-			if(!e[i].color && e[i].className && (m = e[i].className.match(matchClass))) {

-				var prop = {};

-				if(m[3]) {

-					try {

-						prop = (new Function ('return (' + m[3] + ')'))();

-					} catch(eInvalidProp) {}

-				}

-				e[i].color = new jscolor.color(e[i], prop);

-			}

-		}

-	},

-

-

-	preload : function() {

-		for(var fn in jscolor.imgRequire) {

-			if(jscolor.imgRequire.hasOwnProperty(fn)) {

-				jscolor.loadImage(fn);

-			}

-		}

-	},

-

-

-	images : {

-		pad : [ 181, 101 ],

-		sld : [ 16, 101 ],

-		cross : [ 15, 15 ],

-		arrow : [ 7, 11 ]

-	},

-

-

-	imgRequire : {},

-	imgLoaded : {},

-

-

-	requireImage : function(filename) {

-		jscolor.imgRequire[filename] = true;

-	},

-

-

-	loadImage : function(filename) {

-		if(!jscolor.imgLoaded[filename]) {

-			jscolor.imgLoaded[filename] = new Image();

-			jscolor.imgLoaded[filename].src = jscolor.getDir()+filename;

-		}

-	},

-

-

-	fetchElement : function(mixed) {

-		return typeof mixed === 'string' ? document.getElementById(mixed) : mixed;

-	},

-

-

-	addEvent : function(el, evnt, func) {

-		if(el.addEventListener) {

-			el.addEventListener(evnt, func, false);

-		} else if(el.attachEvent) {

-			el.attachEvent('on'+evnt, func);

-		}

-	},

-

-

-	fireEvent : function(el, evnt) {

-		if(!el) {

-			return;

-		}

-		if(document.createEvent) {

-			var ev = document.createEvent('HTMLEvents');

-			ev.initEvent(evnt, true, true);

-			el.dispatchEvent(ev);

-		} else if(document.createEventObject) {

-			var ev = document.createEventObject();

-			el.fireEvent('on'+evnt, ev);

-		} else if(el['on'+evnt]) { // alternatively use the traditional event model (IE5)

-			el['on'+evnt]();

-		}

-	},

-

-

-	getElementPos : function(e) {

-		var e1=e, e2=e;

-		var x=0, y=0;

-		if(e1.offsetParent) {

-			do {

-				x += e1.offsetLeft;

-				y += e1.offsetTop;

-			} while(e1 = e1.offsetParent);

-		}

-		while((e2 = e2.parentNode) && e2.nodeName.toUpperCase() !== 'BODY') {

-			x -= e2.scrollLeft;

-			y -= e2.scrollTop;

-		}

-		return [x, y];

-	},

-

-

-	getElementSize : function(e) {

-		return [e.offsetWidth, e.offsetHeight];

-	},

-

-

-	getRelMousePos : function(e) {

-		var x = 0, y = 0;

-		if (!e) { e = window.event; }

-		if (typeof e.offsetX === 'number') {

-			x = e.offsetX;

-			y = e.offsetY;

-		} else if (typeof e.layerX === 'number') {

-			x = e.layerX;

-			y = e.layerY;

-		}

-		return { x: x, y: y };

-	},

-

-

-	getViewPos : function() {

-		if(typeof window.pageYOffset === 'number') {

-			return [window.pageXOffset, window.pageYOffset];

-		} else if(document.body && (document.body.scrollLeft || document.body.scrollTop)) {

-			return [document.body.scrollLeft, document.body.scrollTop];

-		} else if(document.documentElement && (document.documentElement.scrollLeft || document.documentElement.scrollTop)) {

-			return [document.documentElement.scrollLeft, document.documentElement.scrollTop];

-		} else {

-			return [0, 0];

-		}

-	},

-

-

-	getViewSize : function() {

-		if(typeof window.innerWidth === 'number') {

-			return [window.innerWidth, window.innerHeight];

-		} else if(document.body && (document.body.clientWidth || document.body.clientHeight)) {

-			return [document.body.clientWidth, document.body.clientHeight];

-		} else if(document.documentElement && (document.documentElement.clientWidth || document.documentElement.clientHeight)) {

-			return [document.documentElement.clientWidth, document.documentElement.clientHeight];

-		} else {

-			return [0, 0];

-		}

-	},

-

-

-	URI : function(uri) { // See RFC3986

-

-		this.scheme = null;

-		this.authority = null;

-		this.path = '';

-		this.query = null;

-		this.fragment = null;

-

-		this.parse = function(uri) {

-			var m = uri.match(/^(([A-Za-z][0-9A-Za-z+.-]*)(:))?((\/\/)([^\/?#]*))?([^?#]*)((\?)([^#]*))?((#)(.*))?/);

-			this.scheme = m[3] ? m[2] : null;

-			this.authority = m[5] ? m[6] : null;

-			this.path = m[7];

-			this.query = m[9] ? m[10] : null;

-			this.fragment = m[12] ? m[13] : null;

-			return this;

-		};

-

-		this.toString = function() {

-			var result = '';

-			if(this.scheme !== null) { result = result + this.scheme + ':'; }

-			if(this.authority !== null) { result = result + '//' + this.authority; }

-			if(this.path !== null) { result = result + this.path; }

-			if(this.query !== null) { result = result + '?' + this.query; }

-			if(this.fragment !== null) { result = result + '#' + this.fragment; }

-			return result;

-		};

-

-		this.toAbsolute = function(base) {

-			var base = new jscolor.URI(base);

-			var r = this;

-			var t = new jscolor.URI;

-

-			if(base.scheme === null) { return false; }

-

-			if(r.scheme !== null && r.scheme.toLowerCase() === base.scheme.toLowerCase()) {

-				r.scheme = null;

-			}

-

-			if(r.scheme !== null) {

-				t.scheme = r.scheme;

-				t.authority = r.authority;

-				t.path = removeDotSegments(r.path);

-				t.query = r.query;

-			} else {

-				if(r.authority !== null) {

-					t.authority = r.authority;

-					t.path = removeDotSegments(r.path);

-					t.query = r.query;

-				} else {

-					if(r.path === '') {

-						t.path = base.path;

-						if(r.query !== null) {

-							t.query = r.query;

-						} else {

-							t.query = base.query;

-						}

-					} else {

-						if(r.path.substr(0,1) === '/') {

-							t.path = removeDotSegments(r.path);

-						} else {

-							if(base.authority !== null && base.path === '') {

-								t.path = '/'+r.path;

-							} else {

-								t.path = base.path.replace(/[^\/]+$/,'')+r.path;

-							}

-							t.path = removeDotSegments(t.path);

-						}

-						t.query = r.query;

-					}

-					t.authority = base.authority;

-				}

-				t.scheme = base.scheme;

-			}

-			t.fragment = r.fragment;

-

-			return t;

-		};

-

-		function removeDotSegments(path) {

-			var out = '';

-			while(path) {

-				if(path.substr(0,3)==='../' || path.substr(0,2)==='./') {

-					path = path.replace(/^\.+/,'').substr(1);

-				} else if(path.substr(0,3)==='/./' || path==='/.') {

-					path = '/'+path.substr(3);

-				} else if(path.substr(0,4)==='/../' || path==='/..') {

-					path = '/'+path.substr(4);

-					out = out.replace(/\/?[^\/]*$/, '');

-				} else if(path==='.' || path==='..') {

-					path = '';

-				} else {

-					var rm = path.match(/^\/?[^\/]*/)[0];

-					path = path.substr(rm.length);

-					out = out + rm;

-				}

-			}

-			return out;

-		}

-

-		if(uri) {

-			this.parse(uri);

-		}

-

-	},

-

-

-	//

-	// Usage example:

-	// var myColor = new jscolor.color(myInputElement)

-	//

-

-	color : function(target, prop) {

-

-

-		this.required = true; // refuse empty values?

-		this.adjust = true; // adjust value to uniform notation?

-		this.hash = false; // prefix color with # symbol?

-		this.caps = true; // uppercase?

-		this.slider = true; // show the value/saturation slider?

-		this.valueElement = target; // value holder

-		this.styleElement = target; // where to reflect current color

-		this.onImmediateChange = null; // onchange callback (can be either string or function)

-		this.hsv = [0, 0, 1]; // read-only  0-6, 0-1, 0-1

-		this.rgb = [1, 1, 1]; // read-only  0-1, 0-1, 0-1

-		this.minH = 0; // read-only  0-6

-		this.maxH = 6; // read-only  0-6

-		this.minS = 0; // read-only  0-1

-		this.maxS = 1; // read-only  0-1

-		this.minV = 0; // read-only  0-1

-		this.maxV = 1; // read-only  0-1

-

-		this.pickerOnfocus = true; // display picker on focus?

-		this.pickerMode = 'HSV'; // HSV | HVS

-		this.pickerPosition = 'bottom'; // left | right | top | bottom

-		this.pickerSmartPosition = true; // automatically adjust picker position when necessary

-		this.pickerButtonHeight = 20; // px

-		this.pickerClosable = false;

-		this.pickerCloseText = 'Close';

-		this.pickerButtonColor = 'ButtonText'; // px

-		this.pickerFace = 10; // px

-		this.pickerFaceColor = 'ThreeDFace'; // CSS color

-		this.pickerBorder = 1; // px

-		this.pickerBorderColor = 'ThreeDHighlight ThreeDShadow ThreeDShadow ThreeDHighlight'; // CSS color

-		this.pickerInset = 1; // px

-		this.pickerInsetColor = 'ThreeDShadow ThreeDHighlight ThreeDHighlight ThreeDShadow'; // CSS color

-		this.pickerZIndex = 10000;

-

-

-		for(var p in prop) {

-			if(prop.hasOwnProperty(p)) {

-				this[p] = prop[p];

-			}

-		}

-

-

-		this.hidePicker = function() {

-			if(isPickerOwner()) {

-				removePicker();

-			}

-		};

-

-

-		this.showPicker = function() {

-			if(!isPickerOwner()) {

-				var tp = jscolor.getElementPos(target); // target pos

-				var ts = jscolor.getElementSize(target); // target size

-				var vp = jscolor.getViewPos(); // view pos

-				var vs = jscolor.getViewSize(); // view size

-				var ps = getPickerDims(this); // picker size

-				var a, b, c;

-				switch(this.pickerPosition.toLowerCase()) {

-					case 'left': a=1; b=0; c=-1; break;

-					case 'right':a=1; b=0; c=1; break;

-					case 'top':  a=0; b=1; c=-1; break;

-					default:     a=0; b=1; c=1; break;

-				}

-				var l = (ts[b]+ps[b])/2;

-

-				// picker pos

-				if (!this.pickerSmartPosition) {

-					var pp = [

-						tp[a],

-						tp[b]+ts[b]-l+l*c

-					];

-				} else {

-					var pp = [

-						-vp[a]+tp[a]+ps[a] > vs[a] ?

-							(-vp[a]+tp[a]+ts[a]/2 > vs[a]/2 && tp[a]+ts[a]-ps[a] >= 0 ? tp[a]+ts[a]-ps[a] : tp[a]) :

-							tp[a],

-						-vp[b]+tp[b]+ts[b]+ps[b]-l+l*c > vs[b] ?

-							(-vp[b]+tp[b]+ts[b]/2 > vs[b]/2 && tp[b]+ts[b]-l-l*c >= 0 ? tp[b]+ts[b]-l-l*c : tp[b]+ts[b]-l+l*c) :

-							(tp[b]+ts[b]-l+l*c >= 0 ? tp[b]+ts[b]-l+l*c : tp[b]+ts[b]-l-l*c)

-					];

-				}

-				drawPicker(pp[a], pp[b]);

-			}

-		};

-

-

-		this.importColor = function() {

-			if(!valueElement) {

-				this.exportColor();

-			} else {

-				if(!this.adjust) {

-					if(!this.fromString(valueElement.value, leaveValue)) {

-						styleElement.style.backgroundImage = styleElement.jscStyle.backgroundImage;

-						styleElement.style.backgroundColor = styleElement.jscStyle.backgroundColor;

-						styleElement.style.color = styleElement.jscStyle.color;

-						this.exportColor(leaveValue | leaveStyle);

-					}

-				} else if(!this.required && /^\s*$/.test(valueElement.value)) {

-					valueElement.value = '';

-					styleElement.style.backgroundImage = styleElement.jscStyle.backgroundImage;

-					styleElement.style.backgroundColor = styleElement.jscStyle.backgroundColor;

-					styleElement.style.color = styleElement.jscStyle.color;

-					this.exportColor(leaveValue | leaveStyle);

-

-				} else if(this.fromString(valueElement.value)) {

-					// OK

-				} else {

-					this.exportColor();

-				}

-			}

-		};

-

-

-		this.exportColor = function(flags) {

-			if(!(flags & leaveValue) && valueElement) {

-				var value = this.toString();

-				if(this.caps) { value = value.toUpperCase(); }

-				if(this.hash) { value = '#'+value; }

-				valueElement.value = value;

-			}

-			if(!(flags & leaveStyle) && styleElement) {

-				styleElement.style.backgroundImage = "none";

-				styleElement.style.backgroundColor =

-					'#'+this.toString();

-				styleElement.style.color =

-					0.213 * this.rgb[0] +

-					0.715 * this.rgb[1] +

-					0.072 * this.rgb[2]

-					< 0.5 ? '#FFF' : '#000';

-			}

-			if(!(flags & leavePad) && isPickerOwner()) {

-				redrawPad();

-			}

-			if(!(flags & leaveSld) && isPickerOwner()) {

-				redrawSld();

-			}

-		};

-

-

-		this.fromHSV = function(h, s, v, flags) { // null = don't change

-			if(h !== null) { h = Math.max(0.0, this.minH, Math.min(6.0, this.maxH, h)); }

-			if(s !== null) { s = Math.max(0.0, this.minS, Math.min(1.0, this.maxS, s)); }

-			if(v !== null) { v = Math.max(0.0, this.minV, Math.min(1.0, this.maxV, v)); }

-

-			this.rgb = HSV_RGB(

-				h===null ? this.hsv[0] : (this.hsv[0]=h),

-				s===null ? this.hsv[1] : (this.hsv[1]=s),

-				v===null ? this.hsv[2] : (this.hsv[2]=v)

-			);

-

-			this.exportColor(flags);

-		};

-

-

-		this.fromRGB = function(r, g, b, flags) { // null = don't change

-			if(r !== null) { r = Math.max(0.0, Math.min(1.0, r)); }

-			if(g !== null) { g = Math.max(0.0, Math.min(1.0, g)); }

-			if(b !== null) { b = Math.max(0.0, Math.min(1.0, b)); }

-

-			var hsv = RGB_HSV(

-				r===null ? this.rgb[0] : r,

-				g===null ? this.rgb[1] : g,

-				b===null ? this.rgb[2] : b

-			);

-			if(hsv[0] !== null) {

-				this.hsv[0] = Math.max(0.0, this.minH, Math.min(6.0, this.maxH, hsv[0]));

-			}

-			if(hsv[2] !== 0) {

-				this.hsv[1] = hsv[1]===null ? null : Math.max(0.0, this.minS, Math.min(1.0, this.maxS, hsv[1]));

-			}

-			this.hsv[2] = hsv[2]===null ? null : Math.max(0.0, this.minV, Math.min(1.0, this.maxV, hsv[2]));

-

-			// update RGB according to final HSV, as some values might be trimmed

-			var rgb = HSV_RGB(this.hsv[0], this.hsv[1], this.hsv[2]);

-			this.rgb[0] = rgb[0];

-			this.rgb[1] = rgb[1];

-			this.rgb[2] = rgb[2];

-

-			this.exportColor(flags);

-		};

-

-

-		this.fromString = function(hex, flags) {

-			var m = hex.match(/^\W*([0-9A-F]{3}([0-9A-F]{3})?)\W*$/i);

-			if(!m) {

-				return false;

-			} else {

-				if(m[1].length === 6) { // 6-char notation

-					this.fromRGB(

-						parseInt(m[1].substr(0,2),16) / 255,

-						parseInt(m[1].substr(2,2),16) / 255,

-						parseInt(m[1].substr(4,2),16) / 255,

-						flags

-					);

-				} else { // 3-char notation

-					this.fromRGB(

-						parseInt(m[1].charAt(0)+m[1].charAt(0),16) / 255,

-						parseInt(m[1].charAt(1)+m[1].charAt(1),16) / 255,

-						parseInt(m[1].charAt(2)+m[1].charAt(2),16) / 255,

-						flags

-					);

-				}

-				return true;

-			}

-		};

-

-

-		this.toString = function() {

-			return (

-				(0x100 | Math.round(255*this.rgb[0])).toString(16).substr(1) +

-				(0x100 | Math.round(255*this.rgb[1])).toString(16).substr(1) +

-				(0x100 | Math.round(255*this.rgb[2])).toString(16).substr(1)

-			);

-		};

-

-

-		function RGB_HSV(r, g, b) {

-			var n = Math.min(Math.min(r,g),b);

-			var v = Math.max(Math.max(r,g),b);

-			var m = v - n;

-			if(m === 0) { return [ null, 0, v ]; }

-			var h = r===n ? 3+(b-g)/m : (g===n ? 5+(r-b)/m : 1+(g-r)/m);

-			return [ h===6?0:h, m/v, v ];

-		}

-

-

-		function HSV_RGB(h, s, v) {

-			if(h === null) { return [ v, v, v ]; }

-			var i = Math.floor(h);

-			var f = i%2 ? h-i : 1-(h-i);

-			var m = v * (1 - s);

-			var n = v * (1 - s*f);

-			switch(i) {

-				case 6:

-				case 0: return [v,n,m];

-				case 1: return [n,v,m];

-				case 2: return [m,v,n];

-				case 3: return [m,n,v];

-				case 4: return [n,m,v];

-				case 5: return [v,m,n];

-			}

-		}

-

-

-		function removePicker() {

-			delete jscolor.picker.owner;

-			document.getElementsByTagName('body')[0].removeChild(jscolor.picker.boxB);

-		}

-

-

-		function drawPicker(x, y) {

-			if(!jscolor.picker) {

-				jscolor.picker = {

-					box : document.createElement('div'),

-					boxB : document.createElement('div'),

-					pad : document.createElement('div'),

-					padB : document.createElement('div'),

-					padM : document.createElement('div'),

-					sld : document.createElement('div'),

-					sldB : document.createElement('div'),

-					sldM : document.createElement('div'),

-					btn : document.createElement('div'),

-					btnS : document.createElement('span'),

-					btnT : document.createTextNode(THIS.pickerCloseText)

-				};

-				for(var i=0,segSize=4; i<jscolor.images.sld[1]; i+=segSize) {

-					var seg = document.createElement('div');

-					seg.style.height = segSize+'px';

-					seg.style.fontSize = '1px';

-					seg.style.lineHeight = '0';

-					jscolor.picker.sld.appendChild(seg);

-				}

-				jscolor.picker.sldB.appendChild(jscolor.picker.sld);

-				jscolor.picker.box.appendChild(jscolor.picker.sldB);

-				jscolor.picker.box.appendChild(jscolor.picker.sldM);

-				jscolor.picker.padB.appendChild(jscolor.picker.pad);

-				jscolor.picker.box.appendChild(jscolor.picker.padB);

-				jscolor.picker.box.appendChild(jscolor.picker.padM);

-				jscolor.picker.btnS.appendChild(jscolor.picker.btnT);

-				jscolor.picker.btn.appendChild(jscolor.picker.btnS);

-				jscolor.picker.box.appendChild(jscolor.picker.btn);

-				jscolor.picker.boxB.appendChild(jscolor.picker.box);

-			}

-

-			var p = jscolor.picker;

-

-			// controls interaction

-			p.box.onmouseup =

-			p.box.onmouseout = function() { target.focus(); };

-			p.box.onmousedown = function() { abortBlur=true; };

-			p.box.onmousemove = function(e) {

-				if (holdPad || holdSld) {

-					holdPad && setPad(e);

-					holdSld && setSld(e);

-					if (document.selection) {

-						document.selection.empty();

-					} else if (window.getSelection) {

-						window.getSelection().removeAllRanges();

-					}

-					dispatchImmediateChange();

-				}

-			};

-			if('ontouchstart' in window) { // if touch device

-				p.box.addEventListener('touchmove', function(e) {

-					var event={

-						'offsetX': e.touches[0].pageX-touchOffset.X,

-						'offsetY': e.touches[0].pageY-touchOffset.Y

-					};

-					if (holdPad || holdSld) {

-						holdPad && setPad(event);

-						holdSld && setSld(event);

-						dispatchImmediateChange();

-					}

-					e.stopPropagation(); // prevent move "view" on broswer

-					e.preventDefault(); // prevent Default - Android Fix (else android generated only 1-2 touchmove events)

-				}, false);

-			}

-			p.padM.onmouseup =

-			p.padM.onmouseout = function() { if(holdPad) { holdPad=false; jscolor.fireEvent(valueElement,'change'); } };

-			p.padM.onmousedown = function(e) {

-				// if the slider is at the bottom, move it up

-				switch(modeID) {

-					case 0: if (THIS.hsv[2] === 0) { THIS.fromHSV(null, null, 1.0); }; break;

-					case 1: if (THIS.hsv[1] === 0) { THIS.fromHSV(null, 1.0, null); }; break;

-				}

-				holdSld=false;

-				holdPad=true;

-				setPad(e);

-				dispatchImmediateChange();

-			};

-			if('ontouchstart' in window) {

-				p.padM.addEventListener('touchstart', function(e) {

-					touchOffset={

-						'X': e.target.offsetParent.offsetLeft,

-						'Y': e.target.offsetParent.offsetTop

-					};

-					this.onmousedown({

-						'offsetX':e.touches[0].pageX-touchOffset.X,

-						'offsetY':e.touches[0].pageY-touchOffset.Y

-					});

-				});

-			}

-			p.sldM.onmouseup =

-			p.sldM.onmouseout = function() { if(holdSld) { holdSld=false; jscolor.fireEvent(valueElement,'change'); } };

-			p.sldM.onmousedown = function(e) {

-				holdPad=false;

-				holdSld=true;

-				setSld(e);

-				dispatchImmediateChange();

-			};

-			if('ontouchstart' in window) {

-				p.sldM.addEventListener('touchstart', function(e) {

-					touchOffset={

-						'X': e.target.offsetParent.offsetLeft,

-						'Y': e.target.offsetParent.offsetTop

-					};

-					this.onmousedown({

-						'offsetX':e.touches[0].pageX-touchOffset.X,

-						'offsetY':e.touches[0].pageY-touchOffset.Y

-					});

-				});

-			}

-

-			// picker

-			var dims = getPickerDims(THIS);

-			p.box.style.width = dims[0] + 'px';

-			p.box.style.height = dims[1] + 'px';

-

-			// picker border

-			p.boxB.style.position = 'absolute';

-			p.boxB.style.clear = 'both';

-			p.boxB.style.left = x+'px';

-			p.boxB.style.top = y+'px';

-			p.boxB.style.zIndex = THIS.pickerZIndex;

-			p.boxB.style.border = THIS.pickerBorder+'px solid';

-			p.boxB.style.borderColor = THIS.pickerBorderColor;

-			p.boxB.style.background = THIS.pickerFaceColor;

-

-			// pad image

-			p.pad.style.width = jscolor.images.pad[0]+'px';

-			p.pad.style.height = jscolor.images.pad[1]+'px';

-

-			// pad border

-			p.padB.style.position = 'absolute';

-			p.padB.style.left = THIS.pickerFace+'px';

-			p.padB.style.top = THIS.pickerFace+'px';

-			p.padB.style.border = THIS.pickerInset+'px solid';

-			p.padB.style.borderColor = THIS.pickerInsetColor;

-

-			// pad mouse area

-			p.padM.style.position = 'absolute';

-			p.padM.style.left = '0';

-			p.padM.style.top = '0';

-			p.padM.style.width = THIS.pickerFace + 2*THIS.pickerInset + jscolor.images.pad[0] + jscolor.images.arrow[0] + 'px';

-			p.padM.style.height = p.box.style.height;

-			p.padM.style.cursor = 'crosshair';

-

-			// slider image

-			p.sld.style.overflow = 'hidden';

-			p.sld.style.width = jscolor.images.sld[0]+'px';

-			p.sld.style.height = jscolor.images.sld[1]+'px';

-

-			// slider border

-			p.sldB.style.display = THIS.slider ? 'block' : 'none';

-			p.sldB.style.position = 'absolute';

-			p.sldB.style.right = THIS.pickerFace+'px';

-			p.sldB.style.top = THIS.pickerFace+'px';

-			p.sldB.style.border = THIS.pickerInset+'px solid';

-			p.sldB.style.borderColor = THIS.pickerInsetColor;

-

-			// slider mouse area

-			p.sldM.style.display = THIS.slider ? 'block' : 'none';

-			p.sldM.style.position = 'absolute';

-			p.sldM.style.right = '0';

-			p.sldM.style.top = '0';

-			p.sldM.style.width = jscolor.images.sld[0] + jscolor.images.arrow[0] + THIS.pickerFace + 2*THIS.pickerInset + 'px';

-			p.sldM.style.height = p.box.style.height;

-			try {

-				p.sldM.style.cursor = 'pointer';

-			} catch(eOldIE) {

-				p.sldM.style.cursor = 'hand';

-			}

-

-			// "close" button

-			function setBtnBorder() {

-				var insetColors = THIS.pickerInsetColor.split(/\s+/);

-				var pickerOutsetColor = insetColors.length < 2 ? insetColors[0] : insetColors[1] + ' ' + insetColors[0] + ' ' + insetColors[0] + ' ' + insetColors[1];

-				p.btn.style.borderColor = pickerOutsetColor;

-			}

-			p.btn.style.display = THIS.pickerClosable ? 'block' : 'none';

-			p.btn.style.position = 'absolute';

-			p.btn.style.left = THIS.pickerFace + 'px';

-			p.btn.style.bottom = THIS.pickerFace + 'px';

-			p.btn.style.padding = '0 15px';

-			p.btn.style.height = '18px';

-			p.btn.style.border = THIS.pickerInset + 'px solid';

-			setBtnBorder();

-			p.btn.style.color = THIS.pickerButtonColor;

-			p.btn.style.font = '12px sans-serif';

-			p.btn.style.textAlign = 'center';

-			try {

-				p.btn.style.cursor = 'pointer';

-			} catch(eOldIE) {

-				p.btn.style.cursor = 'hand';

-			}

-			p.btn.onmousedown = function () {

-				THIS.hidePicker();

-			};

-			p.btnS.style.lineHeight = p.btn.style.height;

-

-			// load images in optimal order

-			switch(modeID) {

-				case 0: var padImg = 'hs.png'; break;

-				case 1: var padImg = 'hv.png'; break;

-			}

-			p.padM.style.backgroundImage = "url('"+jscolor.getDir()+"cross.gif')";

-			p.padM.style.backgroundRepeat = "no-repeat";

-			p.sldM.style.backgroundImage = "url('"+jscolor.getDir()+"arrow.gif')";

-			p.sldM.style.backgroundRepeat = "no-repeat";

-			p.pad.style.backgroundImage = "url('"+jscolor.getDir()+padImg+"')";

-			p.pad.style.backgroundRepeat = "no-repeat";

-			p.pad.style.backgroundPosition = "0 0";

-

-			// place pointers

-			redrawPad();

-			redrawSld();

-

-			jscolor.picker.owner = THIS;

-			document.getElementsByTagName('body')[0].appendChild(p.boxB);

-		}

-

-

-		function getPickerDims(o) {

-			var dims = [

-				2*o.pickerInset + 2*o.pickerFace + jscolor.images.pad[0] +

-					(o.slider ? 2*o.pickerInset + 2*jscolor.images.arrow[0] + jscolor.images.sld[0] : 0),

-				o.pickerClosable ?

-					4*o.pickerInset + 3*o.pickerFace + jscolor.images.pad[1] + o.pickerButtonHeight :

-					2*o.pickerInset + 2*o.pickerFace + jscolor.images.pad[1]

-			];

-			return dims;

-		}

-

-

-		function redrawPad() {

-			// redraw the pad pointer

-			switch(modeID) {

-				case 0: var yComponent = 1; break;

-				case 1: var yComponent = 2; break;

-			}

-			var x = Math.round((THIS.hsv[0]/6) * (jscolor.images.pad[0]-1));

-			var y = Math.round((1-THIS.hsv[yComponent]) * (jscolor.images.pad[1]-1));

-			jscolor.picker.padM.style.backgroundPosition =

-				(THIS.pickerFace+THIS.pickerInset+x - Math.floor(jscolor.images.cross[0]/2)) + 'px ' +

-				(THIS.pickerFace+THIS.pickerInset+y - Math.floor(jscolor.images.cross[1]/2)) + 'px';

-

-			// redraw the slider image

-			var seg = jscolor.picker.sld.childNodes;

-

-			switch(modeID) {

-				case 0:

-					var rgb = HSV_RGB(THIS.hsv[0], THIS.hsv[1], 1);

-					for(var i=0; i<seg.length; i+=1) {

-						seg[i].style.backgroundColor = 'rgb('+

-							(rgb[0]*(1-i/seg.length)*100)+'%,'+

-							(rgb[1]*(1-i/seg.length)*100)+'%,'+

-							(rgb[2]*(1-i/seg.length)*100)+'%)';

-					}

-					break;

-				case 1:

-					var rgb, s, c = [ THIS.hsv[2], 0, 0 ];

-					var i = Math.floor(THIS.hsv[0]);

-					var f = i%2 ? THIS.hsv[0]-i : 1-(THIS.hsv[0]-i);

-					switch(i) {

-						case 6:

-						case 0: rgb=[0,1,2]; break;

-						case 1: rgb=[1,0,2]; break;

-						case 2: rgb=[2,0,1]; break;

-						case 3: rgb=[2,1,0]; break;

-						case 4: rgb=[1,2,0]; break;

-						case 5: rgb=[0,2,1]; break;

-					}

-					for(var i=0; i<seg.length; i+=1) {

-						s = 1 - 1/(seg.length-1)*i;

-						c[1] = c[0] * (1 - s*f);

-						c[2] = c[0] * (1 - s);

-						seg[i].style.backgroundColor = 'rgb('+

-							(c[rgb[0]]*100)+'%,'+

-							(c[rgb[1]]*100)+'%,'+

-							(c[rgb[2]]*100)+'%)';

-					}

-					break;

-			}

-		}

-

-

-		function redrawSld() {

-			// redraw the slider pointer

-			switch(modeID) {

-				case 0: var yComponent = 2; break;

-				case 1: var yComponent = 1; break;

-			}

-			var y = Math.round((1-THIS.hsv[yComponent]) * (jscolor.images.sld[1]-1));

-			jscolor.picker.sldM.style.backgroundPosition =

-				'0 ' + (THIS.pickerFace+THIS.pickerInset+y - Math.floor(jscolor.images.arrow[1]/2)) + 'px';

-		}

-

-

-		function isPickerOwner() {

-			return jscolor.picker && jscolor.picker.owner === THIS;

-		}

-

-

-		function blurTarget() {

-			if(valueElement === target) {

-				THIS.importColor();

-			}

-			if(THIS.pickerOnfocus) {

-				THIS.hidePicker();

-			}

-		}

-

-

-		function blurValue() {

-			if(valueElement !== target) {

-				THIS.importColor();

-			}

-		}

-

-

-		function setPad(e) {

-			var mpos = jscolor.getRelMousePos(e);

-			var x = mpos.x - THIS.pickerFace - THIS.pickerInset;

-			var y = mpos.y - THIS.pickerFace - THIS.pickerInset;

-			switch(modeID) {

-				case 0: THIS.fromHSV(x*(6/(jscolor.images.pad[0]-1)), 1 - y/(jscolor.images.pad[1]-1), null, leaveSld); break;

-				case 1: THIS.fromHSV(x*(6/(jscolor.images.pad[0]-1)), null, 1 - y/(jscolor.images.pad[1]-1), leaveSld); break;

-			}

-		}

-

-

-		function setSld(e) {

-			var mpos = jscolor.getRelMousePos(e);

-			var y = mpos.y - THIS.pickerFace - THIS.pickerInset;

-			switch(modeID) {

-				case 0: THIS.fromHSV(null, null, 1 - y/(jscolor.images.sld[1]-1), leavePad); break;

-				case 1: THIS.fromHSV(null, 1 - y/(jscolor.images.sld[1]-1), null, leavePad); break;

-			}

-		}

-

-

-		function dispatchImmediateChange() {

-			if (THIS.onImmediateChange) {

-				var callback;

-				if (typeof THIS.onImmediateChange === 'string') {

-					callback = new Function (THIS.onImmediateChange);

-				} else {

-					callback = THIS.onImmediateChange;

-				}

-				callback.call(THIS);

-			}

-		}

-

-

-		var THIS = this;

-		var modeID = this.pickerMode.toLowerCase()==='hvs' ? 1 : 0;

-		var abortBlur = false;

-		var

-			valueElement = jscolor.fetchElement(this.valueElement),

-			styleElement = jscolor.fetchElement(this.styleElement);

-		var

-			holdPad = false,

-			holdSld = false,

-			touchOffset = {};

-		var

-			leaveValue = 1<<0,

-			leaveStyle = 1<<1,

-			leavePad = 1<<2,

-			leaveSld = 1<<3;

-

-		// target

-		jscolor.addEvent(target, 'focus', function() {

-			if(THIS.pickerOnfocus) { THIS.showPicker(); }

-		});

-		jscolor.addEvent(target, 'blur', function() {

-			if(!abortBlur) {

-				window.setTimeout(function(){ abortBlur || blurTarget(); abortBlur=false; }, 0);

-			} else {

-				abortBlur = false;

-			}

-		});

-

-		// valueElement

-		if(valueElement) {

-			var updateField = function() {

-				THIS.fromString(valueElement.value, leaveValue);

-				dispatchImmediateChange();

-			};

-			jscolor.addEvent(valueElement, 'keyup', updateField);

-			jscolor.addEvent(valueElement, 'input', updateField);

-			jscolor.addEvent(valueElement, 'blur', blurValue);

-			valueElement.setAttribute('autocomplete', 'off');

-		}

-

-		// styleElement

-		if(styleElement) {

-			styleElement.jscStyle = {

-				backgroundImage : styleElement.style.backgroundImage,

-				backgroundColor : styleElement.style.backgroundColor,

-				color : styleElement.style.color

-			};

-		}

-

-		// require images

-		switch(modeID) {

-			case 0: jscolor.requireImage('hs.png'); break;

-			case 1: jscolor.requireImage('hv.png'); break;

-		}

-		jscolor.requireImage('cross.gif');

-		jscolor.requireImage('arrow.gif');

-

-		this.importColor();

-	}

-

-};

-

-

-jscolor.install();

diff --git a/js/oekaki.js b/js/oekaki.js
deleted file mode 100644
index cb7aff39..00000000
--- a/js/oekaki.js
+++ /dev/null
@@ -1,278 +0,0 @@
-/*
- * oekaki.js
- * https://github.com/vichan-devel/Tinyboard/blob/master/js/oekaki.js
- *
- * Warning: this script is unsupported and staged for deletion/replacement
- * Please consult this bug report:
- *   https://github.com/vichan-devel/Tinyboard/issues/20
- *
- * Released under the MIT license
- * Copyright (c) 2013 copypaste <wizardchan@hush.com>
- * Copyright (c) 2013-2014 Marcin Łabanowski <marcin@6irc.net>
- *
- * Usage: (it wouldn't work when mixed with ajax.js)
- *   $config['additional_javascript'][] = 'js/jquery.min.js';
- *   $config['additional_javascript'][] = 'js/oekaki.js';
- *   $config['additional_javascript'][] = 'js/jscolor/jscolor.js';
- *   //$config['additional_javascript'][] = 'js/upload-selection.js';
- */
-
-$(function() {
-// Init
-var oekaki_form = '\
-		<tr id="oekaki">\
-			<th>\
-				Oekaki\
-			</th>\
-			<td>\
-				<canvas width="'+oekaki_options.width+'" height="'+oekaki_options.height+'" id="oekaki_canvas" style="border:1px solid black;-webkit-user-select: none;-moz-user-select: none;"></canvas>\
-				<p><button type="button" id="brushsize">'+_('Brush size')+'</button><input class="color" id="color" value="000000" placeholder="Color"/><button type="button" id="text">'+_('Set text')+'</button><button type="button" id="clear">'+_('Clear')+'</button><button type="button" id="save">'+_('Save')+'</button><button type="button" id="load">'+_('Load')+'</button><br/>\
-				<button type="button" id="eraser">'+_('Toggle eraser')+'</button><button type="button" id="getcolor">'+_('Get color')+'</button><button type="button" id="fill">'+_('Fill')+'</button>\
-				</p><p><textarea id="savebox"></textarea><label id="confirm_oekaki_label"><input id="confirm_oekaki" type="checkbox"/> '+_('Use oekaki instead of file?')+'</label></p>\
-				<img id="saved" style="display:none">\
-			</td>\
-		</tr>'
-
-function init_oekaki() {
-	// Add oekaki after the file input
-	$('form[name="post"]:not(#quick-reply) input[type="file"]').parent().parent().after(oekaki_form);
-	// Add "edit in oekaki" links
-	$(".fileinfo .unimportant").append(' <a href="javascript:void(0)" class="edit_in_oekaki">['+_('Edit in oekaki')+']</a>');
-	// Init oekaki vars
-	canvas = $("#oekaki_canvas");
-	context = canvas[0].getContext("2d");
-	is_drawing = false;
-	text = "";
-	eraser = getcolor = fill = false;
-	context.strokeStyle = context.fillStyle = "black";
-	// Attach canvas events
-	attach_events();
-}
-
-if (active_page == 'index' || active_page == 'thread') {
-	init_oekaki();
-}
-
-//http://stackoverflow.com/a/5624139/1901658
-function hexToRgb(hex) {
-	var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
-	return result ? {
-		r: parseInt(result[1], 16),
-		g: parseInt(result[2], 16),
-		b: parseInt(result[3], 16)
-	} : null;
-}
-
-//http://stackoverflow.com/a/4025958/1901658
-function arraysEqual(arr1, arr2) {
-	if(arr1.length !== arr2.length)
-		return false;
-	for(var i = arr1.length; i--;) {
-		if(arr1[i] !== arr2[i])
-			return false;
-	}
-
-	return true;
-}
-
-function getmousepos(e){
-	var r = canvas[0].getBoundingClientRect();
-	mouseX = Math.round(e.clientX - r.left);
-	mouseY = Math.round(e.clientY - r.top);
-}
-
-function setcolor(){
-	context.strokeStyle = context.fillStyle = "#"+$(".color").val();
-}
-
-function flood_fill(x, y, target){
-	var pixel = context.createImageData(1,1);
-	var color = hexToRgb("#"+$(".color").val());
-	pixel.data[0] = color.r; pixel.data[1] = color.g; pixel.data[2] = color.b; pixel.data[3] = 255;
-	var queue = [];
-	var node = [x, y];
-	queue.push(node);
-	//var iters = 0;
-	while (queue.length > 0) {
-		var n = queue.pop();
-		var data = context.getImageData(n[0], n[1], 1, 1).data;
-		var d = [data[0], data[1], data[2], data[3]];
-		var t = [target[0], target[1], target[2], target[3]];
-		if (arraysEqual(d, t) && n[0] < canvas.width() && n[1] < canvas.height() && n[0] > -1 && n[1] > -1){
-			context.putImageData(pixel, n[0], n[1]);
-			queue.push([n[0], n[1]-1]);
-			queue.push([n[0], n[1]+1]);
-			queue.push([n[0]-1, n[1]]);
-			queue.push([n[0]+1, n[1]]);
-			//iters++;
-		}
-		//if (iters%100===0){console.log(n[0]);console.log(n[1])}
-		
-	}
-	return;
-}
-
-function color_under_pixel(x, y){
-	return context.getImageData(x, y, 1, 1).data;
-}
-
-function attach_events(){
-
-canvas.on("mousedown", function(e){
-	getmousepos(e);
-	$(this).css("cursor","none");
-	if (getcolor) {
-		var imagedata = color_under_pixel(mouseX, mouseY);
-		$("#color")[0].color.fromRGB(imagedata[0], imagedata[1], imagedata[2]);
-		getcolor = false;
-		setcolor();
-	}
-	else if (fill && !eraser) {
-		flood_fill(mouseX, mouseY, color_under_pixel(mouseX, mouseY));
-		fill = false;
-	}
-	else {
-		is_drawing = true;
-		context.beginPath();
-		context.moveTo(mouseX,mouseY);
-		context.fillText(text,mouseX,mouseY);
-		$("#confirm_oekaki").attr("checked",true);
-	}
-	
-});		
-
-canvas.on("mousemove", function(e){
-	getmousepos(e);
-	if (is_drawing) {
-		context.lineTo(mouseX,mouseY);
-		context.stroke()
-	}
-});
-
-canvas.on("mouseup mouseout", function(e){
-	context.stroke()
-	$(this).css("cursor","auto");
-	is_drawing = false;
-});
-
-$("#brushsize").on("click",function(){
-	var size = prompt("Enter brush size");
-	if (parseInt(size) == NaN) {
-		return
-	}
-	else {
-		context.lineWidth = size;
-	}
-});
-
-$(".color").on("change", setcolor);
-
-$("#text").on("click", function(e){
-	text = prompt(_("Enter some text")) || "";
-	context.font = prompt(_("Enter font or leave empty"), context.font)
-});
-
-function clear(){
-	context.beginPath();
-	context.clearRect(0,0,canvas.width(),canvas.height());
-	$("#confirm_oekaki").attr("checked",false)
-	canvas[0].height = oekaki_options.height; canvas[0].width = oekaki_options.width;
-};
-
-$("#clear").on("click", clear);
-
-$("#save").on("click",function(){
-	$("#savebox").val(canvas[0].toDataURL());
-});
-
-$("#load").on("click", function(){
-	clear();
-	var img = new Image();
-	img.src = $("#savebox").val();
-	img.onload = function(){context.drawImage(img,0,0);};
-	$("#confirm_oekaki").attr("checked",true)
-});
-
-$("#eraser").on("click", function(){
-	if (eraser) {
-		eraser = false;
-		context.strokeStyle = context.fillStyle = "#"+$(".color").val();
-		context.globalCompositeOperation = old_gco;
-	}
-	else {
-		eraser = true;
-		old_gco = context.globalCompositeOperation;
-		context.globalCompositeOperation = "destination-out";
-		context.strokeStyle = "rgba(0,0,0,1)";
-	}
-});
-
-$("#getcolor").on("click", function(){
-	getcolor = true;
-});
-
-$("#fill").on("click", function(){
-	fill = true;
-});
-
-$(".edit_in_oekaki").on("click", function(){ 
-	var img_link = $(this).parent().parent().parent().find("a>img.post-image").parent()[0]
-	var img = new Image();
-	img.onload = function() {
-		canvas[0].width = img.width; canvas[0].height = img.height;
-		context.drawImage(img, 0, 0);
-	}
-	img.src = $(img_link).attr("href");
-
-	if (typeof enable_oekaki === 'function') { // for upload-selection.js
-		enable_oekaki();
-	}
-	return false;
-});
-}
-
-function dataURItoBlob(dataURI) {
-    var binary = atob(dataURI.split(',')[1]);
-    var array = new Array(binary.length);
-    for(var i = 0; i < binary.length; i++) {
-        array[i] = binary.charCodeAt(i);
-    }
-    return new Blob([new Uint8Array(array)], {type: 'image/jpeg'});
-}
-
-$("form[name='post']").on("submit", function(e){
-	if ($("#confirm_oekaki").is(":checked")) {
-		e.preventDefault();
-		$("input[type='file']").remove();
-		var dataURL = canvas[0].toDataURL();
-		var blob = dataURItoBlob(dataURL);
-		var fd = new FormData(document.forms[0]);
-		fd.append("file", blob, "Oekaki.png");
-		fd.append("post", $("input[name='post']").val());
-		$.ajax({
-			type: "POST",
-			url: oekaki_options.root+"post.php",
-			data: fd,
-			processData: false,
-			contentType: false,
-			success: function(data) {
-				location.reload();
-			},
-			error: function(jq, data, et) {
-if (jq.responseText == '' && data == 'error') {
-//probably jquery bug, ignore
-location.reload();
-}
-else
-{
- alert($('h2',jq.responseText).text());
-}
-}
-		});
-	}
-
-	else {
-		return true;
-	};
-});
-});