Changeset 8815

Timestamp:

09/05/2008 04:29:03 PM (17 years ago)

Author:

azaozz

Message:

Add simple Chrome detection and updates for Gears dialog, fixes #7684

Location:

trunk

Files:

• wp-admin/admin-header.php (modified) (3 diffs)
• wp-admin/gears-manifest.php (modified) (2 diffs)
• wp-admin/js/wp-gears.js (modified) (4 diffs)
• wp-includes/script-loader.php (modified) (1 diff)
• wp-includes/vars.php (modified) (1 diff)

trunk/wp-admin/admin-header.php

@@ -101 +101 @@
     <h3 class="info-box-title"><?php _e('Gears Status'); ?></h3>
     <p><?php _e('Gears is installed on this computer, but is not enabled for use with WordPress.'); ?></p>
-    <p><?php
-
-    if ( $is_safari )
-        _e('To enable it, ensure this web site is not on the denied list in Gears Settings under the Safari menu, then click the button below.');
-    else
-        _e('To enable it, ensure this web site is not on the denied list in Gears Settings under your browser&#8217;s Tools menu, then click the button below.');
-
-    ?></p>
+    <p><?php _e('To enable it click the button below.'); ?></p>
     <p><strong><?php _e('However, Gears should not be enabled if this is a public or shared computer.'); ?></strong></p>
     <div class="submit"><button class="button" onclick="wpGears.getPermission();"><?php _e('Enable Gears'); ?></button>
@@ -118 +111 @@
     <p><?php
 
-    if ( $is_safari )
+    if ( $is_chrome )
+        _e('Gears is installed and enabled on this computer. You can disable it from your browser&#8217;s Options, Under the Hood menu.');
+    elseif ( $is_safari )
         _e('Gears is installed and enabled on this computer. You can disable it from the Safari menu.');
     else
@@ -125 +120 @@
     ?></p>
     <p><?php _e('If there are any errors try disabling Gears, reloading the page, and re-enabling Gears.'); ?></p>
-    <p><?php _e('Local storage status:'); ?> <span id="gears-wait"><span style="color:#f00;"><?php _e('Please wait! Updating files:'); ?></span> <span id="gears-upd-number"></span></span></p>
+    <p><?php _e('Local storage status:'); ?> <span id="gears-wait"><span style="color:#f00;"><?php _e('Updating files:'); ?></span> <span id="gears-upd-number"></span></span></p>
     <div class="submit"><button class="button" onclick="document.getElementById('gears-info-box').style.display='none';"><?php _e('Close'); ?></button></div>
     </div>
+
+    <div id="gears-msg4" style="display:none;">
+    <h3 class="info-box-title"><?php _e('Gears Status'); ?></h3>
+    <p><?php _e('This web site is denied to use Gears.'); ?></p>
+    <p><?php
+
+    if ( $is_chrome )
+        _e('To allow it, change the Gears settings from your browser&#8217;s Options, Under the Hood menu and reload this page.');
+    elseif ( $is_safari )
+        _e('To allow it, change the Gears settings from the Safari menu and reload this page.');
+    else
+        _e('To allow it, change the Gears settings from your browser&#8217;s Tools menu and reload this page.');
+
+    ?></p>
+    <p><strong><?php _e('However, Gears should not be enabled if this is a public or shared computer.'); ?></strong></p>
+    <div class="submit"><button class="button" onclick="document.getElementById('gears-info-box').style.display='none';"><?php _e('Cancel'); ?></button></div>
+    </div>
+    
     </div>
 <?php } ?>

trunk/wp-admin/gears-manifest.php

@@ -209 +209 @@
 { "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/template.htm?ver=311b" },
 { "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=311f" },
-{ "url" : "../wp-includes/js/tinymce/wp-mce-help.php?ver=311b" },
 
 { "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css?ver=311b" },
@@ -277 +276 @@
 { "url" : "../wp-includes/images/rss.png" },
 { "url" : "../wp-includes/js/thickbox/loadingAnimation.gif" },
-{ "url" : "../wp-includes/js/thickbox/tb-close.png" },
-{ "url" : "../wp-includes/js/swfupload/swfupload_f9.swf" }
+{ "url" : "../wp-includes/js/thickbox/tb-close.png" }
 ]}

trunk/wp-admin/js/wp-gears.js

@@ -11 +11 @@
         store.manifestUrl = "gears-manifest.php";
         store.checkForUpdate();
-        this.message();
+        this.message(3);
     },
 
     getPermission : function() {
+        var perm = true;
+        
         if ( 'undefined' != typeof google && google.gears ) {
             if ( ! google.gears.factory.hasPermission )
-                google.gears.factory.getPermission( 'WordPress', 'images/logo.gif' );
+                perm = google.gears.factory.getPermission( 'WordPress', 'images/logo.gif' );
 
-            try {
-                this.createStore();
-            } catch(e) {} // silence if canceled
+            if ( perm )
+                try { this.createStore(); } catch(e) { this.message(); } // silence if canceled
+            else
+                this.message(4);
         }
     },
@@ -35 +38 @@
 
     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');
+        var t = this, msg1 = t.I('gears-msg1'), msg2 = t.I('gears-msg2'), msg3 = t.I('gears-msg3'), msg4 = t.I('gears-msg4'), num = t.I('gears-upd-number'), wait = t.I('gears-wait');
 
         if ( ! msg1 ) return;
 
         if ( 'undefined' != typeof google && google.gears ) {
-            if ( google.gears.factory.hasPermission ) {
-                msg1.style.display = msg2.style.display = 'none';
+            if ( show && show == 4 ) {
+                msg1.style.display = msg2.style.display = msg3.style.display = 'none';
+                msg4.style.display = 'block';
+            } else if ( google.gears.factory.hasPermission ) {
+                msg1.style.display = msg2.style.display = msg4.style.display = 'none';
                 msg3.style.display = 'block';
 
@@ -51 +57 @@
                 store.onprogress = function(e){if(num) num.innerHTML = (' ' + e.filesComplete + ' / ' + e.filesTotal);};
             } else {
-                msg1.style.display = msg3.style.display = 'none';
+                msg1.style.display = msg3.style.display = msg4.style.display = 'none';
                 msg2.style.display = 'block';
             }
@@ -57 +63 @@
 
         if ( show ) t.I('gears-info-box').style.display = 'block';
+        else t.I('gears-info-box').style.display = 'none';
     },
 

trunk/wp-includes/script-loader.php

@@ -235 +235 @@
         ));
 
-        $scripts->add( 'wp-gears', '/wp-admin/js/wp-gears.js', false, '20080721' );
+        $scripts->add( 'wp-gears', '/wp-admin/js/wp-gears.js', false, '20080905' );
         $scripts->localize( 'wp-gears', 'wpGearsL10n', array(
             'updateCompleted' => __('Update completed.'),

trunk/wp-includes/vars.php

@@ -39 +39 @@
 if (strpos($_SERVER['HTTP_USER_AGENT'], 'Lynx') !== false) {
     $is_lynx = true;
+} elseif ( strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'chrome') !== false ) {
+    $is_chrome = true;
 } elseif ( strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'webkit') !== false ) {
     $is_safari = true;