Remove obsolete itools javascript functions and loader/jsboot mechanism

9 files changed, 16 insertions, 1263 deletions

diff --git a/it_html.class b/it_html.class
index 424559c..6ddbab9 100644
--- a/it_html.class
+++ b/it_html.class
@@ -79,7 +79,6 @@ function __construct($p = array())
 		'name' => $p['htmltype'] == 'xml' ? 'it_html_xml' : 'it_html',                  # Name of global variable $this is assigned to (string), XXX Copy and paste in configure()
 		'nonewlinetags' => 'a,b,em,img,input,label,span,noscript', # tags that do not like newlines after them
 		'prettyprint' => it::is_devel(),      # Should output be prettily indented?
-		'show_boot_dom' => false,             # If true, append invisible <div id="it_boot_dom"> at the end of body
 		'show_content_type' => true,          # If true, add <meta http-equiv="Content-Type" ...> header
 		'show_favicon' => true,               # If true, add <link> tag to /favicon.ico if it exists
 		'favicon' => '',	              # If set, add favicon <link> tag to this url
@@ -229,14 +228,7 @@ function head($args = array())
 		}
 
 		$js = isset($p['jsenv']) ? "var env = " . itjs::serialize($p['jsenv']) . ";\n" : '';
-		$js .= $this->_itjs($p['jsinline'], 'inline');
-
-		if ($p['js'])
-		{
-			$js .= $this->_itjs("boot.js", "inline");
-			$js .= "function it_boot_start(){ " . trim($p['jsboot']) . " }\n";
-			$js .= "it_boot('/itjs/" . U($p['js'], array('s' => itjs::checksum($p['js']))) . "');\n";
-		}
+		$js .= $this->_itjs($p['jsinline']);
 
 		if ($js)
 			$data .= $this->js(array(self::_cleanup($js, $p['charset'])));
@@ -266,9 +258,6 @@ function body($args)
 		$args[] = div(array('style' => 'position:fixed; bottom:0; z-index:9999; font-family:monospace'), "Debugvars: " . join(" ", $debug_links));
 	}
 
-	if ($this->p['show_boot_dom'])
-		$args[] = div(array('id' => "it_boot_dom", 'style' => "visibility:hidden"));
-
 	return $this->head() . $this->_tag('body', $args);
 }
 
@@ -580,30 +569,19 @@ function js($args)
 /**
  * Include javascript code or generate HTML to include it
  */
-function _itjs($files, $mode)
+function _itjs($files)
 {
 	$result = "";
 
 	if ($files)
 	{
 		$filenames = itjs::filenames($files);
+		$jsfile = "";
 
-		if ($mode == "files")
-		{
-			foreach ($filenames as $file)
-				$result .= tag('script', array('type' => "text/javascript", 'src' => "/itjs/" . basename($file) . "?v=" . itjs::checksum($file)));
-		}
-		else if ($mode == "inline")
-		{
-			$jsfile = "";
-
-			foreach ($filenames as $file)
-				$jsfile .= @it::file_get_contents($file);
+		foreach ($filenames as $file)
+			$jsfile .= @it::file_get_contents($file);
 
-			$result .= itjs::strip($jsfile);
-		}
-		else
-			$result .= tag('script', array('type' => "text/javascript", 'src' => "/itjs/$files?v=" . itjs::checksum($filenames)));
+		$result .= itjs::strip($jsfile);
 	}
 
 	return $result;
diff --git a/itjs.class b/itjs.class
index 702051d..9e3595a 100644
--- a/itjs.class
+++ b/itjs.class
@@ -47,56 +47,6 @@ static function serialize($values)
 	return json_encode($values, JSON_UNESCAPED_UNICODE | (it::is_devel() ? JSON_PRETTY_PRINT : 0));
 }
 
