Ticket #14772: admin-bar-fixes.14772.diff
File admin-bar-fixes.14772.diff, 9.5 KB (added by , 13 years ago) |
---|
-
wp-includes/admin-bar.php
170 170 function wp_admin_bar_bloginfo_menu() { 171 171 global $wp_admin_bar; 172 172 173 /* Add the Site Info menu */ 174 $wp_admin_bar->add_menu( array( 'id' => 'bloginfo', 'title' => __( 'Site Info' ), 'href' => '', ) ); 175 176 // TODO: Move this js out into a seperate file? 177 $wp_admin_bar->add_menu( array( 'parent' => 'bloginfo', 'title' => __( 'Get Shortlink' ), 'href' => '', 'meta' => array( 178 'onclick' => 'javascript:function wpcomshort() { var url=document.location;var links=document.getElementsByTagName('link');var found=0;for(var i = 0, l; l = links[i]; i++){if(l.getAttribute('rel')=='shortlink') {found=l.getAttribute('href');break;}}if (!found) {for (var i = 0; l = document.links[i]; i++) {if (l.getAttribute('rel') == 'shortlink') {found = l.getAttribute('href');break;}}}if (found) {prompt('' . esc_js( __( 'URL:' ) ) . '', found);} else {alert('' . esc_js( __( 'No shortlink available for this page.' ) ) . ''); } } wpcomshort(); return false;' ) ) ); 173 $wp_admin_bar->add_menu( array( 'id' => 'get-shortlink', 'title' => __( 'Get Shortlink' ), 'href' => '', ) ); 179 174 } 180 175 181 176 /** … … 208 203 function wp_admin_bar_header() { 209 204 ?> 210 205 <style type="text/css" media="print">#wpadminbar { display:none; }</style> 211 <script type="text/javascript">212 /* <![CDATA[ */213 (function(d, w) {214 var init = function() {215 var b = d.getElementsByTagName('body')[0],216 aB = d.getElementById('wpadminbar'),217 s = d.getElementById('adminbar-search');218 219 if ( b && aB )220 b.appendChild( aB );221 222 if ( s ) {223 if ( '' == s.value )224 s.value = s.getAttribute('title');225 226 s.onblur = function() {227 this.value = '' == this.value ? this.getAttribute('title') : this.value;228 }229 s.onfocus = function() {230 this.value = this.getAttribute('title') == this.value ? '' : this.value;231 }232 }233 234 if ( w.location.hash )235 w.scrollBy(0,-32);236 }237 238 if ( w.addEventListener )239 w.addEventListener('load', init, false);240 else if ( w.attachEvent )241 w.attachEvent('onload', init);242 243 })(document, window);244 /* ]]> */245 </script>246 206 <?php 247 207 } 248 208 … … 272 232 <?php 273 233 } 274 234 275 add_action('wp_head', 'wp_admin_body_style');276 add_action('admin_head', 'wp_admin_body_style');277 278 235 /** 279 236 * Determine whether the admin bar should be showing. 280 237 * … … 291 248 if ( defined('WP_SHOW_ADMIN_BAR') ) 292 249 $show_admin_bar = (bool) WP_SHOW_ADMIN_BAR; 293 250 294 if ( ! is_user_logged_in() ) 251 if ( 252 ! is_user_logged_in() || 253 ( is_admin() && ! is_multisite() ) 254 ) 295 255 $show_admin_bar = false; 296 256 } 297 257 -
wp-includes/js/admin-bar.dev.js
1 (function(d, w) { 2 var addEvent = function( obj, type, fn ) { 3 if (obj.addEventListener) 4 obj.addEventListener(type, fn, false); 5 else if (obj.attachEvent) 6 obj.attachEvent('on' + type, function() { return fn.call(obj, window.event);}); 7 }, 8 9 aB, hc = new RegExp('\\bhover\\b', 'g'), q = [], 10 11 getTOID = function(el) { 12 var i = q.length; 13 while( i-- ) 14 if ( q[i] && el == q[i][1] ) 15 return q[i][0]; 16 return false; 17 }, 18 19 addClass = function(t) { 20 while ( t && t != aB && t != d ) { 21 if( 'LI' == t.nodeName.toUpperCase() ) { 22 var id = getTOID(t); 23 if ( id ) 24 clearTimeout( id ); 25 t.className = t.className ? ( t.className.replace(hc, '') + ' hover' ) : 'hover'; 26 } 27 t = t.parentNode; 28 } 29 }, 30 31 removeClass = function(t) { 32 while ( t && t != aB && t != d ) { 33 if( 'LI' == t.nodeName.toUpperCase() ) { 34 (function(t) { 35 var to = setTimeout(function() { 36 t.className = t.className ? t.className.replace(hc, '') : ''; 37 }, 500); 38 q[q.length] = [to, t]; 39 })(t); 40 } 41 t = t.parentNode; 42 } 43 } 44 45 clickShortlink = function(e) { 46 var t = e.target || e.srcElement, links, i; 47 48 49 if ( 'undefined' == typeof setAdminBarL10n ) 50 return; 51 52 while( t && t != aB && t != d && ( 53 ! t.className || 54 -1 == t.className.indexOf('ab-get-shortlink') 55 ) ) 56 t = t.parentNode; 57 58 if ( t && t.className && -1 != t.className.indexOf('ab-get-shortlink') ) { 59 links = d.getElementsByTagName('link'); 60 if ( ! links.length ) 61 links = d.links; 62 63 i = links.length; 64 65 if ( e.preventDefault ) 66 e.preventDefault(); 67 e.returnValue = false; 68 69 while( i-- ) { 70 if ( links[i] && 'shortlink' == links[i].getAttribute('rel') ) { 71 prompt( setAdminBarL10n.url, links[i].href ); 72 return false; 73 } 74 } 75 76 alert( setAdminBarL10n.noShortlink ); 77 return false; 78 } 79 }, 80 81 addEvent(w, 'load', function() { 82 var b = d.getElementsByTagName('body')[0], 83 s = d.getElementById('adminbar-search'); 84 85 aB = d.getElementById('wpadminbar'); 86 87 if ( b && aB ) { 88 b.appendChild( aB ); 89 90 addEvent(aB, 'mouseover', function(e) { 91 addClass( e.target || e.srcElement ); 92 }); 93 94 addEvent(aB, 'mouseout', function(e) { 95 removeClass( e.target || e.srcElement ); 96 }); 97 98 addEvent(aB, 'click', clickShortlink ); 99 } 100 101 if ( s ) { 102 if ( '' == s.value ) 103 s.value = s.getAttribute('title'); 104 105 s.onblur = function() { 106 this.value = '' == this.value ? this.getAttribute('title') : this.value; 107 } 108 s.onfocus = function() { 109 this.value = this.getAttribute('title') == this.value ? '' : this.value; 110 } 111 } 112 113 if ( w.location.hash ) 114 w.scrollBy(0,-32); 115 }); 116 })(document, window); -
wp-includes/admin-bar/admin-bar-class.php
33 33 $this->user->locale = get_locale(); 34 34 35 35 add_action( 'wp_head', 'wp_admin_bar_header' ); 36 add_action( 'wp_head', 'wp_admin_body_style'); 37 36 38 add_action( 'admin_head', 'wp_admin_bar_header' ); 39 add_action( 'admin_head', 'wp_admin_body_style'); 37 40 41 wp_enqueue_script( 'admin-bar' ); 38 42 wp_enqueue_style( 'admin-bar' ); 39 43 40 44 if ( is_super_admin() ) { -
wp-includes/css/admin-bar-rtl.dev.css
25 25 border-right: 1px solid #808080; 26 26 } 27 27 28 #wpadminbar .quicklinks > ul > li .hover > a {28 #wpadminbar .quicklinks > ul > li:hover > a { 29 29 border-right-color: #707070; 30 30 border-left-color: #686868; 31 31 } … … 35 35 float:none; 36 36 } 37 37 38 #wpadminbar .menupop li:hover > ul { 38 #wpadminbar .menupop li:hover > ul, 39 #wpadminbar .menupop li.hover > ul { 39 40 margin-left:-100%; 40 41 } 41 42 … … 156 157 padding: 0 0.7em 0 1.15em; 157 158 } 158 159 159 #wpadminbar li.ab-me > a .hover,160 #wpadminbar li.ab-blog > a .hover {160 #wpadminbar li.ab-me > a:hover, 161 #wpadminbar li.ab-blog > a:hover { 161 162 background-position: 33% 59.8%; 162 163 } 163 164 … … 211 212 direction: ltr; 212 213 } 213 214 214 #wpadminbar #admin-bar-micro ul li:hover > ul { 215 #wpadminbar #admin-bar-micro ul li:hover > ul, 216 #wpadminbar #admin-bar-micro ul li.hover > ul { 215 217 left: auto; 216 218 right: 100%; 217 219 } -
wp-includes/css/admin-bar.dev.css
30 30 #wpadminbar .quicklinks > ul > li:last-child > a { 31 31 border-right: none; 32 32 } 33 #wpadminbar .quicklinks > ul > li:hover > a, 34 #wpadminbar .quicklinks > ul > li.hover > a { 33 #wpadminbar .quicklinks > ul > li:hover > a { 35 34 border-left-color: #707070; 36 35 } 37 36 #wpadminbar a { … … 45 44 float:none; 46 45 display:inline !important; 47 46 } 48 #wpadminbar li:hover > ul { 47 #wpadminbar li:hover > ul, 48 #wpadminbar li.hover > ul { 49 49 display:block; 50 50 } 51 51 52 #wpadminbar .menupop li:hover > ul { 52 #wpadminbar .menupop li:hover > ul, 53 #wpadminbar .menupop li.hover > ul { 53 54 margin-left:100%; 54 55 margin-top:-28px; 55 56 } … … 226 227 padding: 0 1.15em 0 0.7em; 227 228 } 228 229 #wpadminbar li.ab-me > a:hover, 229 #wpadminbar li.ab-me > a.hover, 230 #wpadminbar li.ab-blog > a:hover, 231 #wpadminbar li.ab-blog > a.hover { 230 #wpadminbar li.ab-blog > a:hover { 232 231 background-position: 67% 59.8%; 233 232 } 234 233 #wpadminbar li.ab-me img.avatar, … … 338 337 * html #wpadminbar .menupop a span, 339 338 * html #wpadminbar .menupop ul li a:hover, 340 339 * html #wpadminbar .myaccount a, 341 * html .quicklinks a:hover,#wpadminbar .menupop:hover { 340 * html .quicklinks a:hover, 341 * html #wpadminbar .menupop:hover { 342 342 background-image: none !important; 343 343 } 344 344 -
wp-includes/script-loader.php
58 58 59 59 $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '.dev' : ''; 60 60 61 $scripts->add( 'admin-bar', "/wp-includes/js/admin-bar$suffix.js", false, '20101028'); 62 $scripts->localize( 'admin-bar', 'setAdminBarL10n', array( 63 'url' => __( 'URL:' ), 64 'noShortlink' => __( 'No shortlink available for this page.' ), 65 ) ); 61 66 $scripts->add( 'utils', "/wp-admin/js/utils$suffix.js", false, '20090102' ); 62 67 63 68 $scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), '20101007' );