Merge with WP revision 8635

git-svn-id: http://svn.automattic.com/wordpress-mu/branches/2.6@1421 7be80a69-a1ef-0310-a953-fb0f7c49ff36

2 files changed, 25 insertions, 16 deletions

diff --git a/wp-admin/js/forms.js b/wp-admin/js/forms.js
index 5d6c35d..efd56a7 100644
--- a/wp-admin/js/forms.js
+++ b/wp-admin/js/forms.js
@@ -1,5 +1,5 @@
 function checkAll(jQ) { // use attr( checked, fn )
-	jQuery(jQ).find( 'tbody :checkbox' ).attr( 'checked', function() {
+	jQuery(jQ).find( 'tbody:visible :checkbox' ).attr( 'checked', function() {
 		return jQuery(this).attr( 'checked' ) ? '' : 'checked';
 	} );
 }
@@ -23,4 +23,4 @@ jQuery( function($) {
 	$( 'thead :checkbox' ).click( function() {
 		checkAll( $(this).parents( 'form:first' ) );
 	} );
-} );
\ No newline at end of file
+} );
diff --git a/wp-admin/js/wp-gears.js b/wp-admin/js/wp-gears.js
index 22b5c00..20c8aa2 100644
--- a/wp-admin/js/wp-gears.js
+++ b/wp-admin/js/wp-gears.js
@@ -25,15 +25,15 @@ wpGears = {
 	},
 
 	storeName : function() {
-      var name = window.location.protocol + window.location.host;
+		var name = window.location.protocol + window.location.host;
 
-      name = name.replace(/[\/\\:*"?<>|;,]+/g, '_'); // gears beta doesn't allow certain chars in the store name
-	  name = 'wp_' + name.substring(0, 60); // max length of name is 64 chars
+		name = name.replace(/[\/\\:*"?<>|;,]+/g, '_'); // gears beta doesn't allow certain chars in the store name
+		name = 'wp_' + name.substring(0, 60); // max length of name is 64 chars
 
-      return name;
-    },
+		return name;
+	},
 
-    message : function(show) {
+	message : function(show) {
 		var t = this, msg1 = t.I('gears-msg1'), msg2 = t.I('gears-msg2'), msg3 = t.I('gears-msg3'), num = t.I('gears-upd-number'), wait = t.I('gears-wait');
 
 		if ( ! msg1 ) return;
@@ -61,23 +61,32 @@ wpGears = {
 	I : function(id) {
 		return document.getElementById(id);
 	}
-}
+};
 
-function gearsInit() {
+(function() {
 	if ( 'undefined' != typeof google && google.gears ) return;
 
 	var gf = false;
-	if ( 'undefined' != typeof GearsFactory ) { // Firefox
+	if ( 'undefined' != typeof GearsFactory ) {
 		gf = new GearsFactory();
-	} else { // IE
+	} else {
 		try {
 			gf = new ActiveXObject('Gears.Factory');
-		} catch (e) {}
+			if ( factory.getBuildInfo().indexOf('ie_mobile') != -1 )
+				gf.privateSetGlobalObject(this);
+		} catch (e) {
+			if ( ( 'undefined' != typeof navigator.mimeTypes ) && navigator.mimeTypes['application/x-googlegears'] ) {
+				gf = document.createElement("object");
+				gf.style.display = "none";
+				gf.width = 0;
+				gf.height = 0;
+				gf.type = "application/x-googlegears";
+				document.documentElement.appendChild(gf);
+			}
+		}
 	}
 
 	if ( ! gf ) return;
 	if ( 'undefined' == typeof google ) google = {};
 	if ( ! google.gears ) google.gears = { factory : gf };
-}
-
-gearsInit();
+})();