-/*
- * Encode the result into a javascript array to transfer and eval() in client
- */
-static function encode($values)
-{
-	if (!is_array($values))
-		return json_encode($values, JSON_UNESCAPED_UNICODE);
-
-	static $jskeyword = array("abstract" => 1, "boolean" => 1, "break" => 1, "byte" => 1, "case" => 1, "catch" => 1, "char" => 1, "class" => 1, "const" => 1, "continue" => 1, "debugger" => 1, "default" => 1, "delete" => 1, "do" => 1, "double" => 1, "each" => 1, "else" => 1, "enum" => 1, "export" => 1, "extends" => 1, "false" => 1, "final" => 1, "finally" => 1, "float" => 1, "for" => 1, "function" => 1, "goto" => 1, "if" => 1, "implements" => 1, "import" => 1, "in" => 1, "instanceof" => 1, "int" => 1, "interface" => 1, "long" => 1, "namespace" => 1, "native" => 1, "new" => 1, "null" => 1, "package" => 1, "private" => 1, "protected" => 1, "public" => 1, "return" => 1, "short" => 1, "static" => 1, "super" => 1, "switch" => 1, "synchronized" => 1, "this" => 1, "throw" => 1, "throws" => 1, "transient" => 1, "true" => 1, "try" => 1, "typeof" => 1, "var" => 1, "void" => 1, "volatile" => 1, "while" => 1, "with" => 1, "xml" => 1);
-
-	$charset = self::$charset ?: ini_get('default_charset');
-	$texts = ($values === array_values($values)) ? "[]0 " : "{}1\n";	# Numerical or associative array
-	$result = $texts[0];
-
-	foreach ($values as $key => $value)
-	{
-		$result .= $separator;
-
-		if ($texts[2])
-		{
-			if ($jskeyword[$key] || !preg_match('/^[a-z_]\w*$/i', $key))
-				$key = "'" . addslashes($key) . "'";
-
-			$result .= "$key:";
-		}
-
-		if ($value === true)
-			$result .= 'true';
-		else if ($value === false)
-			$result .= 'false';
-		else if (!is_array($value))
-		{
-			$quote = (strval(intval($value)) === strval($value)) ? "" : '"';
-			if (strtolower($charset) != "utf-8")
-				$value = strtr($value, array("\x84" => '"', "\x93" => '"', "\x94" => '"'));
-			$string = strtr($value, array("\0" => '\\0', '"' => '\\"', "</"=>"<\\/", "\n" => '\\n', "\r" => '\\r', "\t" => '\\t', "\\" => '\\\\'));
-			$string = $GLOBALS['itjs_defaultconfig']['latin2unicode'] ? preg_replace_callback('/([\xa0-\xff])/', function($m) { return sprintf("\\u%04x", ord($m[1])); }, $string) : $string;
-			$result .= $quote . $string . $quote;
-		}
-		else
-			$result .= itjs::encode($value);
-
-		$separator = "," . $texts[3];
-	}
-
-	$result .= $texts[1];
-
-	return $result;
-}
-
 /**
  * Convert UNTRUSTED comma separated filelist string to trusted local filenames. Missing files are ignored.
  */
@@ -106,9 +56,11 @@ static function filenames($filelist)
 	$local = $GLOBALS['ULTRAHOME'] . "/itjs";
 	$itjs = "/www/server/phpinclude/itools/itjs";
 	$libsearch = strlen($GLOBALS['debug_lib']) > 1 ? "/www/lib-" . $GLOBALS['debug_lib'] . ".search.ch" : "/www/lib.search.ch";
