From 2501fac1299c7dd1d2859a42a3050171cddbb28c Mon Sep 17 00:00:00 2001 From: nacin Date: Sun, 4 Apr 2010 00:48:28 +0000 Subject: [PATCH] Remove Gears from UI. see #11301 git-svn-id: http://svn.automattic.com/wordpress/trunk@13981 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/js/wp-gears.dev.js | 100 ---------------------------------- wp-admin/js/wp-gears.js | 1 - wp-admin/tools.php | 57 ------------------- wp-includes/script-loader.php | 7 --- 4 files changed, 165 deletions(-) delete mode 100644 wp-admin/js/wp-gears.dev.js delete mode 100644 wp-admin/js/wp-gears.js diff --git a/wp-admin/js/wp-gears.dev.js b/wp-admin/js/wp-gears.dev.js deleted file mode 100644 index 4450ff171..000000000 --- a/wp-admin/js/wp-gears.dev.js +++ /dev/null @@ -1,100 +0,0 @@ - -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 }; -})(); diff --git a/wp-admin/js/wp-gears.js b/wp-admin/js/wp-gears.js deleted file mode 100644 index 55bec5289..000000000 --- a/wp-admin/js/wp-gears.js +++ /dev/null @@ -1 +0,0 @@ -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}}})(); \ No newline at end of file diff --git a/wp-admin/tools.php b/wp-admin/tools.php index ae8689833..c62e505ed 100644 --- a/wp-admin/tools.php +++ b/wp-admin/tools.php @@ -10,7 +10,6 @@ require_once('admin.php'); $title = __('Tools'); -wp_enqueue_script( 'wp-gears' ); require_once('admin-header.php'); @@ -19,62 +18,6 @@ require_once('admin-header.php');

- -
-
-

-


-

-

-

-
-
- - - - - - - -
- -

diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 0291be4c2..ecabd0236 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -336,13 +336,6 @@ function wp_default_scripts( &$scripts ) { 'l10n_print_after' => 'try{convertEntities(wordCountL10n);}catch(e){};' )); - $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){};' - )); - $scripts->add( 'theme-preview', "/wp-admin/js/theme-preview$suffix.js", array( 'thickbox', 'jquery' ), '20090319' ); $scripts->add_data( 'theme-preview', 'group', 1 );