<!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" />
<title>[18495] trunk/wp-includes: Admin bar: fix the Shortlink menu when using jQuery, see #18299</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/18495">18495</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2011-08-01 23:33:56 +0000 (Mon, 01 Aug 2011)</dd>
</dl>

<h3>Log Message</h3>
<pre>Admin bar: fix the Shortlink menu when using jQuery, see <a href="http://core.trac.wordpress.org/ticket/18299">#18299</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesjsadminbardevjs">trunk/wp-includes/js/admin-bar.dev.js</a></li>
<li><a href="#trunkwpincludesjsadminbarjs">trunk/wp-includes/js/admin-bar.js</a></li>
<li><a href="#trunkwpincludesscriptloaderphp">trunk/wp-includes/script-loader.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesjsadminbardevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/admin-bar.dev.js (18494 => 18495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/admin-bar.dev.js        2011-08-01 17:01:54 UTC (rev 18494)
+++ trunk/wp-includes/js/admin-bar.dev.js        2011-08-01 23:33:56 UTC (rev 18495)
</span><span class="lines">@@ -15,6 +15,13 @@
</span><span class="cx">                         sensitivity: 7,
</span><span class="cx">                         interval: 120
</span><span class="cx">                 });
</span><ins>+
+                $('#wp-admin-bar-get-shortlink').click(function(e){
+                        e.preventDefault();
+                        $(this).addClass('selected').children('.shortlink-input').blur(function(){
+                                $(this).parents('#wp-admin-bar-get-shortlink').removeClass('selected');
+                        }).focus().select();
+                });
</ins><span class="cx">         });
</span><span class="cx"> } else {
</span><span class="cx">         (function(d, w) {
</span></span></pre></div>
<a id="trunkwpincludesjsadminbarjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/admin-bar.js (18494 => 18495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/admin-bar.js        2011-08-01 17:01:54 UTC (rev 18494)
+++ trunk/wp-includes/js/admin-bar.js        2011-08-01 23:33:56 UTC (rev 18495)
</span><span class="lines">@@ -1 +1 @@
</span><del>-if(typeof(jQuery)!=&quot;undefined&quot;){if(typeof(jQuery.fn.hoverIntent)==&quot;undefined&quot;){(function(b){b.fn.hoverIntent=function(p,r){var g={sensitivity:7,interval:100,timeout:0};g=b.extend(g,r?{over:p,out:r}:p);var a,f,t,v;var u=function(c){a=c.pageX;f=c.pageY};var w=function(c,d){d.hoverIntent_t=clearTimeout(d.hoverIntent_t);if((Math.abs(t-a)+Math.abs(v-f))&lt;g.sensitivity){b(d).unbind(&quot;mousemove&quot;,u);d.hoverIntent_s=1;return g.over.apply(d,[c])}else{t=a;v=f;d.hoverIntent_t=setTimeout(function(){w(c,d)},g.interval)}};var s=function(c,d){d.hoverIntent_t=clearTimeout(d.hoverIntent_t);d.hoverIntent_s=0;return g.out.apply(d,[c])};var x=function(e){var d=this;var c=(e.type==&quot;mouseover&quot;?e.fromElement:e.toElement)||e.relatedTarget;while(c&amp;&amp;c!=this){try{c=c.parentNode}catch(e){c=this}}if(c==this){if(b.browser.mozilla){if(e.type==&quot;mouseout&quot;){d.mtout=setTimeout(function(){q(e,d)},30)}else{if(d.mtout){d.mtout=clearTimeout(d.m
 tout)}}}return}else{if(d.mtout){d.mtout=clearTimeout(d.mtout)}q(e,d)}};var q=function(e,d){var c=jQuery.extend({},e);if(d.hoverIntent_t){d.hoverIntent_t=clearTimeout(d.hoverIntent_t)}if(e.type==&quot;mouseover&quot;){t=c.pageX;v=c.pageY;b(d).bind(&quot;mousemove&quot;,u);if(d.hoverIntent_s!=1){d.hoverIntent_t=setTimeout(function(){w(c,d)},g.interval)}}else{b(d).unbind(&quot;mousemove&quot;,u);if(d.hoverIntent_s==1){d.hoverIntent_t=setTimeout(function(){s(c,d)},g.timeout)}}};return this.mouseover(x).mouseout(x)}})(jQuery)}jQuery(document).ready(function(a){a(&quot;#wpadminbar&quot;).removeClass(&quot;nojq&quot;).find(&quot;li.menupop&quot;).hoverIntent({over:function(b){a(this).addClass(&quot;hover&quot;)},out:function(b){a(this).removeClass(&quot;hover&quot;)},timeout:200,sensitivity:7,interval:120})})}else{(function(i,k){var c=function(n,m,d){if(n.addEventListener){n.addEventListener(m,d,false)}else{if(n.attachEvent){n.attachEvent(&quot;on&quot;+m,function(){return d.call(n
 ,window.event)})}}},e,f=new RegExp(&quot;\\bhover\\b&quot;,&quot;g&quot;),a=[],j=new RegExp(&quot;\\bselected\\b&quot;,&quot;g&quot;),g=function(m){var d=a.length;while(d--){if(a[d]&amp;&amp;m==a[d][1]){return a[d][0]}}return false},h=function(s){var n,d,q,m,p,r,u=[],o=0;while(s&amp;&amp;s!=e&amp;&amp;s!=i){if(&quot;LI&quot;==s.nodeName.toUpperCase()){u[u.length]=s;d=g(s);if(d){clearTimeout(d)}s.className=s.className?(s.className.replace(f,&quot;&quot;)+&quot; hover&quot;):&quot;hover&quot;;m=s}s=s.parentNode}if(m&amp;&amp;m.parentNode){p=m.parentNode;if(p&amp;&amp;&quot;UL&quot;==p.nodeName.toUpperCase()){n=p.childNodes.length;while(n--){r=p.childNodes[n];if(r!=m){r.className=r.className?r.className.replace(j,&quot;&quot;):&quot;&quot;}}}}n=a.length;while(n--){q=false;o=u.length;while(o--){if(u[o]==a[n][1]){q=true}}if(!q){a[n][1].className=a[n][1].className?a[n][1].className.replace(f,&quot;&quot;):&quot;&quot;}}},l=function(d){while(d&amp;&amp;d!=e&amp;&amp;d!=i){if(&quot;
 LI&quot;==d.nodeName.toUpperCase()){(function(m){var n=setTimeout(function(){m.className=m.className?m.className.replace(f,&quot;&quot;):&quot;&quot;},500);a[a.length]=[n,m]})(d)}d=d.parentNode}},b=function(p){var n,d,o,m=p.target||p.srcElement;while(true){if(!m||m==i||m==e){return}if(m.id&amp;&amp;m.id==&quot;wp-admin-bar-get-shortlink&quot;){break}m=m.parentNode}if(p.preventDefault){p.preventDefault()}p.returnValue=false;if(-1==m.className.indexOf(&quot;selected&quot;)){m.className+=&quot; selected&quot;}for(n=0,d=m.childNodes.length;n&lt;d;n++){o=m.childNodes[n];if(o.className&amp;&amp;-1!=o.className.indexOf(&quot;shortlink-input&quot;)){o.focus();o.select();o.onblur=function(){m.className=m.className?m.className.replace(j,&quot;&quot;):&quot;&quot;};break}}return false};c(k,&quot;load&quot;,function(){e=i.getElementById(&quot;wpadminbar&quot;);if(i.body&amp;&amp;e){i.body.appendChild(e);c(e,&quot;mouseover&quot;,function(d){h(d.target||d.srcElement)});c(e,&quot;mouseout
 &quot;,function(d){l(d.target||d.srcElement)});c(e,&quot;click&quot;,b)}if(k.location.hash){k.scrollBy(0,-32)}})})(document,window)};
