Merged missed versions, theme working again

app/OmnomIRC.js

@@ -1,19 +1,27 @@
 #!node
+process.chdir(__dirname);
 var fs = require('fs'),
 	url = require('url'),
 	path = require('path'),
 	vm = require('vm'),
 	toobusy = function(){return false;},//require('toobusy'),
 	cluster = require('cluster'),
-	options = (function(){
+	options = global.options = (function(){
 		var defaults = {
 				port: 80,
 				loglevel: 3,
 				redis: {
 					port: 6379,
 					host: 'localhost'
+				},
+				debug: false,
+				paths: {
+					www: './www/',
+					api: './api/',
+					plugins: './plugins/'
 				}
 			},
+			i,
 			options;
 		try{
 			options = JSON.parse(fs.readFileSync('./options.json'));
@@ -21,9 +29,17 @@ var fs = require('fs'),
 				defaults[i] = options[i];
 			}
 		}catch(e){
-			console.warn('Using default settings. Please create options.js');
+			console.warn('Using default settings. Please create options.json');
 		}
-		return defaults;
+		options = {};
+		for(i in  defaults){
+			Object.defineProperty(options,i,{
+				value: defaults[i],
+				enumerable: true,
+				writable: false
+			});
+		}
+		return options;
 	})();
 if(typeof fs.existsSync == 'undefined') fs.existsSync = path.existsSync; // legacy support
 if(cluster.isMaster){
@@ -33,6 +49,14 @@ if(cluster.isMaster){
 	cluster.on('exit', function(worker, code, signal) {
 		console.log('worker ' + worker.process.pid + ' died');
 	});
+	if(options.debug){
+		require('repl').start({
+			prompt: '> ',
+			useGlobal: true
+		}).on('exit',function(){
+			process.exit();
+		});
+	}
 }else{
 	var RedisStore = require('socket.io/lib/stores/redis'),
 		redis  = require('socket.io/node_modules/redis'),
@@ -103,7 +127,7 @@ if(cluster.isMaster){
 					},
 					filepath = unescape(uri);
 				if(filepath.substr(0,5) == '/api/'){
-					filepath = path.join('./api/',filepath.substr(5));
+					filepath = path.join(options.paths.api,filepath.substr(5));
 					logger.debug('Attempting to run api script '+filepath);
 					if(fs.existsSync(filepath)){
 						fs.readFile(filepath,function(e,data){
@@ -144,7 +168,7 @@ if(cluster.isMaster){
 						res.end('null;');
 					}
 				}else{
-					serveFile(path.join('./www/',filepath),req,res);
+					serveFile(path.join(options.paths.www,filepath),req,res);
 				}
 			}).resume();
 		}).listen(options.port),
@@ -169,8 +193,7 @@ if(cluster.isMaster){
 			socket.join(data.name);
 			data.title = data.name;
 			socket.emit('join',{
-				name: data.name,
-				title: data.title
+				name: data.name
 			});
 			sendUserList(data.name);
 			socket.get('nick',function(e,nick){
@@ -215,7 +238,7 @@ if(cluster.isMaster){
 				i;
 			runWithUserList(data.name,function(users){
 				var temp = [],i;
-				for(i in users) i && temp.push(users[i]);
+				for(i in users) i && i != null && temp.push(users[i]);
 				users = temp;
 				socket.emit('message',{
 					message: data.name+" users:\n\t\t"+users.join("\n\t\t"),
@@ -242,8 +265,7 @@ if(cluster.isMaster){
 							sockets[i].get('nick',function(e,nick){
 								if(e){
 									logger.error(e);
-									ret.push('');
-								}else{
+								}else if(!inArray(ret,nick)){
 									logger.debug(room+' '+nick);
 									ret.push(nick);
 								}
@@ -256,6 +278,14 @@ if(cluster.isMaster){
 					};
 				getNext();
 			},
+			inArray = function(arr,val){
+				for(var i in arr){
+					if(arr[i] == val){
+						return true;
+					}
+				}
+				return false;
+			},
 			sendUserList = function(room){
 				if(typeof room != 'undefined'){
 					runWithUserList(room,function(users){

app/www/css/style.css

@@ -45,6 +45,7 @@ html,body{
     line-height: 17px;
     margin-top: 0;
     display: block;
+	cursor: pointer;
 }
 .close-button:hover{
 	color: red;
@@ -73,7 +74,7 @@ html,body{
 	display: table-cell;
 	text-align: right;
 }
-#content{
+#content,#console-log{
 	width: 100%;
 	height: calc(100% - 61px);
 	top: 41px;
@@ -97,6 +98,22 @@ html,body{
 	text-shadow: 0 0 4px rgba(0, 40, 170, 0.5);
 }
 
+#console-log{
+    font-size: 14px;
+	display: none;
+}
+#console-log-pre{
+	height: 100%;
+	margin: 0;
+	padding: 2px;
+}
+#console-log-controls{
+	position: absolute;
+	bottom: 22px;
+	width: 100%;
+	overflow: hidden;
+}
+
 #settings,#users{
 	font-family: Arial,Liberation Sans,DejaVu Sans,sans-serif;
 	font-size: 12px;
@@ -111,6 +128,12 @@ html,body{
 #settings span,#users span{
 	cursor: pointer;
 }
+#settings.open span,#users.open.span{
+	cursor: default;
+}
+#settings.open span.close-button,#users.open span.close-button{
+	cursor: pointer;
+}
 #users{
 	right: 0;
 	width: 36px;
@@ -191,14 +214,14 @@ html,body{
 	font-variant: small-caps;
 }
 
-#content,#head,#users,#entry,#input,#send,#settings{
+#console-log,#content,#head,#users,#entry,#input,#send,#settings{
  	border-color: rgba(102, 153, 255, 0.6);
  	border-top-color: rgba(102, 153, 255, 0.9);
 	border-width: 1px;
 	position: absolute;
 	overflow: hidden;
 }
-#content{
+#console-log,#content{
 	overflow-y: scroll;
 }
 #users,#input,#send,#settings{
@@ -228,7 +251,7 @@ html,body{
 	font-family: Arial,Liberation Sans,DejaVu Sans,sans-serif;
 	font-size: 15px;
 }
-#user-list li:nth-child(even) {
+#user-list li:nth-child(even){
     background-color: #DFEFFF;
     border: solid 1px #6699ff;
     border-left: 0px;

app/www/index.html

@@ -3,11 +3,11 @@
 	<head>
 		<title>OmnomIRC3</title>
 		<meta charset='utf-8'> 
-		<script type="text/javascript" src="js/console-shim-min.js"></script>
+		<script type="text/javascript" src="js/consoleshim.js"></script>
 		<script type="text/javascript" src="js/html5shiv.js"></script>
 		<script type="text/javascript" src="js/html5shiv-printshiv.js"></script>
 		<script src="http://bestiejs.github.io/json3/lib/json3.js"></script>
-		<script type="text/javascript" src="js/jquery-1.10.1.min.js"></script>
+		<script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>
 		<script type="text/javascript" src="js/jquery.hoverIntent.minified.js"></script>
 		<script type="text/javascript" src="js/jquery.timeago.js"></script>
 		<script type="text/javascript" src="js/jquery.ui.position.js"></script>
@@ -48,5 +48,6 @@
 				<ul id="settings-list"></ul>
 			</div>
 		</div>
+		<div id="console-log"></div>
 	</body>
 </html>

app/www/js/console-shim-min.js

@@ -1,12 +0,0 @@
-/*
- console-shim 1.0.2
- https://github.com/kayahr/console-shim
- Copyright (C) 2011 Klaus Reimer <[email protected]>
- Licensed under the MIT license
- (See http://www.opensource.org/licenses/mit-license)
-*/
-'use strict';function f(){return function(){}}
-(function(){function c(a,l,b){var c=Array.prototype.slice.call(arguments,2);return function(){var b=c.concat(Array.prototype.slice.call(arguments,0));a.apply(l,b)}}window.console||(window.console={});var a=window.console;if(!a.log)if(window.log4javascript){var b=log4javascript.getDefaultLogger();a.log=c(b.info,b);a.debug=c(b.debug,b);a.info=c(b.info,b);a.warn=c(b.warn,b);a.error=c(b.error,b)}else a.log=f();a.debug||(a.debug=a.log);a.info||(a.info=a.log);a.warn||(a.warn=a.log);a.error||(a.error=a.log);
-if(null!=window.__consoleShimTest__||eval("/*@cc_on @_jscript_version \x3c\x3d 9@*/"))b=function(d){var b,e,c;d=Array.prototype.slice.call(arguments,0);c=d.shift();e=d.length;if(1<e&&!1!==window.__consoleShimTest__){"string"!=typeof d[0]&&(d.unshift("%o"),e+=1);for(b=(b=d[0].match(/%[a-z]/g))?b.length+1:1;b<e;b+=1)d[0]+=" %o"}Function.apply.call(c,a,d)},a.log=c(b,window,a.log),a.debug=c(b,window,a.debug),a.info=c(b,window,a.info),a.warn=c(b,window,a.warn),a.error=c(b,window,a.error);a.assert||(a.assert=
-function(){var d=Array.prototype.slice.call(arguments,0);d.shift()||(d[0]="Assertion failed: "+d[0],a.error.apply(a,d))});a.dir||(a.dir=a.log);a.dirxml||(a.dirxml=a.log);a.exception||(a.exception=a.error);if(!a.time||!a.timeEnd){var g={};a.time=function(a){g[a]=(new Date).getTime()};a.timeEnd=function(b){var c=g[b];c&&(a.log(b+": "+((new Date).getTime()-c)+"ms"),delete g[b])}}a.table||(a.table=function(b,c){var e,g,j,h,k;if(b&&b instanceof Array&&b.length){if(!c||!(c instanceof Array))for(e in c=
-[],b[0])b[0].hasOwnProperty(e)&&c.push(e);e=0;for(g=b.length;e<g;e+=1){j=[];h=0;for(k=c.length;h<k;h+=1)j.push(b[e][c[h]]);Function.apply.call(a.log,a,j)}}});a.clear||(a.clear=f());a.trace||(a.trace=f());a.group||(a.group=f());a.groupCollapsed||(a.groupCollapsed=f());a.groupEnd||(a.groupEnd=f());a.timeStamp||(a.timeStamp=f());a.profile||(a.profile=f());a.profileEnd||(a.profileEnd=f());a.count||(a.count=f())})();

app/www/js/consoleshim.js

@@ -0,0 +1,54 @@
+(function(window,undefined){
+    "use strict";
+	var deepCopy = function(p,c) {
+			c = c||{};
+			for (var i in p) {
+				if (typeof p[i] === 'object') {
+					c[i] = (p[i].constructor === Array)?[]:{};
+					deepCopy(p[i],c[i]);
+				}else{
+					c[i] = p[i];
+				}
+			}
+			return c;
+		},
+		oC = typeof console != 'undefined' ? deepCopy(console) : {},
+		i,
+		console = window.console,
+        noop = function(){},
+		a = ['log','info','debug','error','warn'];
+	console._call = function(index,name,args){
+		console._old[index].apply(window,args);
+		var d = $('#console-log'),
+		msg = name+': '+Array.prototype.slice.call(args,0).join("\t");
+		if(d.children().length === 0){
+			d.css({
+				margin: 0,
+				padding: 0
+			}).append($('<pre>').attr('id','console-log-pre'));
+		}
+		d.children('pre').each(function(){
+			$(this).html($(this).html()+""+msg+"<br/>").scrollTop($(this).height());
+		});
+		return msg;
+	};
+	console._old = [];
+	for(i=0;i<a.length;i++){
+		var name = a[i],
+			index = i;
+		console._old.push(oC[name] || noop);
+		if(a[i] != 'error'){
+			console[name] = function(){
+				return console._call(index,name.toUpperCase(),arguments)
+			}
+		}else{
+			console[name] = function(){
+				var args;
+				for(var i in arguments){
+					args.push(arguments[i].message);
+				}
+				return console._call(index,name.toUpperCase(),args)
+			}
+		}
+	}
+})(window);

app/www/js/jquery-1.10.1.js → app/www/js/jquery-1.10.2.js

@@ -1,5 +1,5 @@
 /*!
- * jQuery JavaScript Library v1.10.1
+ * jQuery JavaScript Library v1.10.2
  * http://jquery.com/
  *
  * Includes Sizzle.js
@@ -9,7 +9,7 @@
  * Released under the MIT license
  * http://jquery.org/license
  *
- * Date: 2013-05-30T21:49Z
+ * Date: 2013-07-03T13:48Z
  */
 (function( window, undefined ) {
 
@@ -46,7 +46,7 @@ var
 	// List of deleted data cache ids, so we can reuse them
 	core_deletedIds = [],
 
-	core_version = "1.10.1",
+	core_version = "1.10.2",
 
 	// Save a reference to some core methods
 	core_concat = core_deletedIds.concat,
@@ -1000,14 +1000,14 @@ function isArraylike( obj ) {
 // All jQuery objects should point back to these
 rootjQuery = jQuery(document);
 /*!
- * Sizzle CSS Selector Engine v1.9.4-pre
+ * Sizzle CSS Selector Engine v1.10.2
  * http://sizzlejs.com/
  *
  * Copyright 2013 jQuery Foundation, Inc. and other contributors
  * Released under the MIT license
  * http://jquery.org/license
  *
- * Date: 2013-05-27
+ * Date: 2013-07-03
  */
 (function( window, undefined ) {
 
@@ -1040,7 +1040,13 @@ var i,
 	tokenCache = createCache(),
 	compilerCache = createCache(),
 	hasDuplicate = false,
-	sortOrder = function() { return 0; },
+	sortOrder = function( a, b ) {
+		if ( a === b ) {
+			hasDuplicate = true;
+			return 0;
+		}
+		return 0;
+	},
 
 	// General-purpose constants
 	strundefined = typeof undefined,
@@ -1283,14 +1289,6 @@ function Sizzle( selector, context, results, seed ) {
 	return select( selector.replace( rtrim, "$1" ), context, results, seed );
 }
 
-/**
- * For feature detection
- * @param {Function} fn The function to test for native support
- */
-function isNative( fn ) {
-	return rnative.test( fn + "" );
-}
-
 /**
  * Create key-value caches of limited size
  * @returns {Function(string, Object)} Returns the Object data after storing it on itself with
@@ -1344,58 +1342,14 @@ function assert( fn ) {
 /**
  * Adds the same handler for all of the specified attrs
  * @param {String} attrs Pipe-separated list of attributes
- * @param {Function} handler The method that will be applied if the test fails
- * @param {Boolean} test The result of a test. If true, null will be set as the handler in leiu of the specified handler
+ * @param {Function} handler The method that will be applied
  */
-function addHandle( attrs, handler, test ) {
-	attrs = attrs.split("|");
-	var current,
-		i = attrs.length,
-		setHandle = test ? null : handler;
+function addHandle( attrs, handler ) {
+	var arr = attrs.split("|"),
+		i = attrs.length;
 
 	while ( i-- ) {
-		// Don't override a user's handler
-		if ( !(current = Expr.attrHandle[ attrs[i] ]) || current === handler ) {
-			Expr.attrHandle[ attrs[i] ] = setHandle;
-		}
-	}
-}
-
-/**
- * Fetches boolean attributes by node
- * @param {Element} elem
- * @param {String} name
- */
-function boolHandler( elem, name ) {
-	// XML does not need to be checked as this will not be assigned for XML documents
-	var val = elem.getAttributeNode( name );
-	return val && val.specified ?
-		val.value :
-		elem[ name ] === true ? name.toLowerCase() : null;
-}
-
-/**
- * Fetches attributes without interpolation
- * http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
- * @param {Element} elem
- * @param {String} name
- */
-function interpolationHandler( elem, name ) {
-	// XML does not need to be checked as this will not be assigned for XML documents
-	return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 );
-}
-
-/**
- * Uses defaultValue to retrieve value in IE6/7
- * @param {Element} elem
- * @param {String} name
- */
-function valueHandler( elem ) {
-	// Ignore the value *property* on inputs by using defaultValue
-	// Fallback to Sizzle.attr by returning undefined where appropriate
-	// XML does not need to be checked as this will not be assigned for XML documents
-	if ( elem.nodeName.toLowerCase() === "input" ) {
-		return elem.defaultValue;
+		Expr.attrHandle[ arr[i] ] = handler;
 	}
 }
 
@@ -1403,7 +1357,7 @@ function valueHandler( elem ) {
  * Checks document order of two siblings
  * @param {Element} a
  * @param {Element} b
- * @returns Returns -1 if a precedes b, 1 if a follows b
+ * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b
  */
 function siblingCheck( a, b ) {
 	var cur = b && a,
@@ -1493,7 +1447,7 @@ support = Sizzle.support = {};
  */
 setDocument = Sizzle.setDocument = function( node ) {
 	var doc = node ? node.ownerDocument || node : preferredDoc,
-		parent = doc.parentWindow;
+		parent = doc.defaultView;
 
 	// If no document and documentElement is available, return
 	if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
@@ -1510,7 +1464,8 @@ setDocument = Sizzle.setDocument = function( node ) {
 	// Support: IE>8
 	// If iframe document is assigned to "document" variable and if iframe has been reloaded,
 	// IE will throw "permission denied" error when accessing "document" variable, see jQuery #13936
-	if ( parent && parent.frameElement ) {
+	// IE6-8 do not support the defaultView property so parent will be undefined
+	if ( parent && parent.attachEvent && parent !== parent.top ) {
 		parent.attachEvent( "onbeforeunload", function() {
 			setDocument();
 		});
@@ -1522,32 +1477,10 @@ setDocument = Sizzle.setDocument = function( node ) {
 	// Support: IE<8
 	// Verify that getAttribute really returns attributes and not properties (excepting IE8 booleans)
 	support.attributes = assert(function( div ) {
-
-		// Support: IE<8
-		// Prevent attribute/property "interpolation"
-		div.innerHTML = "<a href='#'></a>";
-		addHandle( "type|href|height|width", interpolationHandler, div.firstChild.getAttribute("href") === "#" );
-
-		// Support: IE<9
-		// Use getAttributeNode to fetch booleans when getAttribute lies
-		addHandle( booleans, boolHandler, div.getAttribute("disabled") == null );
-
 		div.className = "i";
 		return !div.getAttribute("className");
 	});
 
-	// Support: IE<9
-	// Retrieving value should defer to defaultValue
-	support.input = assert(function( div ) {
-		div.innerHTML = "<input>";
-		div.firstChild.setAttribute( "value", "" );
-		return div.firstChild.getAttribute( "value" ) === "";
-	});
-
-	// IE6/7 still return empty string for value,
-	// but are actually retrieving the property
-	addHandle( "value", valueHandler, support.attributes && support.input );
-
 	/* getElement(s)By*
 	---------------------------------------------------------------------- */
 
@@ -1656,7 +1589,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 	// See http://bugs.jquery.com/ticket/13378
 	rbuggyQSA = [];
 
-	if ( (support.qsa = isNative(doc.querySelectorAll)) ) {
+	if ( (support.qsa = rnative.test( doc.querySelectorAll )) ) {
 		// Build QSA regex
 		// Regex strategy adopted from Diego Perini
 		assert(function( div ) {
@@ -1708,7 +1641,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 		});
 	}
 
-	if ( (support.matchesSelector = isNative( (matches = docElem.webkitMatchesSelector ||
+	if ( (support.matchesSelector = rnative.test( (matches = docElem.webkitMatchesSelector ||
 		docElem.mozMatchesSelector ||
 		docElem.oMatchesSelector ||
 		docElem.msMatchesSelector) )) ) {
@@ -1734,7 +1667,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 	// Element contains another
 	// Purposefully does not implement inclusive descendent
 	// As in, an element does not contain itself
-	contains = isNative(docElem.contains) || docElem.compareDocumentPosition ?
+	contains = rnative.test( docElem.contains ) || docElem.compareDocumentPosition ?
 		function( a, b ) {
 			var adown = a.nodeType === 9 ? a.documentElement : a,
 				bup = b && b.parentNode;
@@ -1758,13 +1691,6 @@ setDocument = Sizzle.setDocument = function( node ) {
 	/* Sorting
 	---------------------------------------------------------------------- */
 
-	// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27)
-	// Detached nodes confoundingly follow *each other*
-	support.sortDetached = assert(function( div1 ) {
-		// Should return 1, but returns 4 (following)
-		return div1.compareDocumentPosition( doc.createElement("div") ) & 1;
-	});
-
 	// Document order sorting
 	sortOrder = docElem.compareDocumentPosition ?
 	function( a, b ) {
@@ -1907,9 +1833,9 @@ Sizzle.attr = function( elem, name ) {
 
 	var fn = Expr.attrHandle[ name.toLowerCase() ],
 		// Don't get fooled by Object.prototype properties (jQuery #13807)
-		val = ( fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ?
+		val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ?
 			fn( elem, name, !documentIsHTML ) :
-			undefined );
+			undefined;
 
 	return val === undefined ?
 		support.attributes || !documentIsHTML ?
@@ -2454,6 +2380,8 @@ Expr = Sizzle.selectors = {
 	}
 };
 
+Expr.pseudos["nth"] = Expr.pseudos["eq"];
+
 // Add button/input type pseudos
 for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
 	Expr.pseudos[ i ] = createInputPseudo( i );
@@ -2462,6 +2390,11 @@ for ( i in { submit: true, reset: true } ) {
 	Expr.pseudos[ i ] = createButtonPseudo( i );
 }
 
+// Easy API for creating new setFilters
+function setFilters() {}
+setFilters.prototype = Expr.filters = Expr.pseudos;
+Expr.setFilters = new setFilters();
+
 function tokenize( selector, parseOnly ) {
 	var matched, match, tokens, type,
 		soFar, groups, preFilters,
@@ -2973,26 +2906,67 @@ function select( selector, context, results, seed ) {
 	return results;
 }
 
-// Deprecated
-Expr.pseudos["nth"] = Expr.pseudos["eq"];
-
-// Easy API for creating new setFilters
-function setFilters() {}
-setFilters.prototype = Expr.filters = Expr.pseudos;
-Expr.setFilters = new setFilters();
-
 // One-time assignments
 
 // Sort stability
 support.sortStable = expando.split("").sort( sortOrder ).join("") === expando;
 
+// Support: Chrome<14
+// Always assume duplicates if they aren't passed to the comparison function
+support.detectDuplicates = hasDuplicate;
+
 // Initialize against the default document
 setDocument();
 
-// Support: Chrome<<14
-// Always assume duplicates if they aren't passed to the comparison function
-[0, 0].sort( sortOrder );
-support.detectDuplicates = hasDuplicate;
+// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27)
+// Detached nodes confoundingly follow *each other*
+support.sortDetached = assert(function( div1 ) {
+	// Should return 1, but returns 4 (following)
+	return div1.compareDocumentPosition( document.createElement("div") ) & 1;
+});
+
+// Support: IE<8
+// Prevent attribute/property "interpolation"
+// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
+if ( !assert(function( div ) {
+	div.innerHTML = "<a href='#'></a>";
+	return div.firstChild.getAttribute("href") === "#" ;
+}) ) {
+	addHandle( "type|href|height|width", function( elem, name, isXML ) {
+		if ( !isXML ) {
+			return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 );
+		}
+	});
+}
+
+// Support: IE<9
+// Use defaultValue in place of getAttribute("value")
+if ( !support.attributes || !assert(function( div ) {
+	div.innerHTML = "<input/>";
+	div.firstChild.setAttribute( "value", "" );
+	return div.firstChild.getAttribute( "value" ) === "";
+}) ) {
+	addHandle( "value", function( elem, name, isXML ) {
+		if ( !isXML && elem.nodeName.toLowerCase() === "input" ) {
+			return elem.defaultValue;
+		}
+	});
+}
+
+// Support: IE<9
+// Use getAttributeNode to fetch booleans when getAttribute lies
+if ( !assert(function( div ) {
+	return div.getAttribute("disabled") == null;
+}) ) {
+	addHandle( booleans, function( elem, name, isXML ) {
+		var val;
+		if ( !isXML ) {
+			return (val = elem.getAttributeNode( name )) && val.specified ?
+				val.value :
+				elem[ name ] === true ? name.toLowerCase() : null;
+		}
+	});
+}
 
 jQuery.find = Sizzle;
 jQuery.expr = Sizzle.selectors;
@@ -3177,9 +3151,9 @@ jQuery.Callbacks = function( options ) {
 			},
 			// Call all callbacks with the given context and arguments
 			fireWith: function( context, args ) {
-				args = args || [];
-				args = [ context, args.slice ? args.slice() : args ];
 				if ( list && ( !fired || stack ) ) {
+					args = args || [];
+					args = [ context, args.slice ? args.slice() : args ];
 					if ( firing ) {
 						stack.push( args );
 					} else {
@@ -4183,8 +4157,11 @@ jQuery.fn.extend({
 	},
 
 	toggleClass: function( value, stateVal ) {
-		var type = typeof value,
-			isBool = typeof stateVal === "boolean";
+		var type = typeof value;
+
+		if ( typeof stateVal === "boolean" && type === "string" ) {
+			return stateVal ? this.addClass( value ) : this.removeClass( value );
+		}
 
 		if ( jQuery.isFunction( value ) ) {
 			return this.each(function( i ) {
@@ -4198,13 +4175,15 @@ jQuery.fn.extend({
 				var className,
 					i = 0,
 					self = jQuery( this ),
-					state = stateVal,
 					classNames = value.match( core_rnotwhite ) || [];
 
 				while ( (className = classNames[ i++ ]) ) {
 					// check each className given, space separated list
-					state = isBool ? state : !self.hasClass( className );
-					self[ state ? "addClass" : "removeClass" ]( className );
+					if ( self.hasClass( className ) ) {
+						self.removeClass( className );
+					} else {
+						self.addClass( className );
+					}
 				}
 
 			// Toggle whole class name
@@ -6948,10 +6927,12 @@ jQuery.fn.extend({
 		return showHide( this );
 	},
 	toggle: function( state ) {
-		var bool = typeof state === "boolean";
+		if ( typeof state === "boolean" ) {
+			return state ? this.show() : this.hide();
+		}
 
 		return this.each(function() {
-			if ( bool ? state : isHidden( this ) ) {
+			if ( isHidden( this ) ) {
 				jQuery( this ).show();
 			} else {
 				jQuery( this ).hide();
@@ -6982,6 +6963,7 @@ jQuery.extend({
 		"fontWeight": true,
 		"lineHeight": true,
 		"opacity": true,
+		"order": true,
 		"orphans": true,
 		"widows": true,
 		"zIndex": true,