-	$special = array(
+	$deprecated = array(
 		"itools" => "$itjs/it.js,$itjs/http.js,$itjs/loader.js,$itjs/state.js,$itjs/timer.js",
 		"boot.js" => "$itjs/boot.js",
+	);
+	$special = array(
 		"error.gif" => "$itjs/error.gif",
 		"search.css" => "$libsearch/doc/search.css",
 		"prettyprint.css" => "$libsearch/doc/prettyprint.css",
@@ -116,6 +68,12 @@ static function filenames($filelist)
 
 	foreach (it::match("[-\w.=?&]+", basename($filelist), array('all' => true)) as $file) # split by comma but ignore illegal chars
 	{
+		if ($deprecated[$file])
+		{
+			it::error('title' => "Deprecated itjs file '$file' used");
+			continue;
+		}
+
 		$filenames = $special[$file] ?: (file_exists("$local/" . it::match('^[^?]*', $file)) ? "$local/$file" : "$libsearch/itjs/$file");
 
 		foreach (explode(",", $filenames) as $filename)
diff --git a/itjs.php b/itjs.php
index c54d3a4..c5eab1c 100644
--- a/itjs.php
+++ b/itjs.php
@@ -43,7 +43,6 @@ if (it::match('\.gif$', $lastfile))
 else if (it::match('\.css', $lastfile))
 {
 	header("Content-Type: text/css");
-	$data .= "\n#it_boot_dom { display:none }\n";	# Append magic style for it_boot
 	if (!it::match('^devel', $GLOBALS['ULTRASERVERTYPE']))
 		$data = it::replace(array('[ \t]*([{};])[ \t]*' => '$1', '/\*.*?\*/' => ""), $data);
 	if (it::match('W3C_CSS_Validator', $_SERVER['HTTP_USER_AGENT']) || $_GET['w3c'])
@@ -86,15 +85,4 @@ else if ($files && !it::match('\.html$', $lastfile))
 if (strpos($data, "<?php") !== false)
 	it::error("sending php source?!");
 
-$data = itjs::strip($data);
-
-if ($_REQUEST['boot'])
-{
-	$data .= "window.it_boot_init();\n";
-	if (!$_REQUEST['script'])
-		$data = sprintf("/*sln:%d*/\n%s/*eln:%d*/", grapheme_strlen($data), strtr($data, array('%' => "%25", '.' => "%2e", 'e' => "%65", 'i' => "%69")), grapheme_strlen($data));	# Protect from Firewalls/Proxies altering Javascript source code
-}
-
-echo it_untaint($data);
-
-?>
+echo itjs::strip($data);
diff --git a/itjs/boot.js b/itjs/boot.js
deleted file mode 100644
index 13b382f..0000000
--- a/itjs/boot.js
+++ /dev/null
@@ -1,278 +0,0 @@
-var it_boot_status = "boot";
-var it_panictimer = window.setTimeout("it_panic({reason:it_boot_status})", 31337), it_domtimer;
-var it_starttime = new Date().getTime();
-
-function it_stacktrace()
-{
-	var stacktrace = "";
-	var callstack_done = false;
-
-	try { i.dont.exist += 0; } // does not exist - that's the point
-	catch (e)
-	{
-		if (e.stack) // Firefox
-		{
-			stacktrace = e.stack.replace(/^[^\n]*\n/,'').replace(/(\n@)?\s+$/,'$1').replace(/^\(/g,'{anonymous}(') + ';';
-			callstack_done = true;
-		}
-		else if (window.opera && e.message) // Opera
-		{
-			var entry, lines = e.message.split("\n");
-			for (var i=1, len=lines.length; i < len; i++)
-			{
-				if (lines[i].match(/^\s*[A-Za-z0-9\-_\$]+\(/))
-				{
-					entry = lines[i];
-					// append next line also since it has the file info
-					if (lines[i+1])
-					{
-						entry += " at " + lines[i+1];
-						i++;
-					}
-					stacktrace += entry + ',';
-				}
-			}
-			callstack_done = true;
-		}
-	}
-
-	if (!callstack_done) // IE and Safari
-	{
-		var fname, current_func = arguments.callee.caller;
-		while (current_func)
-		{
-			fname = /function\s*([\w\-$]+)?\s*\(/.test(current_func.toString()) ? RegExp.$1 || 'anonymous' : 'anonymous';
-			stacktrace += fname + ',';
-			current_func = current_func.caller;
-		}
-	}
-
-	return stacktrace;
-}
-
-function it_catcherr(msg, url, line)
-{
-	var stacktrace = it_stacktrace();
-
-	if (typeof it_boot.sequence != 'undefined')
-	{
-		// trigger it_boot retry if error occured while evaluating loaded script
-		if (it_boot.sequence == 'ble' && it_boot.file)
-		{
-			it_boot(it_boot.file, true);
-			return true;
-		}
-
-		stacktrace += "it_boot=" + it_boot.sequence + ";it_boot_file=" + it_boot.file;
-	}
-	if (typeof window.it_loader != 'undefined' && it_loader.sequence)
-		stacktrace += "it_loader=" + it_loader.sequence + ";";
-
-	it_boot_report({msg:msg, url:url, line:line, stacktrace:stacktrace});
-
-	return !window.env || !!window.env.is_live_server;	// No env or live server -> suppress error
-}
-
-window.onerror = it_catcherr;
-
-function it_boot_addparam(url, param)
-{
-	return url + (url.match(/\?/) ? "&" : "?") + param;
-}
-
-function it_panic(p)
-{
-	if (!document.location.href.match(/[?&]static=/) && window.env && window.env.ua && window.env.ua.full && window.env.ua.device != "bot")	// Avoid loop and non-full user agents
-		window.setTimeout("document.location.href = it_boot_addparam(document.location.href, 'static=" + p.reason + "')", 500);
-
-	p.type = "panic";
-	p.stacktrace = it_stacktrace();
-	return it_boot_report(p);
-}
-
-function it_boot_report(p)
-{
-	window.clearTimeout(window.it_domtimer);
-	window.clearTimeout(window.it_panictimer);
-	var loader = null;
-	var data = "";
-	var postdata = p.data;
-	delete p.data;
-	p.time = new Date().getTime() - it_starttime;
-
-	for (var k in p)
-		data += (data ? '&' : '') + k + "=" + escape(p[k]).replace(/\+/g, "%2B");
-
-	var url = "/itjs/error.gif?" + data;
-
-	if (postdata)
-	{
-		loader = it_boot_getloader();
-		for (var k in postdata)
-			data += (data ? '&' : '') + k + "=" + escape(postdata[k]).replace(/\+/g, "%2B");
-	}
-
-	try
-	{
-		loader.open('POST', url);
-		loader.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
-		loader.send(data);
-	}
-	catch (e)
-	{
-		new Image().src = url;
-	}
-}
-
-function it_boot_checkcss(style, key, value)
-{
-	return navigator.userAgent.match(/konqueror/i) || (style && style.getPropertyValue && (style.getPropertyValue(key) == value));
-}
-
-function it_boot_init()
-{
-	it_boot.sequence += "i";
-	window.it_domtimer = null;
-	var konqueror = navigator.userAgent.match(/konqueror/i);
-	var doc = document;
-	var dom = doc && (dom = doc.getElementById('it_boot_dom'));	// HTML has been rendered
-	var view = dom && doc.defaultView;	// We can check if stylesheet is active
-	var style = view && view.getComputedStyle && view.getComputedStyle(dom, '');
-	var css = window.it_boot_checkcss(style, "visibility", "hidden"); // CSS active (inline style on tag)
-	var stylesheet = window.it_boot_checkcss(style, "display", "none");	// External stylesheet loaded
-
-	if (!(doc || !(it_boot_status = "doc")) || !(dom || !(it_boot_status = "dom")) || (style && !(stylesheet || !(it_boot_status = "stylesheet"))))
-	{
-		window.it_domtimer = window.setTimeout("it_boot_init()" , 42);
-
-		if (style && !css)
-			it_panic({reason:"css"});
-
-		return;
-	}
-
-	window.clearTimeout(window.it_panictimer); 
-	it_boot.sequence += "s";
-	window.it_boot_start();
-	it_boot.sequence = "";
-}
-
-function it_boot_getloader()
-{
-	var result = null;
-
-	if (!navigator.userAgent.match(/iPhone|iP.d/))	// Do not use XMLHttpRequest on iOS devices as it does not use cache
-	{
-		try
-		{
-			result = new XMLHttpRequest();
-		}
-		catch (e)
-		{
-			var classnames = [ 'MSXML2.XMLHTTP', 'Microsoft.XMLHTTP' ];
-
-			for (var i in classnames)
-				try { result = new ActiveXObject(classnames[i]); break; } catch (e) {}
-		}
-	}
-
-	return result;
-}
-
-function it_boot(file, isretry)
-{
-	it_boot.file = file;
-	it_boot.sequence = isretry ? "r" : "b";
-	var loader = it_boot_getloader();
-	var bootparam = "boot=1" + (isretry ? "&retry=1" : "");
-	var jsdebug = !!document.location.hostname.match(/\.jsdebug\./);
-
-	if (loader && !jsdebug)
-	{
-		it_boot.sequence += "l";
-		loader.open("GET", it_boot_addparam(file, bootparam));
-		loader.onreadystatechange = function()
-		{
-			var error = "", code = "";
-
-			if (loader.readyState == 4)
-			{
-				if (loader.status < 400)	// Opera gives back 304 if from cache
-				{
-					// check length cookie
-					var ln = String(loader.responseText).match(/\*sln:([0-9]+)[^\n]*\n([\s\S]*\n)\/\*eln:\1/);
-					code = ln ? unescape(ln[2]) : loader.responseText;
-					if (ln && ln[1]-0 == code.length)
-					{
-						it_boot.sequence += "e";
-						if (!window.env || !!window.env.is_live_server)
-							code = "try {" + code + "} catch (e) { it_catcherr(e.message, it_boot.file, -1); }";	// Wrapped in try/catch as Konqueror does not support window.onerror
-						if (window.execScript)
-							window.execScript(code, "javascript");	// IE work-around to get script executed in global scope
-						else
-							window.setTimeout(code, 0);	// Standard compliant version
-					}
-					else
-						error = (ln ? "length mismatch: " + ln[1] + " != " + code.length : "no length cookie");
-				}
-				else
-					error = loader.statusText;
-
-				if (error)
-				{
-					if (isretry)
-						it_panic({reason:'load', error:error, data:{code:code}});
-					else
-						it_boot(file, true);
-				}
-			}
-		}
-		loader.send(null);
-	}
-	else
-	{
-		var doc = document;
-		var dom = doc && (dom = doc.getElementById('it_boot_dom'));	// HTML has been rendered
-		var files = [];
-		it_boot.sequence += "n";
-		bootparam += "&script=1";
-		if (jsdebug) {
-			var path = file.match(/^(.*\/)[^\/]*$/)[1];
-			var params = file.match(/\?.*$/)[0];
-			var imports = file.split(',');
-			for (var i=0; i<imports.length; i++) {
-				var script = imports[i];
-				if (script.substr(0, path.length) != path)
-					script = path + script;
-				if (script.substr(script.length - params.length, params.length) != params)
-					script = script + params;
-				if (i == imports.length-1)
-					script = it_boot_addparam(script, bootparam);
-				else
-					script = it_boot_addparam(script, 'script=1');
-				files.push(script);
-			}
-		}
-		else
-			files = [it_boot_addparam(file, bootparam)];
-
-		if (window.opera || (document.all && navigator.platform.indexOf("Mac") >= 0)) {
-			for (var i=0; i < files.length; i++)
-				document.write('<sc'+'ript type="text/javascript" src="' + files[i] + '"><\/sc'+'ript>');
-		}
-		else if (dom)
-		{
-			for (var i=0; i < files.length; i++) {
-				var tag = doc.createElement("script");
-				tag.src = files[i];
-				dom.appendChild(tag);
-			}
-		}
-		else
-			window.it_domtimer = window.setTimeout("it_boot('" + file + "')" , 42);
-	}
-}
-
-if (document.documentElement)
-	document.documentElement.className += ' js';
-
diff --git a/itjs/http.js b/itjs/http.js
deleted file mode 100755
index 9f1bd4b..0000000
--- a/itjs/http.js
+++ /dev/null
@@ -1,245 +0,0 @@
-/**
- * Create http loader to request data from server
- *
- * @param cb Callback function or object with keys 'object', 'method', ['errorhandler']
- */
-function it_http(cb)
-{
-	this.instance = it_http.instances++;
-	this.callback = cb ? cb : {};
-	this.req = null;
-	this.scrpt = [];
-	this.callid = 0;
-	this.busy = false;
-	
-	// register global reference
-	it_http['__inst' + this.instance] = this;
-}
-
-/* Methods */
-it_http.prototype = {
-
-/* send GET request and trigger callback */
-get: function(url, callback)
-{
-	if (typeof callback != 'undefined')
-		this.callback = callback;
-	this.send(url, 'GET');
-},
-
-/* send POST request with data and trigger callback */
-post: function(url, data, callback)
-{
-	if (typeof callback != 'undefined')
-		this.callback = callback;
-
-	var postdata = '';
-	if (typeof data == 'object') 
-	{
-		for (var k in data)
-			postdata += (postdata ? '&' : '') + it_url_encode(k) + "=" + it_url_encode(data[k]);
-	}
-	else
-		postdata = data;
-
-	this.send(url, 'POST', postdata);
-},
-
-/* private method that finally sends the request */
-send: function(url, method, postdata)
-{
-	this.stop();
-	
-	this.busy = true;
-	this.req = null;
-	var samehost = (!url.match(/^(\w+:)?\/\//) || url.indexOf(window.location.hostname) > 0);
-
-	if (samehost) // use XMLHTTP request only if on same host
-	{
-		try
-		{
-			this.req = new XMLHttpRequest();
-		}
-		catch (e)
-		{
-			var classnames = [ 'MSXML2.XMLHTTP', 'Microsoft.XMLHTTP' ];
-
-			for (var i=0; i < classnames.length; i++)
-			{
-				try
-				{
-					this.req = new ActiveXObject(classnames[i]);
-					break;
-				}
-				catch (e) { }
-			}
-		}
-
-		try
-		{
-			this.req.open(method, url);
-			var me = this;
-			this.req.onreadystatechange = function() { me.ready_state_changed(); }
-			var workingxmlhttp = this.req.onreadystatechange;
-
-			if (!workingxmlhttp)		/* Old Konqueror */
-				this.req = null;
-		}
-		catch (e) { }
-	}
-
-	this.starttime = new Date().getTime();
-
-	if (this.req)
-	{
-		if (method == "POST")
-			this.req.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
-
-		this.req.send(postdata);
-	}
-	else
-	{
-		url += (url.match(/\?/) ? "&" : "?") + "itjs_call=it_http.__inst" + this.instance + "&itjs_callid=" + (++this.callid) + (postdata ? '&' + postdata : "");
-
-		if (samehost || (window.opera && !window.XMLHttpRequest))	 // Opera 7 only works with iframes
-		{
-				var scrpt = document.createElement("iframe");
-				scrpt.style.width = scrpt.style.height = 1;
-				url += "&itjs_iframe=1";
-		}
-		else
-		{
-			var scrpt = document.createElement("script");
-			this.req = { starttime: this.starttime };
-			try
-			{
-				this.scrpt[this.callid] = scrpt;
-				if (!document.all) scrpt.src = url;
-				document.body.appendChild(scrpt);
-				if (document.all) scrpt.src = url;
-			}
-			catch (e) { return false; }
-		}
-	}
-
-	return true;
-},
-
-ready_state_changed: function()
-{
-	var req = this.req; // Avoid race conditions
-
-	if (req && !req.aborted && req.readyState == 4)	// Check aborted flag because IE9 throws error c00c023f when accessing aborted request
-	{
-		var data = null;
-
-		try
-		{
-			if (req.responseText != "")
-				data = eval("(" + req.responseText + ")");
-		}
-		catch (e)
-		{
-			// trigger error handler (if defined)
-			if (typeof this.callback == 'object' && this.callback.errorhandler)
-			{
-				var obj = this.callback.object ? this.callback.object : window;
-				if (typeof obj[this.callback.errorhandler] == 'function')
-					obj[this.callback.errorhandler](req.responseText);
-			}
-			else
-				ED(e, req.responseText);
-		}
-
-		if (data)
-			this.dataReady(data, this.callid);
-
-		this.unlink(this.callid);
-	}
-},
-
-dataReady: function(data, callid)
-{
-	var fixkonqueror33gcbug = this.req;
-	var loadtime = new Date().getTime() - this.starttime;
-
-	this.req = null;
-
-	if ((typeof data == "object") && (this.callid == callid))
-	{
-		data.loadtime = loadtime;
-		
-		// trigger callback function
-		if (typeof this.callback == 'function')
-			this.callback(data);
-		else if (typeof this.callback == 'object' && this.callback.method)
-		{
-			// it_set(data, this.callback);
-			var obj = this.callback.object ? this.callback.object : window;
-			if (typeof obj[this.callback.method] == 'function')
-				obj[this.callback.method](data);
-		}
-	}
-},
-
-stop: function()
-{
-	try {
-		this.req.aborted = true;	// Set aborted flag as IE9 throws error c00c023f when accessing aborted request
-		if (this.req.readyState >= 2)	// Do not abort request never used before as it can throw error e.g. on Firefox
-			this.req.abort();
-	} catch (e) { }
-
-	this.unlink(this.callid);
-},
-
-unlink: function(callid)
-{
-	if (this.req)
-		this.req = null;
-
-	if (this.scrpt[callid])
-	{
-		if (!(document.all && String(navigator.userAgent).indexOf('MSIE 5.0') > 0))
-			document.body.removeChild(this.scrpt[callid]);
-		this.scrpt[callid] = null;
-	}
-
-	this.busy = false;
-} /* NO COMMA */
-
-}
-
-
-// static properties
-it_http.instances = 0;
-
-// static methods
-it_http.get_instance = function()
-{
-	var inst;
-	for (var i=0; i < it_http.instances; i++)
-		if ((inst = it_http['__inst'+i]) && inst.pub && !inst.busy)
-			return inst;
-	
-	inst = new it_http();
-	inst.pub = true;
-	return inst;
-}
-
-/* send GET request and trigger callback */
-it_http.get = function(url, callback)
-{
-	var inst = it_http.get_instance();
-	inst.callback = callback;
-	inst.get(url);
-}
-
-/* send POST request and trigger callback */
-it_http.post = function(url, postdata, callback)
-{
-	var inst = it_http.get_instance();
-	inst.callback = callback;
-	inst.post(url, postdata);
-}
-
diff --git a/itjs/it.js b/itjs/it.js
deleted file mode 100644
index a40350d..0000000
--- a/itjs/it.js
+++ /dev/null
@@ -1,325 +0,0 @@
-/**
- * Clear contents of element 'jsdebug'
- */
-function CED(txt)
-{
-	var element = document.getElementById('jsdebug');
-	if (element)
-		element.innerHTML = txt ? txt : "";
-}
-
-/**
- * Return string with dump of all arguments
- */
-function D()
-{
-	var text = "";
-	for (var i = 0; i < arguments.length; i++)
-	{
-		var variable = arguments[i];
-
-		if (typeof variable == "string")
-			variable = variable.replace(/&/g, '&amp;').replace(new RegExp("<", "g"), '&lt;');
-
-		text += (typeof variable) + " " + variable;
-
-		if (typeof variable == "object")
-		{
-			text += ":";
-
-			for (field in variable)
-			{
-				text += field + "=";
-
-				try { text += typeof variable[field] == 'function' ? 'function' : variable[field]; }
-				catch (e) { text += "*" + e + "*"; }
-
-				text += "\n";
-			}
-			text += "\n";
-		}
-
-		text += "\n";
-	}
-	return text;
-}
-
-/**
- * Add debugging output to element 'jsdebug'
- */
-function ED()
-{
-	var element;
-
-	if (!(element = document.getElementById('jsdebug')))
-		return; // var element = it_create_element(document.body, 'div', {id:'jsdebug', style:{position:'absolute', left:'100px', top:'10px', opacity:'0.8'}})
-
-	element.innerHTML += '<pre style="background-color:#FEE; margin:0">'  + D.apply(this, arguments) + '<' + '/pre>';
-}
-
-/**
- * Quote HTML special chars
- * @return Text string with & " < > htmlentities-encoded
- */
-function Q(value)
-{
-	return typeof value == "undefined" ? "" : value.toString().replace(/&/g, '&amp;').replace(/\"/g, '&quot;').replace(new RegExp("<", "g"), '&lt;').replace(/>/g, '&gt;');
-}
-
-/**
- * String class: Replaces variables of the form {var} with values from given array
- * @param values Associative array containing values to fill in (optional)
- * @return Text string with variables replaced by their values
- */
-String.prototype.T = function(values)
-{
-	var result = this;
-
-	for (key in values)
-		result = result.replace(new RegExp("{" + key + "}", "g"), values[key]);
-
-	return result;
-}
-
-/**
- * Insert an event handler on top of chain
- * @param p.element Element to handle event for
- * @param p.event Name of event:'focus', 'click', ... (without 'on')
- * @param p.object Object that contains handler method
- * @param p.method Method of p.object to call on p.event
- */
-function it_event(p)
-{
-	var oldhandler = p.element["on" + p.event];
-
-	p.element["on" + p.event] = function(ev)
-	{
-		var pp = arguments.callee.p ? arguments.callee.p : p;
-		var oo = arguments.callee.oldhandler ? arguments.callee.oldhandler : oldhandler;
-
-		var result = pp.object[pp.method](ev ? ev : window.event, pp);
-
-		if (result && oo)
-			result = oo(ev);
-
-		return result;
-	}
-	p.element["on" + p.event].p = p;
-	p.element["on" + p.event].oldhandler = oldhandler;
-}
-
-function it_add_event(p)
-{
-	if (!p.object || !p.method)  // not enough arguments
-		return;
-	if (!p.element)
-		p.element = document;
-
-	if (!p.object._it_events)
-		p.object._it_events = [];
-	
-	var evt = p.event;
-	var key = p.event + '*' + p.method;
-	var p_closure = p;	// Needed for Konqueror 3.4.2 as p is (wrongly) shadowed by global input element named p
-	if (!p.object._it_events[key])
-		p.object._it_events[key] = function(e){ return p_closure.object[p_closure.method](e, p_closure); };
-
-	if (p.element.addEventListener)
-		p.element.addEventListener(evt, p.object._it_events[key], false);
-	else if (p.element.attachEvent)
-		p.element.attachEvent('on'+evt, p.object._it_events[key]);
-	else
-	{
-		p.element['on'+evt] = function(e)
-		{
-			var ret = true;
-			for (var k in p_closure.object._it_events)
-				if (p_closure.object._it_events[k] && k.indexOf(evt) == 0)
-					ret = p_closure.object._it_events[k](e);
-			return ret;
-		};
-	}
-}
-
-function it_remove_event(p)
-{
-	if (!p.element)
-		p.element = document;
-
-	var key = p.event + '*' + p.method;
-	if (p.object && p.object._it_events && p.object._it_events[key]) {
-		if (p.element.removeEventListener)
-			p.element.removeEventListener(p.event, p.object._it_events[key], false);
-		else if (p.element.detachEvent)
-			p.element.detachEvent('on'+p.event, p.object._it_events[key]);
-
-		p.object._it_events[key] = null;
-	}
-}
-
-/**
- * Prevent event propagation and bubbeling
- */
-function it_event_void(evt)
-{
-	var e = evt ? evt : window.event;
-	if (e.preventDefault)
-		e.preventDefault();
-	if (e.stopPropagation)
-		e.stopPropagation();
-
-	e.cancelBubble = true;
-	e.returnValue = false;
-	return false;
-}
-
-/* Get object pixel position. Based on quirksmode.org's code */
-function it_get_obj_x(obj)
-{       
-	if("getBoundingClientRect" in obj)
-		return obj.getBoundingClientRect().left + ((window.pageXOffset !== undefined) ? window.pageXOffset : (document.documentElement || document.body.parentNode || document.body).scrollLeft);
-	else
-	{
-		// legacy for Android 1.6
-		var curleft = 0;
-		if (obj.offsetParent)
-			while (obj)
-			{
-				curleft += obj.offsetLeft;
-				obj = obj.offsetParent;
-			}
-		else if (obj.x)
-			curleft += obj.x;
-		return curleft;
-	}
-}       
-
-function it_get_obj_y(obj)
-{	       
-	if("getBoundingClientRect" in obj)
-		return obj.getBoundingClientRect().top + ((window.pageYOffset !== undefined) ? window.pageYOffset : (document.documentElement || document.body.parentNode || document.body).scrollTop);
-	else
-	{
-		// legacy for Android 1.6
-		var curtop = 0;
-		if (obj.offsetParent)
-			while (obj)
-			{
-				curtop += obj.offsetTop;
-				obj = obj.offsetParent;
-			}
-		else if (obj.y)
-			curtop += obj.y;
-		return curtop;
-	}
-}
-
-/* Common accessor for dom elements */
-function it_find_obj(obj)
-{
-	if (document.getElementById)
-		return document.getElementById(obj);
-	else if (document.all)
-		return document.all[obj];
-	else if (document.layers)
-   		return document.layers[obj];
-	return null;
-}
-
-/* Get dom element by ID but always return a valid object */
-function it_element(label)
-{
-	var tmp = it_find_obj(label);
-	return tmp ? tmp : { style:{}, src:"", value:"", isundefined:true };
-}
-
-/* Get an iframe's content document in a compatible way */
-function it_get_iframe_document(iframe)
-{
-	return iframe.contentWindow ? iframe.contentWindow.document : iframe.contentDocument;
-}
-
-/* Create a new dom element and append to doc */
-function it_create_element(doc, type, init)
-{
-	var e = document.createElement(type);
-	it_set(e, init);
-	doc.appendChild(e);
-	return e;
-}
-
-/**
- * Copy attributes from src to dst in a recursive manner.
- * @param dst Destination object which gets attributes
- * @param src Source object containing attributes
- */
-function it_set(dst, src)
-{
-	if (dst)
-	{
-		for (var i in src)
-		{
-			if (typeof src[i] == 'object')
-			{
-				if (dst[i])
-					it_set(dst[i], src[i]);
-			}
-			else
-				dst[i] = src[i];
-		}
-	}
-}
-
-/**
- * Return the current timestamp
- */
-function it_now()
-{
-	return new Date().getTime();
-}
-
-/**
- * Encodes arbitrary string for use in an url
- * @param str string to be encoded
- */
-function it_url_encode(str)
-{
-	var result = window.encodeURIComponent ? encodeURIComponent(str) : escape(str).replace(/\+/g, "%2B");
-
-	return result.replace(/%20/gi, "+").replace(/%2C/gi, ",").replace(/%3B/gi, ";").replace(/%28/gi, "(").replace(/%29/gi, ")");
-}
-
-/**
- * Unicode-safe equivalent of unescape()
- * @param str string URL encoded string to be decoded
- */
-function it_url_decode(str)
-{
-	str = str.replace(/\+/g, '%20');
-
-	// catch URI malformed errors
-	try {
-		if (window.decodeURIComponent)
-			return decodeURIComponent(str);
-	}
-	catch(e) {}
-
-	return unescape(str);
-}
-
-/**
- * Patch PNG transparency for IE 5.5-6 on the given image
- */
-function it_pngfix(img, w, h, mode)
-{
-	var old_IE = navigator.platform == "Win32" && String(navigator.userAgent).match(/MSIE ((5\.5)|6)/);
-	if (img.src && img.src.match(/\.png($|\?)/) && old_IE) {
-		img.style.width = (w || img.width) + 'px';
-		img.style.height = (h || img.height) + 'px';
-		img.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='"+img.src+"',sizingMethod='"+(mode ? mode : 'crop')+"')";
-		img.src = '/images/0.gif';
-	}
-	else if (img && old_IE)
-		img.style.filter = 'none';
-}
-
diff --git a/itjs/loader.js b/itjs/loader.js
deleted file mode 100644
index 9fdb9a8..0000000
--- a/itjs/loader.js
+++ /dev/null
@@ -1,141 +0,0 @@
-/**
- * Create loader to request data from server
- * Uses it_http class for communication
- *
- * @param handler Object providing clear()/render() function when data arrives
- */
-function it_loader(handler)
-{
-	/* Clear cache etc. if completely new data */
-	this.http = null;
-	this.handler = handler;
-	this.callback = { object:this, method:'dataReady', errorhandler:'onerror' };
-	this.clear();
-}
-
-/* Methods */
-it_loader.prototype =
-{
-
-/* Clear cache and initialize handler */
-clear: function()
-{
-	/* Clear cache etc. if completely new data */
-	this.entry = new Array();
-	this.start = this.end = 0;
-	this.attr = { num: 0, loadtime: 0 };
-
-	if (this.handler.clear)
-		this.handler.clear();
-},
-
-load: function(baseurl, pos, num, query_volatile, retry)
-{
-	/* Convert to int */
-	pos -= 0;
-	num -= 0;
-
-	if (isNaN(retry))
-		retry = 0;
-
-	if (baseurl != this.baseurl)
-	{
-		this.clear();
-		this.baseurl = baseurl;
-		this.start = this.end = pos;
-	}
-
-	this.pos = pos;