</del><span class="cx">\ No newline at end of file
</span><ins>+if(typeof(jQuery)!=&quot;undefined&quot;){if(typeof(jQuery.fn.hoverIntent)==&quot;undefined&quot;){(function(a){a.fn.hoverIntent=function(l,j){var m={sensitivity:7,interval:100,timeout:0};m=a.extend(m,j?{over:l,out:j}:l);var o,n,h,d;var e=function(f){o=f.pageX;n=f.pageY};var c=function(g,f){f.hoverIntent_t=clearTimeout(f.hoverIntent_t);if((Math.abs(h-o)+Math.abs(d-n))&lt;m.sensitivity){a(f).unbind(&quot;mousemove&quot;,e);f.hoverIntent_s=1;return m.over.apply(f,[g])}else{h=o;d=n;f.hoverIntent_t=setTimeout(function(){c(g,f)},m.interval)}};var i=function(g,f){f.hoverIntent_t=clearTimeout(f.hoverIntent_t);f.hoverIntent_s=0;return m.out.apply(f,[g])};var b=function(q){var f=this;var g=(q.type==&quot;mouseover&quot;?q.fromElement:q.toElement)||q.relatedTarget;while(g&amp;&amp;g!=this){try{g=g.parentNode}catch(q){g=this}}if(g==this){if(a.browser.mozilla){if(q.type==&quot;mouseout&quot;){f.mtout=setTimeout(function(){k(q,f)},30)}else{if(f.mtout){f.mtout=clearTimeout(f.m
 tout)}}}return}else{if(f.mtout){f.mtout=clearTimeout(f.mtout)}k(q,f)}};var k=function(p,f){var g=jQuery.extend({},p);if(f.hoverIntent_t){f.hoverIntent_t=clearTimeout(f.hoverIntent_t)}if(p.type==&quot;mouseover&quot;){h=g.pageX;d=g.pageY;a(f).bind(&quot;mousemove&quot;,e);if(f.hoverIntent_s!=1){f.hoverIntent_t=setTimeout(function(){c(g,f)},m.interval)}}else{a(f).unbind(&quot;mousemove&quot;,e);if(f.hoverIntent_s==1){f.hoverIntent_t=setTimeout(function(){i(g,f)},m.timeout)}}};return this.mouseover(b).mouseout(b)}})(jQuery);}jQuery(document).ready(function(a){a(&quot;#wpadminbar&quot;).removeClass(&quot;nojq&quot;).find(&quot;li.menupop&quot;).hoverIntent({over:function(b){a(this).addClass(&quot;hover&quot;)},out:function(b){a(this).removeClass(&quot;hover&quot;)},timeout:200,sensitivity:7,interval:120});a(&quot;#wp-admin-bar-get-shortlink&quot;).click(function(b){b.preventDefault();a(this).addClass(&quot;selected&quot;).children(&quot;.shortlink-input&quot;).blur(function(){a(
 this).parents(&quot;#wp-admin-bar-get-shortlink&quot;).removeClass(&quot;selected&quot;)}).focus().select()})})}else{(function(i,k){var c=function(n,m,d){if(n.addEventListener){n.addEventListener(m,d,false)}else{if(n.attachEvent){n.attachEvent(&quot;on&quot;+m,function(){return d.call(n,window.event)})}}},e,f=new RegExp(&quot;\\bhover\\b&quot;,&quot;g&quot;),a=[],j=new RegExp(&quot;\\bselected\\b&quot;,&quot;g&quot;),g=function(m){var d=a.length;while(d--){if(a[d]&amp;&amp;m==a[d][1]){return a[d][0]}}return false},h=function(s){var n,d,q,m,p,r,u=[],o=0;while(s&amp;&amp;s!=e&amp;&amp;s!=i){if(&quot;LI&quot;==s.nodeName.toUpperCase()){u[u.length]=s;d=g(s);if(d){clearTimeout(d)}s.className=s.className?(s.className.replace(f,&quot;&quot;)+&quot; hover&quot;):&quot;hover&quot;;m=s}s=s.parentNode}if(m&amp;&amp;m.parentNode){p=m.parentNode;if(p&amp;&amp;&quot;UL&quot;==p.nodeName.toUpperCase()){n=p.childNodes.length;while(n--){r=p.childNodes[n];if(r!=m){r.className=r.className?r.cl
 assName.replace(j,&quot;&quot;):&quot;&quot;}}}}n=a.length;while(n--){q=false;o=u.length;while(o--){if(u[o]==a[n][1]){q=true}}if(!q){a[n][1].className=a[n][1].className?a[n][1].className.replace(f,&quot;&quot;):&quot;&quot;}}},l=function(d){while(d&amp;&amp;d!=e&amp;&amp;d!=i){if(&quot;LI&quot;==d.nodeName.toUpperCase()){(function(m){var n=setTimeout(function(){m.className=m.className?m.className.replace(f,&quot;&quot;):&quot;&quot;},500);a[a.length]=[n,m]})(d)}d=d.parentNode}},b=function(p){var n,d,o,m=p.target||p.srcElement;while(true){if(!m||m==i||m==e){return}if(m.id&amp;&amp;m.id==&quot;wp-admin-bar-get-shortlink&quot;){break}m=m.parentNode}if(p.preventDefault){p.preventDefault()}p.returnValue=false;if(-1==m.className.indexOf(&quot;selected&quot;)){m.className+=&quot; selected&quot;}for(n=0,d=m.childNodes.length;n&lt;d;n++){o=m.childNodes[n];if(o.className&amp;&amp;-1!=o.className.indexOf(&quot;shortlink-input&quot;)){o.focus();o.select();o.onblur=function(){m.className
 =m.className?m.className.replace(j,&quot;&quot;):&quot;&quot;};break}}return false};c(k,&quot;load&quot;,function(){e=i.getElementById(&quot;wpadminbar&quot;);if(i.body&amp;&amp;e){i.body.appendChild(e);c(e,&quot;mouseover&quot;,function(d){h(d.target||d.srcElement)});c(e,&quot;mouseout&quot;,function(d){l(d.target||d.srcElement)});c(e,&quot;click&quot;,b)}if(k.location.hash){k.scrollBy(0,-32)}})})(document,window)};
