<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[13981] trunk: Remove Gears from UI.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13981">13981</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-04-04 00:48:28 +0000 (Sun, 04 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove Gears from UI. see <a href="http://trac.wordpress.org/ticket/11301">#11301</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmintoolsphp">trunk/wp-admin/tools.php</a></li>
<li><a href="#trunkwpincludesscriptloaderphp">trunk/wp-includes/script-loader.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkwpadminjswpgearsdevjs">trunk/wp-admin/js/wp-gears.dev.js</a></li>
<li><a href="#trunkwpadminjswpgearsjs">trunk/wp-admin/js/wp-gears.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminjswpgearsdevjs"></a>
<div class="delfile"><h4>Deleted: trunk/wp-admin/js/wp-gears.dev.js (13980 => 13981)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/wp-gears.dev.js 2010-04-04 00:41:39 UTC (rev 13980)
+++ trunk/wp-admin/js/wp-gears.dev.js 2010-04-04 00:48:28 UTC (rev 13981)
</span><span class="lines">@@ -1,100 +0,0 @@
</span><del>-
-var wpGears = {
-
- createStore : function() {
- if ( 'undefined' == typeof google || ! google.gears ) return;
-
- if ( 'undefined' == typeof localServer )
- localServer = google.gears.factory.create("beta.localserver");
-
- store = localServer.createManagedStore(this.storeName());
- store.manifestUrl = "gears-manifest.php";
- store.checkForUpdate();
- this.message(3);
- },
-
- getPermission : function() {
- var perm = true;
-
- if ( 'undefined' != typeof google && google.gears ) {
- if ( ! google.gears.factory.hasPermission )
- perm = google.gears.factory.getPermission( 'WordPress', 'images/logo.gif' );
-
- if ( perm )
- try { this.createStore(); } catch(e) { this.message(); } // silence if canceled
- else
- this.message(4);
- }
- },
-
- storeName : function() {
- var name, host = window.location.host;
-
- if ( host.match(/[^a-z0-9._-]/i) )
- host = encodeURIComponent(host);
-
- name = window.location.protocol + host;
- name = name.replace(/[^a-z0-9._-]+/gi, '_');
- name = 'wp_' + name.substring(0, 60); // max length of name is 64 chars
-
- return name;
- },
-
- message : function(show) {
- 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 ( 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';
-
- if ( 'undefined' == typeof store )
- t.createStore();
-
- store.oncomplete = function(){wait.innerHTML = (' ' + wpGearsL10n.updateCompleted);};
- store.onerror = function(){wait.innerHTML = (' ' + wpGearsL10n.error + ' ' + store.lastErrorMessage);};
- store.onprogress = function(e){if(num) num.innerHTML = (' ' + e.filesComplete + ' / ' + e.filesTotal);};
- } else {
- msg1.style.display = msg3.style.display = msg4.style.display = 'none';
- msg2.style.display = 'block';
- }
- }
- },
-
- I : function(id) {
- return document.getElementById(id);
- }
-};
-
-(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 ) return;
- if ( 'undefined' == typeof google ) google = {};
- if ( ! google.gears ) google.gears = { factory : gf };
-})();
</del></span></pre></div>
<a id="trunkwpadminjswpgearsjs"></a>
<div class="delfile"><h4>Deleted: trunk/wp-admin/js/wp-gears.js (13980 => 13981)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/wp-gears.js 2010-04-04 00:41:39 UTC (rev 13980)
+++ trunk/wp-admin/js/wp-gears.js 2010-04-04 00:48:28 UTC (rev 13981)
</span><span class="lines">@@ -1 +0,0 @@
</span><del>-var wpGears={createStore:function(){if("undefined"==typeof google||!google.gears){return}if("undefined"==typeof localServer){localServer=google.gears.factory.create("beta.localserver")}store=localServer.createManagedStore(this.storeName());store.manifestUrl="gears-manifest.php";store.checkForUpdate();this.message(3)},getPermission:function(){var a=true;if("undefined"!=typeof google&&google.gears){if(!google.gears.factory.hasPermission){a=google.gears.factory.getPermission("WordPress","images/logo.gif")}if(a){try{this.createStore()}catch(b){this.message()}}else{this.message(4)}}},storeName:function(){var a,b=window.location.host;if(b.match(/[^a-z0-9._-]/i)){b=encodeURIComponent(b)}a=window.location.protocol+b;a=a.replace(/[^a-z0-9._-]+/gi,"_");a="wp_"+a.substring(0,60);return a},message:function(a){var d=this,g=d.I("gears-msg1"),f=d.I("gears-msg2"),e=d.I("gears-msg3"),c=d.I("gears-msg4"),b=d.I("gears-upd-number"),h=d.I("gears-wait");if(!g){return}if("undefined"!=typeof google&&google.gears){if(a&&a==4){g.style.display=f.style.display=e.style.display="none";c.style.display="block"}else{if(google.gears.factory.hasPermission){g.style.display=f.style.display=c.style.display="none";e.style.display="block";if("undefined"==typeof store){d.createStore()}store.oncomplete=function(){h.innerHTML=(" "+wpGearsL10n.updateCompleted)};store.onerror=function(){h.innerHTML=(" "+wpGearsL10n.error+" "+store.lastErrorMessage)};store.onprogress=function(i){if(b){b.innerHTML=(" "+i.filesComplete+" / "+i.filesTotal)}}}else{g.style.display=e.style.display=c.style.display="none";f.style.display="block"}}}},I:function(a){return document.getElementById(a)}};(function(){if("undefined"!=typeof google&&google.gears){return}var a=false;if("undefined"!=typeof GearsFactory){a=new GearsFactory()}else{try{a=new ActiveXObject("Gears.Factory");if(factory.getBuildInfo().indexOf("ie_mobile")!=-1){a.privateSetGlobalObject(this)}}catch(b){if(("undefined"!=typeof navigator.mimeTypes)&&navigator.mimeTypes["application/x-googlegears"]){a=document.createElement("object");a.style.display="none";a.width=0;a.height=0;a.type="application/x-googlegears";document.documentElement.appendChild(a)}}}if(!a){return}if("undefined"==typeof google){google={}}if(!google.gears){google.gears={factory:a}}})();
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadmintoolsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/tools.php (13980 => 13981)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/tools.php 2010-04-04 00:41:39 UTC (rev 13980)
+++ trunk/wp-admin/tools.php 2010-04-04 00:48:28 UTC (rev 13981)
</span><span class="lines">@@ -10,7 +10,6 @@
</span><span class="cx"> require_once('admin.php');
</span><span class="cx">
</span><span class="cx"> $title = __('Tools');
</span><del>-wp_enqueue_script( 'wp-gears' );
</del><span class="cx">
</span><span class="cx"> require_once('admin-header.php');
</span><span class="cx">
</span><span class="lines">@@ -19,62 +18,6 @@
</span><span class="cx"> <?php screen_icon(); ?>
</span><span class="cx"> <h2><?php echo esc_html( $title ); ?></h2>
</span><span class="cx">
</span><del>-<?php
-if ( ! $is_opera ) {
-?>
-<div class="tool-box">
- <div id="gears-msg1">
- <h3 class="title"><?php _e('Turbo:'); ?> <?php _e('Speed up WordPress'); ?></h3>
- <p><?php _e('WordPress has support for Gears, which adds new features to your web browser.'); ?><br />
- <a href="http://gears.google.com/" target="_blank" style="font-weight:normal;"><?php _e('More information...'); ?></a></p>
- <p><?php _e('After you install and enable Gears, most of WordPress&#8217; images, scripts, and CSS files will be stored locally on your computer. This speeds up page load time.'); ?></p>
- <p><strong><?php _e('Don&#8217;t install on a public or shared computer.'); ?></strong></p>
- <div class="buttons"><button onclick="window.location = 'http://gears.google.com/?action=install&amp;return=<?php echo urlencode( admin_url() ); ?>';" class="button"><?php _e('Install Now'); ?></button></div>
- </div>
-
- <div id="gears-msg2" style="display:none;">
- <h3 class="title"><?php _e('Turbo:'); ?> <?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 _e('To enable it click the button below.'); ?></p>
- <p><strong><?php _e('Note: Do not enable Gears if this is a public or shared computer!'); ?></strong></p>
- <div class="buttons"><button class="button" onclick="wpGears.getPermission();"><?php _e('Enable Gears'); ?></button></div>
- </div>
-
- <div id="gears-msg3" style="display:none;">
- <h3 class="title"><?php _e('Turbo:'); ?> <?php _e('Gears Status'); ?></h3>
- <p><?php
-
- if ( $is_chrome )
- _e('Gears is installed and enabled on this computer. You can disable it from the Under the Hood tab in Chrome&#8217;s Options menu.');
- elseif ( $is_safari )
- _e('Gears is installed and enabled on this computer. You can disable it from the Safari menu.');
- else
- _e('Gears is installed and enabled on this computer. You can disable it from your browser&#8217;s Tools menu.');
-
- ?></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('Updating files:'); ?></span> <span id="gears-upd-number"></span></span></p>
- </div>
-
- <div id="gears-msg4" style="display:none;">
- <h3 class="title"><?php _e('Turbo:'); ?> <?php _e('Gears Status'); ?></h3>
- <p><?php _e('Your browser&#8217;s settings do not permit this website to use Google Gears.'); ?></p>
- <p><?php
-
- if ( $is_chrome )
- _e('To allow it, change the Gears settings in your browser&#8217;s Options, Under the Hood menu and reload this page.');
- elseif ( $is_safari )
- _e('To allow it, change the Gears settings in the Safari menu and reload this page.');
- else
- _e('To allow it, change the Gears settings in your browser&#8217;s Tools menu and reload this page.');
-
- ?></p>
- <p><strong><?php _e('Note: Do not enable Gears if this is a public or shared computer!'); ?></strong></p>
- </div>
- <script type="text/javascript">wpGears.message();</script>
-</div>
-<?php } ?>
-
</del><span class="cx"> <?php if ( current_user_can('edit_posts') ) : ?>
</span><span class="cx"> <div class="tool-box">
</span><span class="cx"> <h3 class="title"><?php _e('Press This') ?></h3>
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (13980 => 13981)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2010-04-04 00:41:39 UTC (rev 13980)
+++ trunk/wp-includes/script-loader.php 2010-04-04 00:48:28 UTC (rev 13981)
</span><span class="lines">@@ -336,13 +336,6 @@
</span><span class="cx"> 'l10n_print_after' => 'try{convertEntities(wordCountL10n);}catch(e){};'
</span><span class="cx"> ));
</span><span class="cx">
</span><del>- $scripts->add( 'wp-gears', "/wp-admin/js/wp-gears$suffix.js", false, '20090717' );
- $scripts->localize( 'wp-gears', 'wpGearsL10n', array(
- 'updateCompleted' => __('Update completed.'),
- 'error' => __('Error:'),
- 'l10n_print_after' => 'try{convertEntities(wpGearsL10n);}catch(e){};'
- ));
-
</del><span class="cx"> $scripts->add( 'theme-preview', "/wp-admin/js/theme-preview$suffix.js", array( 'thickbox', 'jquery' ), '20090319' );
</span><span class="cx"> $scripts->add_data( 'theme-preview', 'group', 1 );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>