create jquery-compat to hold deprecated jquery functions, load it before all the dependent js scripts

5 files changed, 77 insertions, 44 deletions

diff --git a/js/jquery-compat.js b/js/jquery-compat.js
new file mode 100644
index 000000000..7bf912542
--- /dev/null
+++ b/js/jquery-compat.js
@@ -0,0 +1,71 @@
+
+// provide jquery.browser so we can get rid of the migration toolkit
+
+jQuery.uaMatch = function( ua ) {
+	ua = ua.toLowerCase();
+
+	var match = /(chrome)[ \/]([\w.]+)/.exec( ua ) ||
+		/(webkit)[ \/]([\w.]+)/.exec( ua ) ||
+		/(opera)(?:.*version|)[ \/]([\w.]+)/.exec( ua ) ||
+		/(msie) ([\w.]+)/.exec( ua ) ||
+		ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( ua ) ||
+		[];
+
+	return {
+		browser: match[ 1 ] || "",
+		version: match[ 2 ] || "0"
+	};
+};
+
+
+// Don't clobber any existing jQuery.browser in case it's different
+if ( !jQuery.browser ) {
+	matched = jQuery.uaMatch( navigator.userAgent );
+	browser = {};
+
+	if ( matched.browser ) {
+		browser[ matched.browser ] = true;
+		browser.version = matched.version;
+	}
+
+	// Chrome is Webkit, but Webkit is also Safari.
+	if ( browser.chrome ) {
+		browser.webkit = true;
+	} else if ( browser.webkit ) {
+		browser.safari = true;
+	}
+
+	jQuery.browser = browser;
+}
+
+jQuery.fn.toggle = function( fn, fn2 ) {
+
+	// Don't mess with animation or css toggles
+	if ( !jQuery.isFunction( fn ) || !jQuery.isFunction( fn2 ) ) {
+		return oldToggle.apply( this, arguments );
+	}
+
+	// Save reference to arguments for access in closure
+	var args = arguments,
+		guid = fn.guid || jQuery.guid++,
+		i = 0,
+		toggler = function( event ) {
+			// Figure out which function to execute
+			var lastToggle = ( jQuery._data( this, "lastToggle" + fn.guid ) || 0 ) % i;
+			jQuery._data( this, "lastToggle" + fn.guid, lastToggle + 1 );
+
+			// Make sure that clicks stop
+			event.preventDefault();
+
+			// and execute the function
+			return args[ lastToggle ].apply( this, arguments ) || false;
+		};
+
+	// link all the functions, so any of them can unbind this click handler
+	toggler.guid = guid;
+	while ( i < args.length ) {
+		args[ i++ ].guid = guid;
+	}
+
+	return this.click( toggler );
+};
diff --git a/js/main.js b/js/main.js
index e1769f77a..f9dc95daa 100644
--- a/js/main.js
+++ b/js/main.js
@@ -1203,42 +1203,3 @@ function zid(s) {
 	s = s + achar + 'f=&zid=' + zid;
 	return s;
 }
-
-// provide jquery.browser so we can get rid of the migration toolkit
-
-jQuery.uaMatch = function( ua ) {
-	ua = ua.toLowerCase();
-
-	var match = /(chrome)[ \/]([\w.]+)/.exec( ua ) ||
-		/(webkit)[ \/]([\w.]+)/.exec( ua ) ||
-		/(opera)(?:.*version|)[ \/]([\w.]+)/.exec( ua ) ||
-		/(msie) ([\w.]+)/.exec( ua ) ||
-		ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( ua ) ||
-		[];
-
-	return {
-		browser: match[ 1 ] || "",
-		version: match[ 2 ] || "0"
-	};
-};
-
-
-// Don't clobber any existing jQuery.browser in case it's different
-if ( !jQuery.browser ) {
-	matched = jQuery.uaMatch( navigator.userAgent );
-	browser = {};
-
-	if ( matched.browser ) {
-		browser[ matched.browser ] = true;
-		browser.version = matched.version;
-	}
-
-	// Chrome is Webkit, but Webkit is also Safari.
-	if ( browser.chrome ) {
-		browser.webkit = true;
-	} else if ( browser.webkit ) {
-		browser.safari = true;
-	}
-
-	jQuery.browser = browser;
-}
diff --git a/version.inc b/version.inc
index 65cc36208..761c49939 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2013-11-25.508
+2013-11-26.509
diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index c33187797..1ba8d18a4 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -11,7 +11,8 @@ head_add_css('library/colorbox/colorbox.css');
 // head_add_css('library/font_awesome/css/font-awesome.min.css');
 
 head_add_js('js/jquery.js');
-// head_add_js('js/jquery-migrate-1.1.1.js');
+//head_add_js('js/jquery-migrate-1.1.1.js');
+head_add_js('js/jquery-compat.js');
 head_add_js('js/spin.js');
 head_add_js('js/jquery.spin.js');
 head_add_js('js/jquery.textinputs.js');
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index ce3bfaee9..4b7925ba9 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1978,7 +1978,7 @@ a.mail-list-link {
 	display: block;
 	color: #FFFFFF;
 	margin-top: 15px;
-	background-color: #F80000;
+	background-color: $nav_bg_2;
 	-webkit-border-radius: $radiuspx ;
 	-moz-border-radius: $radiuspx;
 	border-radius: $radiuspx;
@@ -3002,7 +3002,7 @@ div.jGrowl div.info {
 	width: 90%;
 }
 
-
+a.rconnect,
 nav a,
 nav a:active,
 nav a:visited,
@@ -3012,7 +3012,7 @@ nav a:link {
   outline: none;
 }
 
-nav a:hover {
+a.rconnect:hover, nav a:hover {
 	color: #0080FF;
 }
 nav .fakelink {