</ins></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (18494 => 18495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php        2011-08-01 17:01:54 UTC (rev 18494)
+++ trunk/wp-includes/script-loader.php        2011-08-01 23:33:56 UTC (rev 18495)
</span><span class="lines">@@ -281,7 +281,7 @@
</span><span class="cx">         $scripts-&gt;add( 'user-profile', &quot;/wp-admin/js/user-profile$suffix.js&quot;, array( 'jquery', 'password-strength-meter' ), '20110628' );
</span><span class="cx">         $scripts-&gt;add_data( 'user-profile', 'group', 1 );
</span><span class="cx"> 
</span><del>-        $scripts-&gt;add( 'admin-bar', &quot;/wp-includes/js/admin-bar$suffix.js&quot;, false, '20110131' );
</del><ins>+        $scripts-&gt;add( 'admin-bar', &quot;/wp-includes/js/admin-bar$suffix.js&quot;, false, '20110801' );
</ins><span class="cx">         $scripts-&gt;add_data( 'admin-bar', 'group', 1 );
</span><span class="cx"> 
</span><span class="cx">         $scripts-&gt;add( 'wplink', &quot;/wp-includes/js/tinymce/plugins/wplink/js/wplink$suffix.js&quot;, array( 'jquery', 'wpdialogs' ), '20110727' );
</span></span></pre>
</div>
</div>

</body>
</html>