Changeset 10031

Timestamp:

12/04/2008 06:35:21 AM (17 years ago)

Author:

azaozz

Message:

Do not show the Turbo link in the header if Gears is already being used, props markjaquith, fixes #8276

Location:

trunk

Files:

• wp-admin/admin-header.php (modified) (1 diff)
• wp-admin/js/common.js (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/admin-header.php

@@ -100 +100 @@
 <div id="user_info">
 <p><?php printf(__('Howdy, <a href="%1$s" title="Edit your profile">%2$s</a>'), 'profile.php', $user_identity) ?>
-<?php if ( ! $is_opera ) { ?> | <span id="gears-menu"><a href="tools.php"><?php _e('Turbo') ?></a></span><?php } ?> |
+<?php if ( ! $is_opera ) { ?><span class="turbo-nag hidden"> | <a href="tools.php"><?php _e('Turbo') ?></a></span><?php } ?> |
 <a href="<?php echo wp_logout_url() ?>" title="<?php _e('Log Out') ?>"><?php _e('Log Out'); ?></a></p>
 </div>

trunk/wp-admin/js/common.js

@@ -350 +350 @@
 
 })(jQuery);
+
+
+jQuery(document).ready(function($){
+    if ( 'undefined' != typeof google && google.gears ) return;
+    
+    var gf = false;
+    if ( 'undefined' != typeof GearsFactory ) {
+        gf = new GearsFactory();
+    } else {
+        try {
+            gf = new ActiveXObject('Gears.Factory');
+            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 && gf.hasPermission )
+        return;
+        
+    $('.turbo-nag').show();
+});

trunk/wp-includes/script-loader.php

@@ -42 +42 @@
     $scripts->default_version = get_bloginfo( 'version' );
 
-    $scripts->add( 'common', '/wp-admin/js/common.js', array('jquery', 'hoverIntent'), '20081126' );
+    $scripts->add( 'common', '/wp-admin/js/common.js', array('jquery', 'hoverIntent'), '20081203' );
     $scripts->add( 'sack', '/wp-includes/js/tw-sack.js', false, '1.6.1' );