<!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>[18511] trunk: Fix back-compat for quicktags, introduce QTags.addButton(), see #16695</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/18511">18511</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2011-08-05 04:09:22 +0000 (Fri, 05 Aug 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix back-compat for quicktags, introduce QTags.addButton(), see <a href="http://core.trac.wordpress.org/ticket/16695">#16695</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminjseditcommentsdevjs">trunk/wp-admin/js/edit-comments.dev.js</a></li>
<li><a href="#trunkwpadminjseditcommentsjs">trunk/wp-admin/js/edit-comments.js</a></li>
<li><a href="#trunkwpincludesclasswpeditorphp">trunk/wp-includes/class-wp-editor.php</a></li>
<li><a href="#trunkwpincludesjsquicktagsdevjs">trunk/wp-includes/js/quicktags.dev.js</a></li>
<li><a href="#trunkwpincludesjsquicktagsjs">trunk/wp-includes/js/quicktags.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="trunkwpadminjseditcommentsdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/edit-comments.dev.js (18510 => 18511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/edit-comments.dev.js 2011-08-04 16:36:50 UTC (rev 18510)
+++ trunk/wp-admin/js/edit-comments.dev.js 2011-08-05 04:09:22 UTC (rev 18511)
</span><span class="lines">@@ -549,7 +549,7 @@
</span><span class="cx"> $(document).delegate('span.delete a.delete', 'click', function(){return false;});
</span><span class="cx">
</span><span class="cx"> if ( typeof QTags != 'undefined' )
</span><del>- quicktags({quicktags_id: 'replycontent', quicktags_buttons: 'strong,em,link,block,del,ins,img,ul,ol,li,code,spell,close'});
</del><ins>+ quicktags({id: 'replycontent', buttons: 'strong,em,link,block,del,ins,img,ul,ol,li,code,spell,close'});
</ins><span class="cx">
</span><span class="cx"> if ( typeof $.table_hotkeys != 'undefined' ) {
</span><span class="cx"> make_hotkeys_redirect = function(which) {
</span></span></pre></div>
<a id="trunkwpadminjseditcommentsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/edit-comments.js (18510 => 18511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/edit-comments.js 2011-08-04 16:36:50 UTC (rev 18510)
+++ trunk/wp-admin/js/edit-comments.js 2011-08-05 04:09:22 UTC (rev 18511)
</span><span class="lines">@@ -1 +1 @@
</span><del>-var theList,theExtraList,toggleWithKeyboard=false,getCount,updateCount,updatePending,dashboardTotals;(function(a){setCommentsList=function(){var c,e,g,j=0,f,h,d,i,b;c=a('input[name="_total"]',"#comments-form");e=a('input[name="_per_page"]',"#comments-form");g=a('input[name="_page"]',"#comments-form");f=function(n,l){var p=a("#"+l.element),k,o,m;k=a("#replyrow");o=a("#comment_ID",k).val();m=a("#replybtn",k);if(p.is(".unapproved")){if(l.data.id==o){m.text(adminCommentsL10n.replyApprove)}p.find("div.comment_status").html("0")}else{if(l.data.id==o){m.text(adminCommentsL10n.reply)}p.find("div.comment_status").html("1")}a("span.pending-count").each(function(){var q=a(this),s,r;s=q.html().replace(/[^0-9]+/g,"");s=parseInt(s,10);if(isNaN(s)){return}r=a("#"+l.element).is("."+l.dimClass
)?1:-1;s=s+r;if(s<0){s=0}q.closest(".awaiting-mod")[0==s?"addClass":"removeClass"]("count-0");updateCount(q,s);dashboardTotals()})};h=function(o,s){var u=a(o.target).attr("class"),k,l,m,r,t,q,p=false;o.data._total=c.val()||0;o.data._per_page=e.val()||0;o.data._page=g.val()||0;o.data._url=document.location.href;o.data.comment_status=a('input[name="comment_status"]',"#comments-form").val();if(u.indexOf(":trash=1")!=-1){p="trash"}else{if(u.indexOf(":spam=1")!=-1){p="spam"}}if(p){k=u.replace(/.*?comment-([0-9]+).*/,"$1");l=a("#comment-"+k);note=a("#"+p+"-undo-holder").html();l.find(".check-column :checkbox").prop("checked",false);if(l.siblings("#replyrow").length&&commentReply.cid==k){commentReply.close()}if(l.is("tr")){m=l.children(":visible").length;q=a(".author st
rong",l).text();r=a('<tr id="undo-'+k+'" class="undo un'+p+'" style="display:none;"><td colspan="'+m+'">'+note+"</td></tr>")}else{q=a(".comment-author",l).text();r=a('<div id="undo-'+k+'" style="display:none;" class="undo un'+p+'">'+note+"</div>")}l.before(r);a("strong","#undo-"+k).text(q+" ");t=a(".undo a","#undo-"+k);t.attr("href","comment.php?action=un"+p+"comment&c="+k+"&_wpnonce="+o.data._ajax_nonce);t.attr("class","delete:the-comment-list:comment-"+k+"::un"+p+"=1 vim-z vim-destructive");a(".avatar",l).clone().prependTo("#undo-"+k+" ."+p+"-undo-inside");t.click(function(){s.wpList.del(this);a("#undo-"+k).css({backgroundColor:"#ceb"}).fad
eOut(350,function(){a(this).remove();a("#comment-"+k).css("backgroundColor","").fadeIn(300,function(){a(this).show()})});return false})}return o};d=function(k,l,m){if(l<j){return}if(m){j=l}c.val(k.toString());a("span.total-type-count").each(function(){updateCount(a(this),k)})};dashboardTotals=function(q){var p=a("#dashboard_right_now"),l,o,m,k;q=q||0;if(isNaN(q)||!p.length){return}l=a("span.total-count",p);o=a("span.approved-count",p);m=getCount(l);m=m+q;k=m-getCount(a("span.pending-count",p))-getCount(a("span.spam-count",p));updateCount(l,m);updateCount(o,k)};getCount=function(k){var l=parseInt(k.html().replace(/[^0-9]+/g,""),10);if(isNaN(l)){return 0}return l};updateCount=function(l,m){var k="";if(isNaN(m)){return}m=m<1?"0":m.toString();if(m.length>3){while(m.length>3){k=thousandsSeparator+m.substr(m.length-3)+k;m=m.substr(0,m.length-3)}m=m+k}
l.html(m)};updatePending=function(k){a("span.pending-count").each(function(){var l=a(this);if(k<0){k=0}l.closest(".awaiting-mod")[0==k?"addClass":"removeClass"]("count-0");updateCount(l,k);dashboardTotals()})};i=function(k,n){var q,o,u=a(n.target).parent().is("span.untrash"),m=a(n.target).parent().is("span.unspam"),t,s,l,p=a("#"+n.element).is(".unapproved");function v(r){if(a(n.target).parent().is("span."+r)){return 1}else{if(a("#"+n.element).is("."+r)){return -1}}return 0}t=v("spam");s=v("trash");if(u){s=-1}if(m){t=-1}l=getCount(a("span.pending-count").eq(0));if(a(n.target).parent().is("span.unapprove")||((u||m)&&p)){l=l+1}else{if(p){l=l-1}}updatePending(l);a("span.spam-count").each(function(){var r=a(this),w=getCount(r)+t;updateCount(r,w)});a("span.trash-count").each(function(){var r=a
(this),w=getCount(r)+s;updateCount(r,w)});if(a("#dashboard_right_now").length){o=s?-1*s:0;dashboardTotals(o)}else{q=c.val()?parseInt(c.val(),10):0;q=q-t-s;if(q<0){q=0}if(("object"==typeof k)&&j<n.parsed.responses[0].supplemental.time){total_items_i18n=n.parsed.responses[0].supplemental.total_items_i18n||"";if(total_items_i18n){a(".displaying-num").text(total_items_i18n);a(".total-pages").text(n.parsed.responses[0].supplemental.total_pages_i18n);a(".tablenav-pages").find(".next-page, .last-page").toggleClass("disabled",n.parsed.responses[0].supplemental.total_pages==a(".current-page").val())}d(q,n.parsed.responses[0].supplemental.time,true)}else{d(q,k,false)}}if(!theExtraList||theExtraList.size()==0||theExtraList.children().size()==0||u||m){return}theList.get(0).wpList.add(theExtraList.children(":eq(0)").remove().clone());b()};b=function(n){var l=a.query.get(),k=a
(".total-pages").text(),m=a('input[name="_per_page"]',"#comments-form").val();if(!l.paged){l.paged=1}if(l.paged>k){return}if(n){theExtraList.empty();l.number=Math.min(8,m)}else{l.number=1;l.offset=Math.min(8,m)-1}l.no_placeholder=true;l.paged++;if(true===l.comment_type){l.comment_type=""}l=a.extend(l,{action:"fetch-list",list_args:list_args,_ajax_fetch_list_nonce:a("#_ajax_fetch_list_nonce").val()});a.ajax({url:ajaxurl,global:false,dataType:"json",data:l,success:function(o){theExtraList.get(0).wpList.add(o.rows)}})};theExtraList=a("#the-extra-comment-list").wpList({alt:"",delColor:"none",addColor:"none"});theList=a("#the-comment-list").wpList({alt:"",delBefore:h,dimAfter:f,delAfter:i,addColor:"none"}).bind("wpListDelEnd",function(l,k){var m=k.element.replace(/[^0-9]+/g,"");if(k.target.className.indexOf(":trash
=1")!=-1||k.target.className.indexOf(":spam=1")!=-1){a("#undo-"+m).fadeIn(300,function(){a(this).show()})}})};commentReply={cid:"",act:"",init:function(){var b=a("#replyrow");a("a.cancel",b).click(function(){return commentReply.revert()});a("a.save",b).click(function(){return commentReply.send()});a("input#author, input#author-email, input#author-url",b).keypress(function(c){if(c.which==13){commentReply.send();c.preventDefault();return false}});a("#the-comment-list .column-comment > p").dblclick(function(){commentReply.toggle(a(this).parent())});a("#doaction, #doaction2, #post-query-submit").click(function(c){if(a("#the-comment-list #replyrow").length>0){commentReply.close()}});this.comments_listing=a('#comments-form > input[name="comment_status"]').val()||""},addEvents:function(b){b.each(function(){a(this).find(".column-comment
> p").dblclick(function(){commentReply.toggle(a(this).parent())})})},toggle:function(b){if(a(b).css("display")!="none"){a(b).find("a.vim-q").click()}},revert:function(){if(a("#the-comment-list #replyrow").length<1){return false}a("#replyrow").fadeOut("fast",function(){commentReply.close()});return false},close:function(){var b;if(this.cid){b=a("#comment-"+this.cid);if(this.act=="edit-comment"){b.fadeIn(300,function(){b.show()}).css("backgroundColor","")}a("#replyrow").hide();a("#com-reply").append(a("#replyrow"));a("#replycontent").val("");a("input","#edithead").val("");a(".error","#replysubmit").html("").hide();a(".waiting","#replysubmit").hide();if(a.browser.msie){a("#replycontainer, #replycontent").css("height",&qu
ot;120px")}else{a("#replycontainer").resizable("destroy").css("height","120px")}this.cid=""}},open:function(b,d,k){var m=this,e,f,i,g,j=a("#comment-"+b),l;m.close();m.cid=b;e=a("#replyrow");f=a("#inline-"+b);i=m.act=(k=="edit")?"edit-comment":"replyto-comment";a("#action",e).val(i);a("#comment_post_ID",e).val(d);a("#comment_ID",e).val(b);if(k=="edit"){a("#author",e).val(a("div.author",f).text());a("#author-email",e).val(a("div.author-email",f).text());a("#author-url",e).val(a("div.author-url",f).text());a("#status",e).val(a("div.comment_status",f).text());a("#replycontent",e).val(a("textarea.comment",f).val());a("#edithead, #savebtn",e).show();a("#replyhead, #replybtn",e).hide();g=j.height();if(g>220){
if(a.browser.msie){a("#replycontainer, #replycontent",e).height(g-105)}else{a("#replycontainer",e).height(g-105)}}j.after(e).fadeOut("fast",function(){a("#replyrow").fadeIn(300,function(){a(this).show()})})}else{l=a("#replybtn",e);a("#edithead, #savebtn",e).hide();a("#replyhead, #replybtn",e).show();j.after(e);if(j.hasClass("unapproved")){l.text(adminCommentsL10n.replyApprove)}else{l.text(adminCommentsL10n.reply)}a("#replyrow").fadeIn(300,function(){a(this).show()})}setTimeout(function(){var o,h,p,c,n;o=a("#replyrow").offset().top;h=o+a("#replyrow").height();p=window.pageYOffset||document.documentElement.scrollTop;c=document.documentElement.clientHeight||self.innerHeight||0;n=p+c;if(n-20<h){window.scroll(0,h-c+35)}else{if(o-20<p){window.scroll(0,o-35)}}a("#replycontent").focus().keyup(function(q){if(q.which==27){commentReply.revert()}})},600);return f
alse},send:function(){var b={};a("#replysubmit .error").hide();a("#replysubmit .waiting").show();a("#replyrow input").not(":button").each(function(){b[a(this).attr("name")]=a(this).val()});b.content=a("#replycontent").val();b.id=b.comment_post_ID;b.comments_listing=this.comments_listing;b.p=a('[name="p"]').val();if(a("#comment-"+a("#comment_ID").val()).hasClass("unapproved")){b.approve_parent=1}a.ajax({type:"POST",url:ajaxurl,data:b,success:function(c){commentReply.show(c)},error:function(c){commentReply.error(c)}});return false},show:function(d){var f=this,g,i,h,e,b;f.revert();if(typeof(d)=="string"){f.error({responseText:d});return false}g=wpAjax.parseAjaxResponse(d);if(g.errors){f.error({responseText:wpAjax.broken});return false}g=g.responses[0];i=g.data;h="#comment-"+g.id;if("edit-comment"==f.act){a(h).remove()}if(g.supplemental.pare
nt_approved){b=a("#comment-"+g.supplemental.parent_approved);updatePending(getCount(a("span.pending-count").eq(0))-1);if(this.comments_listing=="moderated"){b.animate({backgroundColor:"#CCEEBB"},400,function(){b.fadeOut()});return}}a(i).hide();a("#replyrow").after(i);h=a(h);f.addEvents(h);e=h.hasClass("unapproved")?"#FFFFE0":h.closest(".widefat").css("backgroundColor");h.animate({backgroundColor:"#CCEEBB"},300).animate({backgroundColor:e},300,function(){if(b&&b.length){b.animate({backgroundColor:"#CCEEBB"},300).animate({backgroundColor:e},300).removeClass("unapproved").addClass("approved").find("div.comment_status").html("1")}})},error:function(b){var c=b.statusText;a("#replysubmit .waiting").hide();if(b.responseText){c=b.responseText.replace(/<.[^<>]*?>/g,"")}if(c){a("#replysubmit .
error").html(c).show()}}};a(document).ready(function(){var e,b,c,d;setCommentsList();commentReply.init();a(document).delegate("span.delete a.delete","click",function(){return false});if(typeof QTags!="undefined"){quicktags({quicktags_id:"replycontent",quicktags_buttons:"strong,em,link,block,del,ins,img,ul,ol,li,code,spell,close"})}if(typeof a.table_hotkeys!="undefined"){e=function(f){return function(){var h,g;h="next"==f?"first":"last";g=a(".tablenav-pages ."+f+"-page:not(.disabled)");if(g.length){window.location=g[0].href.replace(/\&hotkeys_highlight_(first|last)=1/g,"")+"&hotkeys_highlight_"+h+"=1"}}};b=function(g,f){window.location=a("span.edit a",f).attr("href")};c=function(){toggleWithKeyboard=true;a("input:checkbox","#cb").click().prop("checked",false);toggleWithKeyboar
d=false};d=function(f){return function(){var g=a('select[name="action"]');a('option[value="'+f+'"]',g).prop("selected",true);a("#doaction").click()}};a.table_hotkeys(a("table.widefat"),["a","u","s","d","r","q","z",["e",b],["shift+x",c],["shift+a",d("approve")],["shift+s",d("spam")],["shift+d",d("delete")],["shift+t",d("trash")],["shift+z",d("untrash")],["shift+u",d("unapprove")]],{highlight_first:adminCommentsL10n.hotkeys_highlight_first,highlight_last:adminCommentsL10n.hotkeys_highlight_last,prev_page_link_cb:e("prev"),next_page_link_cb:e("next")})}})})(jQuery);
</del><span class="cx">\ No newline at end of file
</span><ins>+var theList,theExtraList,toggleWithKeyboard=false,getCount,updateCount,updatePending,dashboardTotals;(function(a){setCommentsList=function(){var c,e,g,j=0,f,h,d,i,b;c=a('input[name="_total"]',"#comments-form");e=a('input[name="_per_page"]',"#comments-form");g=a('input[name="_page"]',"#comments-form");f=function(n,l){var p=a("#"+l.element),k,o,m;k=a("#replyrow");o=a("#comment_ID",k).val();m=a("#replybtn",k);if(p.is(".unapproved")){if(l.data.id==o){m.text(adminCommentsL10n.replyApprove)}p.find("div.comment_status").html("0")}else{if(l.data.id==o){m.text(adminCommentsL10n.reply)}p.find("div.comment_status").html("1")}a("span.pending-count").each(function(){var q=a(this),s,r;s=q.html().replace(/[^0-9]+/g,"");s=parseInt(s,10);if(isNaN(s)){return}r=a("#"+l.element).is("."+l.dimClass
)?1:-1;s=s+r;if(s<0){s=0}q.closest(".awaiting-mod")[0==s?"addClass":"removeClass"]("count-0");updateCount(q,s);dashboardTotals()})};h=function(o,s){var u=a(o.target).attr("class"),k,l,m,r,t,q,p=false;o.data._total=c.val()||0;o.data._per_page=e.val()||0;o.data._page=g.val()||0;o.data._url=document.location.href;o.data.comment_status=a('input[name="comment_status"]',"#comments-form").val();if(u.indexOf(":trash=1")!=-1){p="trash"}else{if(u.indexOf(":spam=1")!=-1){p="spam"}}if(p){k=u.replace(/.*?comment-([0-9]+).*/,"$1");l=a("#comment-"+k);note=a("#"+p+"-undo-holder").html();l.find(".check-column :checkbox").prop("checked",false);if(l.siblings("#replyrow").length&&commentReply.cid==k){commentReply.close()}if(l.is("tr")){m=l.children(":visible").length;q=a(".author st
rong",l).text();r=a('<tr id="undo-'+k+'" class="undo un'+p+'" style="display:none;"><td colspan="'+m+'">'+note+"</td></tr>")}else{q=a(".comment-author",l).text();r=a('<div id="undo-'+k+'" style="display:none;" class="undo un'+p+'">'+note+"</div>")}l.before(r);a("strong","#undo-"+k).text(q+" ");t=a(".undo a","#undo-"+k);t.attr("href","comment.php?action=un"+p+"comment&c="+k+"&_wpnonce="+o.data._ajax_nonce);t.attr("class","delete:the-comment-list:comment-"+k+"::un"+p+"=1 vim-z vim-destructive");a(".avatar",l).clone().prependTo("#undo-"+k+" ."+p+"-undo-inside");t.click(function(){s.wpList.del(this);a("#undo-"+k).css({backgroundColor:"#ceb"}).fad
eOut(350,function(){a(this).remove();a("#comment-"+k).css("backgroundColor","").fadeIn(300,function(){a(this).show()})});return false})}return o};d=function(k,l,m){if(l<j){return}if(m){j=l}c.val(k.toString());a("span.total-type-count").each(function(){updateCount(a(this),k)})};dashboardTotals=function(q){var p=a("#dashboard_right_now"),l,o,m,k;q=q||0;if(isNaN(q)||!p.length){return}l=a("span.total-count",p);o=a("span.approved-count",p);m=getCount(l);m=m+q;k=m-getCount(a("span.pending-count",p))-getCount(a("span.spam-count",p));updateCount(l,m);updateCount(o,k)};getCount=function(k){var l=parseInt(k.html().replace(/[^0-9]+/g,""),10);if(isNaN(l)){return 0}return l};updateCount=function(l,m){var k="";if(isNaN(m)){return}m=m<1?"0":m.toString();if(m.length>3){while(m.length>3){k=thousandsSeparator+m.substr(m.length-3)+k;m=m.substr(0,m.length-3)}m=m+k}
l.html(m)};updatePending=function(k){a("span.pending-count").each(function(){var l=a(this);if(k<0){k=0}l.closest(".awaiting-mod")[0==k?"addClass":"removeClass"]("count-0");updateCount(l,k);dashboardTotals()})};i=function(k,n){var q,o,u=a(n.target).parent().is("span.untrash"),m=a(n.target).parent().is("span.unspam"),t,s,l,p=a("#"+n.element).is(".unapproved");function v(r){if(a(n.target).parent().is("span."+r)){return 1}else{if(a("#"+n.element).is("."+r)){return -1}}return 0}t=v("spam");s=v("trash");if(u){s=-1}if(m){t=-1}l=getCount(a("span.pending-count").eq(0));if(a(n.target).parent().is("span.unapprove")||((u||m)&&p)){l=l+1}else{if(p){l=l-1}}updatePending(l);a("span.spam-count").each(function(){var r=a(this),w=getCount(r)+t;updateCount(r,w)});a("span.trash-count").each(function(){var r=a
(this),w=getCount(r)+s;updateCount(r,w)});if(a("#dashboard_right_now").length){o=s?-1*s:0;dashboardTotals(o)}else{q=c.val()?parseInt(c.val(),10):0;q=q-t-s;if(q<0){q=0}if(("object"==typeof k)&&j<n.parsed.responses[0].supplemental.time){total_items_i18n=n.parsed.responses[0].supplemental.total_items_i18n||"";if(total_items_i18n){a(".displaying-num").text(total_items_i18n);a(".total-pages").text(n.parsed.responses[0].supplemental.total_pages_i18n);a(".tablenav-pages").find(".next-page, .last-page").toggleClass("disabled",n.parsed.responses[0].supplemental.total_pages==a(".current-page").val())}d(q,n.parsed.responses[0].supplemental.time,true)}else{d(q,k,false)}}if(!theExtraList||theExtraList.size()==0||theExtraList.children().size()==0||u||m){return}theList.get(0).wpList.add(theExtraList.children(":eq(0)").remove().clone());b()};b=function(n){var l=a.query.get(),k=a
(".total-pages").text(),m=a('input[name="_per_page"]',"#comments-form").val();if(!l.paged){l.paged=1}if(l.paged>k){return}if(n){theExtraList.empty();l.number=Math.min(8,m)}else{l.number=1;l.offset=Math.min(8,m)-1}l.no_placeholder=true;l.paged++;if(true===l.comment_type){l.comment_type=""}l=a.extend(l,{action:"fetch-list",list_args:list_args,_ajax_fetch_list_nonce:a("#_ajax_fetch_list_nonce").val()});a.ajax({url:ajaxurl,global:false,dataType:"json",data:l,success:function(o){theExtraList.get(0).wpList.add(o.rows)}})};theExtraList=a("#the-extra-comment-list").wpList({alt:"",delColor:"none",addColor:"none"});theList=a("#the-comment-list").wpList({alt:"",delBefore:h,dimAfter:f,delAfter:i,addColor:"none"}).bind("wpListDelEnd",function(l,k){var m=k.element.replace(/[^0-9]+/g,"");if(k.target.className.indexOf(":trash
=1")!=-1||k.target.className.indexOf(":spam=1")!=-1){a("#undo-"+m).fadeIn(300,function(){a(this).show()})}})};commentReply={cid:"",act:"",init:function(){var b=a("#replyrow");a("a.cancel",b).click(function(){return commentReply.revert()});a("a.save",b).click(function(){return commentReply.send()});a("input#author, input#author-email, input#author-url",b).keypress(function(c){if(c.which==13){commentReply.send();c.preventDefault();return false}});a("#the-comment-list .column-comment > p").dblclick(function(){commentReply.toggle(a(this).parent())});a("#doaction, #doaction2, #post-query-submit").click(function(c){if(a("#the-comment-list #replyrow").length>0){commentReply.close()}});this.comments_listing=a('#comments-form > input[name="comment_status"]').val()||""},addEvents:function(b){b.each(function(){a(this).find(".column-comment
> p").dblclick(function(){commentReply.toggle(a(this).parent())})})},toggle:function(b){if(a(b).css("display")!="none"){a(b).find("a.vim-q").click()}},revert:function(){if(a("#the-comment-list #replyrow").length<1){return false}a("#replyrow").fadeOut("fast",function(){commentReply.close()});return false},close:function(){var b;if(this.cid){b=a("#comment-"+this.cid);if(this.act=="edit-comment"){b.fadeIn(300,function(){b.show()}).css("backgroundColor","")}a("#replyrow").hide();a("#com-reply").append(a("#replyrow"));a("#replycontent").val("");a("input","#edithead").val("");a(".error","#replysubmit").html("").hide();a(".waiting","#replysubmit").hide();if(a.browser.msie){a("#replycontainer, #replycontent").css("height",&qu
ot;120px")}else{a("#replycontainer").resizable("destroy").css("height","120px")}this.cid=""}},open:function(b,d,k){var m=this,e,f,i,g,j=a("#comment-"+b),l;m.close();m.cid=b;e=a("#replyrow");f=a("#inline-"+b);i=m.act=(k=="edit")?"edit-comment":"replyto-comment";a("#action",e).val(i);a("#comment_post_ID",e).val(d);a("#comment_ID",e).val(b);if(k=="edit"){a("#author",e).val(a("div.author",f).text());a("#author-email",e).val(a("div.author-email",f).text());a("#author-url",e).val(a("div.author-url",f).text());a("#status",e).val(a("div.comment_status",f).text());a("#replycontent",e).val(a("textarea.comment",f).val());a("#edithead, #savebtn",e).show();a("#replyhead, #replybtn",e).hide();g=j.height();if(g>220){
if(a.browser.msie){a("#replycontainer, #replycontent",e).height(g-105)}else{a("#replycontainer",e).height(g-105)}}j.after(e).fadeOut("fast",function(){a("#replyrow").fadeIn(300,function(){a(this).show()})})}else{l=a("#replybtn",e);a("#edithead, #savebtn",e).hide();a("#replyhead, #replybtn",e).show();j.after(e);if(j.hasClass("unapproved")){l.text(adminCommentsL10n.replyApprove)}else{l.text(adminCommentsL10n.reply)}a("#replyrow").fadeIn(300,function(){a(this).show()})}setTimeout(function(){var o,h,p,c,n;o=a("#replyrow").offset().top;h=o+a("#replyrow").height();p=window.pageYOffset||document.documentElement.scrollTop;c=document.documentElement.clientHeight||self.innerHeight||0;n=p+c;if(n-20<h){window.scroll(0,h-c+35)}else{if(o-20<p){window.scroll(0,o-35)}}a("#replycontent").focus().keyup(function(q){if(q.which==27){commentReply.revert()}})},600);return f
alse},send:function(){var b={};a("#replysubmit .error").hide();a("#replysubmit .waiting").show();a("#replyrow input").not(":button").each(function(){b[a(this).attr("name")]=a(this).val()});b.content=a("#replycontent").val();b.id=b.comment_post_ID;b.comments_listing=this.comments_listing;b.p=a('[name="p"]').val();if(a("#comment-"+a("#comment_ID").val()).hasClass("unapproved")){b.approve_parent=1}a.ajax({type:"POST",url:ajaxurl,data:b,success:function(c){commentReply.show(c)},error:function(c){commentReply.error(c)}});return false},show:function(d){var f=this,g,i,h,e,b;f.revert();if(typeof(d)=="string"){f.error({responseText:d});return false}g=wpAjax.parseAjaxResponse(d);if(g.errors){f.error({responseText:wpAjax.broken});return false}g=g.responses[0];i=g.data;h="#comment-"+g.id;if("edit-comment"==f.act){a(h).remove()}if(g.supplemental.pare
nt_approved){b=a("#comment-"+g.supplemental.parent_approved);updatePending(getCount(a("span.pending-count").eq(0))-1);if(this.comments_listing=="moderated"){b.animate({backgroundColor:"#CCEEBB"},400,function(){b.fadeOut()});return}}a(i).hide();a("#replyrow").after(i);h=a(h);f.addEvents(h);e=h.hasClass("unapproved")?"#FFFFE0":h.closest(".widefat").css("backgroundColor");h.animate({backgroundColor:"#CCEEBB"},300).animate({backgroundColor:e},300,function(){if(b&&b.length){b.animate({backgroundColor:"#CCEEBB"},300).animate({backgroundColor:e},300).removeClass("unapproved").addClass("approved").find("div.comment_status").html("1")}})},error:function(b){var c=b.statusText;a("#replysubmit .waiting").hide();if(b.responseText){c=b.responseText.replace(/<.[^<>]*?>/g,"")}if(c){a("#replysubmit .
error").html(c).show()}}};a(document).ready(function(){var e,b,c,d;setCommentsList();commentReply.init();a(document).delegate("span.delete a.delete","click",function(){return false});if(typeof QTags!="undefined"){quicktags({id:"replycontent",buttons:"strong,em,link,block,del,ins,img,ul,ol,li,code,spell,close"})}if(typeof a.table_hotkeys!="undefined"){e=function(f){return function(){var h,g;h="next"==f?"first":"last";g=a(".tablenav-pages ."+f+"-page:not(.disabled)");if(g.length){window.location=g[0].href.replace(/\&hotkeys_highlight_(first|last)=1/g,"")+"&hotkeys_highlight_"+h+"=1"}}};b=function(g,f){window.location=a("span.edit a",f).attr("href")};c=function(){toggleWithKeyboard=true;a("input:checkbox","#cb").click().prop("checked",false);toggleWithKeyboard=false};d=function(
f){return function(){var g=a('select[name="action"]');a('option[value="'+f+'"]',g).prop("selected",true);a("#doaction").click()}};a.table_hotkeys(a("table.widefat"),["a","u","s","d","r","q","z",["e",b],["shift+x",c],["shift+a",d("approve")],["shift+s",d("spam")],["shift+d",d("delete")],["shift+t",d("trash")],["shift+z",d("untrash")],["shift+u",d("unapprove")]],{highlight_first:adminCommentsL10n.hotkeys_highlight_first,highlight_last:adminCommentsL10n.hotkeys_highlight_last,prev_page_link_cb:e("prev"),next_page_link_cb:e("next")})}})})(jQuery);
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesclasswpeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-editor.php (18510 => 18511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-editor.php 2011-08-04 16:36:50 UTC (rev 18510)
+++ trunk/wp-includes/class-wp-editor.php 2011-08-05 04:09:22 UTC (rev 18511)
</span><span class="lines">@@ -22,20 +22,20 @@
</span><span class="cx"> var $can_richedit;
</span><span class="cx"> var $default_editor;
</span><span class="cx"> var $first_init;
</span><del>- var $tinymce = false;
- var $quicktags = false;
</del><ins>+ var $this_tinymce = false;
+ var $this_quicktags = false;
</ins><span class="cx">
</span><span class="cx"> function __construct() {
</span><span class="cx"> $this->can_richedit = user_can_richedit();
</span><span class="cx"> $this->default_editor = $this->wp_default_editor();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Outputs the HTML and enqueues the JavaScript for a single instance of the editor.
</span><del>- *
- * $param $content The initial content of the editor.
- * $param $editor_id ID for the textarea and TinyMCE and Quicktags instances (can contain only ASCII letters and numbers).
- * $param $settings See below for description.
</del><ins>+ *
+ * @param $content The initial content of the editor.
+ * @param $editor_id ID for the textarea and TinyMCE and Quicktags instances (can contain only ASCII letters and numbers).
+ * @param $settings See below for description.
</ins><span class="cx"> */
</span><span class="cx"> function editor( $content, $editor_id, $settings = array() ) {
</span><span class="cx">
</span><span class="lines">@@ -52,8 +52,8 @@
</span><span class="cx"> 'quicktags' => true // load Quicktags, can be used to pass settings directly to Quicktags using an array()
</span><span class="cx"> ) );
</span><span class="cx">
</span><del>- $this->tinymce = !empty($set['tinymce']) && $this->can_richedit;
- $this->quicktags = !empty($set['quicktags']);
</del><ins>+ $this->this_tinymce = !empty($set['tinymce']) && $this->can_richedit;
+ $this->this_quicktags = !empty($set['quicktags']);
</ins><span class="cx"> $editor_class = ' class="' . trim( $set['editor_class'] . ' wp-editor-area' ) . '"';
</span><span class="cx"> $tabindex = $set['tabindex'] ? ' tabindex="' . (int) $set['tabindex'] . '"' : '';
</span><span class="cx"> $rows = ' rows="' . (int) $set['textarea_rows'] . '"';
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> if ( !current_user_can( 'upload_files' ) )
</span><span class="cx"> $set['media_buttons'] = false;
</span><span class="cx">
</span><del>- if ( $this->can_richedit && $this->quicktags && $this->tinymce ) {
</del><ins>+ if ( $this->can_richedit && $this->this_quicktags && $this->this_tinymce ) {
</ins><span class="cx"> $switch_class = 'html-active';
</span><span class="cx">
</span><span class="cx"> if ( 'html' == $this->default_editor ) {
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> $buttons .= '<a id="' . $editor_id . '-html" class="hide-if-no-js wp-switch-editor switch-html" onclick="switchEditors.go(this);return false;">' . __('HTML') . "</a>\n";
</span><span class="cx"> $buttons .= '<a id="' . $editor_id . '-tmce" class="hide-if-no-js wp-switch-editor switch-tmce" onclick="switchEditors.go(this);return false;">' . __('Visual') . "</a>\n";
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> echo '<div id="wp-' . $editor_id . '-wrap" class="wp-editor-wrap ' . $switch_class . '">';
</span><span class="cx">
</span><span class="cx"> if ( !empty($set['editor_css']) )
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> if ( $set['media_buttons'] ) {
</span><span class="cx"> if ( !function_exists('media_buttons') )
</span><span class="cx"> include(ABSPATH . 'wp-admin/includes/media.php');
</span><del>-
</del><ins>+
</ins><span class="cx"> echo '<div id="wp-' . $editor_id . '-media-buttons" class="hide-if-no-js wp-media-buttons">';
</span><span class="cx"> do_action('media_buttons', $editor_id);
</span><span class="cx"> echo "</div>\n";
</span><span class="lines">@@ -117,14 +117,14 @@
</span><span class="cx"> global $editor_styles;
</span><span class="cx"> $first_run = false;
</span><span class="cx">
</span><del>- if ( $this->quicktags ) {
</del><ins>+ if ( $this->this_quicktags ) {
</ins><span class="cx"> $qtbuttons = apply_filters( 'quicktags_buttons', array(), $editor_id );
</span><span class="cx"> $qtbuttons_disabled = apply_filters( 'quicktags_disabled_buttons', array(), $editor_id );
</span><span class="cx">
</span><span class="cx"> $qtInit = array(
</span><del>- 'quicktags_id' => $editor_id,
- 'quicktags_buttons' => implode($qtbuttons, ','),
- 'quicktags_disabled_buttons' => implode($qtbuttons_disabled, ',')
</del><ins>+ 'id' => $editor_id,
+ 'buttons' => implode($qtbuttons, ','),
+ 'disabled_buttons' => implode($qtbuttons_disabled, ',')
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> if ( is_array($settings['quicktags']) )
</span><span class="lines">@@ -132,9 +132,9 @@
</span><span class="cx">
</span><span class="cx"> $this->qt_settings[$editor_id] = $qtInit;
</span><span class="cx"> }
</span><del>-
- if ( $this->tinymce ) {
</del><span class="cx">
</span><ins>+ if ( $this->this_tinymce ) {
+
</ins><span class="cx"> if ( empty($this->first_init) ) {
</span><span class="cx"> $this->baseurl = includes_url('js/tinymce');
</span><span class="cx"> $this->mce_locale = $mce_locale = ( '' == get_locale() ) ? 'en' : strtolower( substr(get_locale(), 0, 2) ); // only ISO 639-1
</span><span class="lines">@@ -154,10 +154,10 @@
</span><span class="cx"> If the plugin uses a button, it should be added with one of the "$mce_buttons" filters.
</span><span class="cx"> */
</span><span class="cx"> $mce_external_plugins = apply_filters('mce_external_plugins', array());
</span><del>-
</del><ins>+
</ins><span class="cx"> $ext_plugins = '';
</span><span class="cx"> if ( ! empty($mce_external_plugins) ) {
</span><del>-
</del><ins>+
</ins><span class="cx"> /*
</span><span class="cx"> The following filter loads external language files for TinyMCE plugins.
</span><span class="cx"> It takes an associative array 'plugin_name' => 'path', where path is the
</span><span class="lines">@@ -168,10 +168,10 @@
</span><span class="cx"> If that is not found, en.js will be tried next.
</span><span class="cx"> */
</span><span class="cx"> $mce_external_languages = apply_filters('mce_external_languages', array());
</span><del>-
</del><ins>+
</ins><span class="cx"> $loaded_langs = array();
</span><span class="cx"> $strings = '';
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( ! empty($mce_external_languages) ) {
</span><span class="cx"> foreach ( $mce_external_languages as $name => $path ) {
</span><span class="cx"> if ( @is_file($path) && @is_readable($path) ) {
</span><span class="lines">@@ -181,58 +181,58 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> foreach ( $mce_external_plugins as $name => $url ) {
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( is_ssl() ) $url = str_replace('http://', 'https://', $url);
</span><del>-
</del><ins>+
</ins><span class="cx"> $plugins[] = '-' . $name;
</span><del>-
</del><ins>+
</ins><span class="cx"> $plugurl = dirname($url);
</span><span class="cx"> $strings = $str1 = $str2 = '';
</span><span class="cx"> if ( ! in_array($name, $loaded_langs) ) {
</span><span class="cx"> $path = str_replace( WP_CONTENT_URL, '', $plugurl );
</span><span class="cx"> $path = WP_CONTENT_DIR . $path . '/langs/';
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( function_exists('realpath') )
</span><span class="cx"> $path = trailingslashit( realpath($path) );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( @is_file($path . $mce_locale . '.js') )
</span><span class="cx"> $strings .= @file_get_contents($path . $mce_locale . '.js') . "\n";
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( @is_file($path . $mce_locale . '_dlg.js') )
</span><span class="cx"> $strings .= @file_get_contents($path . $mce_locale . '_dlg.js') . "\n";
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( 'en' != $mce_locale && empty($strings) ) {
</span><span class="cx"> if ( @is_file($path . 'en.js') ) {
</span><span class="cx"> $str1 = @file_get_contents($path . 'en.js');
</span><span class="cx"> $strings .= preg_replace( '/([\'"])en\./', '$1' . $mce_locale . '.', $str1, 1 ) . "\n";
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( @is_file($path . 'en_dlg.js') ) {
</span><span class="cx"> $str2 = @file_get_contents($path . 'en_dlg.js');
</span><span class="cx"> $strings .= preg_replace( '/([\'"])en\./', '$1' . $mce_locale . '.', $str2, 1 ) . "\n";
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( ! empty($strings) )
</span><span class="cx"> $ext_plugins .= "\n" . $strings . "\n";
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $ext_plugins .= 'tinyMCEPreInit.load_ext("' . $plugurl . '", "' . $mce_locale . '");' . "\n";
</span><span class="cx"> $ext_plugins .= 'tinymce.PluginManager.load("' . $name . '", "' . $url . '");' . "\n";
</span><del>-
</del><ins>+
</ins><span class="cx"> $this->ext_plugins .= $ext_plugins;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $plugins = array_unique( apply_filters('tiny_mce_plugins', $plugins) );
</span><span class="cx">
</span><span class="cx"> if ( 'content' == $editor_id ) // enable DFW only on Add/Edit Post screens for now
</span><span class="cx"> $plugins[] = 'wpfullscreen';
</span><span class="cx">
</span><span class="cx"> $this->plugins = $plugins;
</span><del>-
</del><ins>+
</ins><span class="cx"> /*
</span><span class="cx"> The following filter allows localization scripts to change the languages displayed in the spellchecker's drop-down menu.
</span><span class="cx"> By default it uses Google's spellchecker API, but can be configured to use PSpell/ASpell if installed on the server.
</span><span class="lines">@@ -288,7 +288,7 @@
</span><span class="cx"> 'wp_fullscreen_content_css' => "$this->baseurl/plugins/wpfullscreen/css/wp-fullscreen.css",
</span><span class="cx"> 'plugins' => implode( ',', $plugins )
</span><span class="cx"> );
</span><del>-
</del><ins>+
</ins><span class="cx"> // load editor_style.css if the current theme supports it
</span><span class="cx"> if ( ! empty( $editor_styles ) && is_array( $editor_styles ) ) {
</span><span class="cx"> $mce_css = array();
</span><span class="lines">@@ -311,9 +311,9 @@
</span><span class="cx"> } else {
</span><span class="cx"> $mce_css = '';
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $mce_css = trim( apply_filters( 'mce_css', $mce_css ), ' ,' );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( ! empty($mce_css) )
</span><span class="cx"> $this->first_init['content_css'] = $mce_css;
</span><span class="cx"> }
</span><span class="lines">@@ -351,7 +351,7 @@
</span><span class="cx"> 'theme_advanced_buttons3' => implode($mce_buttons_3, ','),
</span><span class="cx"> 'theme_advanced_buttons4' => implode($mce_buttons_4, ',')
</span><span class="cx"> );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $first_run )
</span><span class="cx"> $mceInit = array_merge($this->first_init, $mceInit);
</span><span class="cx">
</span><span class="lines">@@ -367,7 +367,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> $mceInit = apply_filters('tiny_mce_before_init', $mceInit, $editor_id);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( empty($mceInit['theme_advanced_buttons3']) && !empty($mceInit['theme_advanced_buttons4']) ) {
</span><span class="cx"> $mceInit['theme_advanced_buttons3'] = $mceInit['theme_advanced_buttons4'];
</span><span class="cx"> $mceInit['theme_advanced_buttons4'] = '';
</span><span class="lines">@@ -375,9 +375,9 @@
</span><span class="cx">
</span><span class="cx"> $this->mce_settings[$editor_id] = $mceInit;
</span><span class="cx"> $first_run = false;
</span><del>- } // end if $this->tinymce
</del><ins>+ } // end if $this->this_tinymce
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function _parse_init($init) {
</span><span class="cx"> $options = '';
</span><span class="cx">
</span><span class="lines">@@ -395,7 +395,7 @@
</span><span class="cx">
</span><span class="cx"> return '{' . trim( $options, ' ,' ) . '}';
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Find out which editor should be displayed by default.
</span><span class="cx"> *
</span><span class="lines">@@ -419,21 +419,16 @@
</span><span class="cx"> wp_enqueue_script('quicktags');
</span><span class="cx"> wp_enqueue_script('word-count');
</span><span class="cx"> wp_enqueue_script('wplink');
</span><ins>+ wp_enqueue_script('editor');
</ins><span class="cx"> wp_enqueue_style('editor-buttons');
</span><del>-
</del><ins>+
</ins><span class="cx"> wp_enqueue_script('wpdialogs-popup');
</span><span class="cx"> wp_enqueue_style('wp-jquery-ui-dialog');
</span><span class="cx">
</span><del>- if ( $this->tinymce )
- wp_enqueue_script('editor');
- else
- wp_enqueue_script('utils');
-
</del><span class="cx"> if ( in_array('wpfullscreen', $this->plugins, true) )
</span><span class="cx"> wp_enqueue_script('wp-fullscreen');
</span><span class="cx">
</span><del>- if ( !is_admin() )
- add_thickbox();
</del><ins>+ add_thickbox();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function editor_js() {
</span><span class="lines">@@ -447,6 +442,7 @@
</span><span class="cx"> * If the plugin has a popup dialog, a query string can be added to the button action that opens it (in the plugin's code).
</span><span class="cx"> */
</span><span class="cx"> $version = 'ver=' . $tinymce_version;
</span><ins>+ $tmce_on = !empty($this->mce_settings);
</ins><span class="cx">
</span><span class="cx"> if ( ! isset($concatenate_scripts) )
</span><span class="cx"> script_concat_settings();
</span><span class="lines">@@ -454,11 +450,11 @@
</span><span class="cx"> $compressed = $compress_scripts && $concatenate_scripts && isset($_SERVER['HTTP_ACCEPT_ENCODING'])
</span><span class="cx"> && false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip');
</span><span class="cx">
</span><del>- if ( $this->tinymce && 'en' != $this->mce_locale )
</del><ins>+ if ( $tmce_on && 'en' != $this->mce_locale )
</ins><span class="cx"> include_once(ABSPATH . WPINC . '/js/tinymce/langs/wp-langs.php');
</span><span class="cx">
</span><span class="cx"> $mceInit = $qtInit = '';
</span><del>- if ( !empty($this->mce_settings) ) {
</del><ins>+ if ( $tmce_on ) {
</ins><span class="cx"> foreach ( $this->mce_settings as $editor_id => $init ) {
</span><span class="cx"> $options = $this->_parse_init( $init );
</span><span class="cx"> $mceInit .= "'$editor_id':{$options},\n";
</span><span class="lines">@@ -503,7 +499,7 @@
</span><span class="cx"> </script>
</span><span class="cx"> <?php
</span><span class="cx">
</span><del>- if ( $this->tinymce ) {
</del><ins>+ if ( $tmce_on ) {
</ins><span class="cx"> if ( $compressed )
</span><span class="cx"> echo "<script type='text/javascript' src='$this->baseurl/wp-tinymce.php?c=1&amp;$version'></script>\n";
</span><span class="cx"> else
</span><span class="lines">@@ -570,7 +566,7 @@
</span><span class="cx">
</span><span class="cx"> ed.execCommand('mceInsertContent', false, h);
</span><span class="cx"> } else if ( typeof quicktags != 'undefined' ) {
</span><del>- quicktags.insertContent(wpActiveEditor, h);
</del><ins>+ QTags.insertContent(wpActiveEditor, h);
</ins><span class="cx"> } else {
</span><span class="cx"> jQuery('#'+wpActiveEditor).val( jQuery('#'+wpActiveEditor).val() + h );
</span><span class="cx"> }
</span><span class="lines">@@ -582,7 +578,7 @@
</span><span class="cx"> if ( $this->ext_plugins )
</span><span class="cx"> echo "$this->ext_plugins\n";
</span><span class="cx">
</span><del>- if ( ! $compressed && $this->tinymce ) {
</del><ins>+ if ( ! $compressed && $tmce_on ) {
</ins><span class="cx"> ?>
</span><span class="cx"> (function(){var t=tinyMCEPreInit,sl=tinymce.ScriptLoader,ln=t.ref.language,th=t.ref.theme,pl=t.ref.plugins;sl.markDone(t.base+'/langs/'+ln+'.js');sl.markDone(t.base+'/themes/'+th+'/langs/'+ln+'.js');sl.markDone(t.base+'/themes/'+th+'/langs/'+ln+'_dlg.js');sl.markDone(t.base+'/themes/advanced/skins/wp_theme/ui.css');tinymce.each(pl.split(','),function(n){if(n&&n.charAt(0)!='-'){sl.markDone(t.base+'/plugins/'+n+'/langs/'+ln+'.js');sl.markDone(t.base+'/plugins/'+n+'/langs/'+ln+'_dlg.js');}});})();
</span><span class="cx"> <?php
</span><span class="lines">@@ -605,7 +601,7 @@
</span><span class="cx">
</span><span class="cx"> function wp_fullscreen_html() {
</span><span class="cx"> global $content_width, $post;
</span><del>-
</del><ins>+
</ins><span class="cx"> $width = isset($content_width) && 800 > $content_width ? $content_width : 800;
</span><span class="cx"> $width = $width + 10; // compensate for the padding
</span><span class="cx"> $dfw_width = get_user_setting( 'dfw_width', $width );
</span><span class="lines">@@ -616,19 +612,19 @@
</span><span class="cx"> <div id="wp-fullscreen-toolbar">
</span><span class="cx"> <div id="wp-fullscreen-close"><a href="#" onclick="fullscreen.off();return false;"><?php _e('Exit fullscreen'); ?></a></div>
</span><span class="cx"> <div id="wp-fullscreen-central-toolbar" style="width:<?php echo $width; ?>px;">
</span><del>-
</del><ins>+
</ins><span class="cx"> <div id="wp-fullscreen-mode-bar"><div id="wp-fullscreen-modes">
</span><span class="cx"> <a href="#" onclick="fullscreen.switchmode('tinymce');return false;"><?php _e('Visual'); ?></a>
</span><span class="cx"> <a href="#" onclick="fullscreen.switchmode('html');return false;"><?php _e('HTML'); ?></a>
</span><span class="cx"> </div></div>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div id="wp-fullscreen-button-bar"><div id="wp-fullscreen-buttons" class="wp_themeSkin">
</span><span class="cx"> <?php
</span><del>-
</del><ins>+
</ins><span class="cx"> $media_link_type = 'image';
</span><span class="cx"> if ( is_multisite() && ( ( ! $mu_media_buttons = get_site_option( 'mu_media_buttons' ) ) || empty( $mu_media_buttons['image'] ) ) )
</span><span class="cx"> $media_link_type = 'media';
</span><del>-
</del><ins>+
</ins><span class="cx"> $buttons = array(
</span><span class="cx"> // format: title, onclick, show in both editors
</span><span class="cx"> 'bold' => array( 'title' => __('Bold (Ctrl + B)'), 'onclick' => 'fullscreen.b();', 'both' => false ),
</span><span class="lines">@@ -645,15 +641,15 @@
</span><span class="cx"> '3' => 'separator',
</span><span class="cx"> 'help' => array( 'title' => __('Help (Alt + Shift + H)'), 'onclick' => 'fullscreen.help();', 'both' => false )
</span><span class="cx"> );
</span><del>-
</del><ins>+
</ins><span class="cx"> $buttons = apply_filters( 'wp_fullscreen_buttons', $buttons );
</span><del>-
</del><ins>+
</ins><span class="cx"> foreach ( $buttons as $button => $args ) {
</span><span class="cx"> if ( 'separator' == $args ) { ?>
</span><span class="cx"> <div><span aria-orientation="vertical" role="separator" class="mceSeparator"></span></div>
</span><span class="cx"> <?php continue;
</span><span class="cx"> } ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div<?php if ( $args['both'] ) { ?> class="wp-fullscreen-both"<?php } ?>>
</span><span class="cx"> <a title="<?php echo $args['title']; ?>" onclick="<?php echo $args['onclick']; ?>return false;" class="mceButton mceButtonEnabled mce_<?php echo $button; ?>" href="#" id="wp_fs_<?php echo $button; ?>" role="button" aria-pressed="false">
</span><span class="cx"> <span class="mceIcon mce_<?php echo $button; ?>"></span>
</span><span class="lines">@@ -661,39 +657,39 @@
</span><span class="cx"> </div>
</span><span class="cx"> <?php
</span><span class="cx"> } ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> </div></div>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div id="wp-fullscreen-save">
</span><span class="cx"> <span><?php if ( $post->post_status == 'publish' ) _e('Updated.'); else _e('Saved.'); ?></span>
</span><span class="cx"> <img src="images/wpspin_light.gif" alt="" />
</span><span class="cx"> <input type="button" class="button-primary" value="<?php echo $save; ?>" onclick="fullscreen.save();" />
</span><span class="cx"> </div>
</span><del>-
</del><ins>+
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div id="wp-fullscreen-wrap" style="width:<?php echo $dfw_width; ?>px;">
</span><span class="cx"> <label id="wp-fullscreen-title-prompt-text" for="wp-fullscreen-title"><?php echo apply_filters( 'enter_title_here', __( 'Enter title here' ), $post ); ?></label>
</span><span class="cx"> <input type="text" id="wp-fullscreen-title" value="" autocomplete="off" />
</span><del>-
</del><ins>+
</ins><span class="cx"> <div id="wp-fullscreen-container">
</span><span class="cx"> <textarea id="wp_mce_fullscreen"></textarea>
</span><span class="cx"> </div>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div id="wp-fullscreen-status">
</span><span class="cx"> <div id="wp-fullscreen-count"><?php printf( __( 'Word count: %s' ), '<span class="word-count">0</span>' ); ?></div>
</span><span class="cx"> <div id="wp-fullscreen-tagline"><?php _e('Just write.'); ?></div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div class="fullscreen-overlay" id="fullscreen-overlay"></div>
</span><span class="cx"> <div class="fullscreen-overlay fullscreen-fader fade-600" id="fullscreen-fader"></div>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Performs post queries for internal linking.
</span><span class="cx"> *
</span><span class="lines">@@ -705,7 +701,7 @@
</span><span class="cx"> function wp_link_query( $args = array() ) {
</span><span class="cx"> $pts = get_post_types( array( 'public' => true ), 'objects' );
</span><span class="cx"> $pt_names = array_keys( $pts );
</span><del>-
</del><ins>+
</ins><span class="cx"> $query = array(
</span><span class="cx"> 'post_type' => $pt_names,
</span><span class="cx"> 'suppress_filters' => true,
</span><span class="lines">@@ -716,21 +712,21 @@
</span><span class="cx"> 'orderby' => 'post_date',
</span><span class="cx"> 'posts_per_page' => 20,
</span><span class="cx"> );
</span><del>-
</del><ins>+
</ins><span class="cx"> $args['pagenum'] = isset( $args['pagenum'] ) ? absint( $args['pagenum'] ) : 1;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( isset( $args['s'] ) )
</span><span class="cx"> $query['s'] = $args['s'];
</span><del>-
</del><ins>+
</ins><span class="cx"> $query['offset'] = $args['pagenum'] > 1 ? $query['posts_per_page'] * ( $args['pagenum'] - 1 ) : 0;
</span><del>-
</del><ins>+
</ins><span class="cx"> // Do main query.
</span><span class="cx"> $get_posts = new WP_Query;
</span><span class="cx"> $posts = $get_posts->query( $query );
</span><span class="cx"> // Check if any posts were found.
</span><span class="cx"> if ( ! $get_posts->post_count )
</span><span class="cx"> return false;
</span><del>-
</del><ins>+
</ins><span class="cx"> // Build results.
</span><span class="cx"> $results = array();
</span><span class="cx"> foreach ( $posts as $post ) {
</span><span class="lines">@@ -738,7 +734,7 @@
</span><span class="cx"> $info = mysql2date( __( 'Y/m/d' ), $post->post_date );
</span><span class="cx"> else
</span><span class="cx"> $info = $pts[ $post->post_type ]->labels->singular_name;
</span><del>-
</del><ins>+
</ins><span class="cx"> $results[] = array(
</span><span class="cx"> 'ID' => $post->ID,
</span><span class="cx"> 'title' => trim( esc_html( strip_tags( get_the_title( $post ) ) ) ),
</span><span class="lines">@@ -746,10 +742,10 @@
</span><span class="cx"> 'info' => $info,
</span><span class="cx"> );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> return $results;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Dialog for internal linking.
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkwpincludesjsquicktagsdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/quicktags.dev.js (18510 => 18511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/quicktags.dev.js 2011-08-04 16:36:50 UTC (rev 18510)
+++ trunk/wp-includes/js/quicktags.dev.js 2011-08-05 04:09:22 UTC (rev 18511)
</span><span class="lines">@@ -6,9 +6,11 @@
</span><span class="cx"> *
</span><span class="cx"> * Run quicktags(settings) to initialize it, where settings is an object containing up to 3 properties:
</span><span class="cx"> * settings = {
</span><del>- * quicktags_id: 'myid', // required
- * buttons: '', // optional
- * disabled_buttons: '' // optional
</del><ins>+ * id : 'my_id', // the HTML ID of the textarea, required
+ * buttons: '', // Comma separated list of the names of the default buttons to show. Optional.
+ * // This overwrites buttons order and any buttons added by plugins.
+ * // Current list of default button names: 'strong,em,link,block,del,ins,img,ul,ol,li,code,more,spell,close'
+ * disabled_buttons : '' // Comma separated list of the names of the buttons to disable.
</ins><span class="cx"> * }
</span><span class="cx"> *
</span><span class="cx"> * The settings can also be a string quicktags_id.
</span><span class="lines">@@ -24,12 +26,35 @@
</span><span class="cx"> // by Alex King
</span><span class="cx"> // http://www.alexking.org/
</span><span class="cx">
</span><del>-var QTags, edButtons, edButton;
</del><ins>+var QTags, edButtons = [], edCanvas;
</ins><span class="cx">
</span><ins>+/**
+ * Initialize new instance of the Quicktags editor
+ */
</ins><span class="cx"> function quicktags(settings) {
</span><span class="cx"> return new QTags(settings);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Inderts content at the caret in the active editor (textarea)
+ *
+ * Added for back compatibility
+ * @see QTags.insertContent()
+ */
+function edInsertContent(bah, txt) {
+ return QTags.insertContent(txt);
+}
+
+/**
+ * Adds a button to all instances of the editor
+ *
+ * Added for back compatibility
+ * @see QTags.addButton()
+ */
+function edButton(id, display, tagStart, tagEnd, access, open) {
+ return QTags.addButton( id, display, tagStart, tagEnd, open, access );
+}
+
</ins><span class="cx"> (function(){
</span><span class="cx"> // private stuff is prefixed with an underscore
</span><span class="cx"> var _domReady = function(func) {
</span><span class="lines">@@ -109,18 +134,18 @@
</span><span class="cx">
</span><span class="cx"> qt = QTags = function(settings) {
</span><span class="cx"> if ( typeof(settings) == 'string' )
</span><del>- settings = {quicktags_id: settings};
</del><ins>+ settings = {id: settings};
</ins><span class="cx"> else if ( typeof(settings) != 'object' )
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> var t = this,
</span><del>- id = settings.quicktags_id,
</del><ins>+ id = settings.id,
</ins><span class="cx"> buttons = {},
</span><span class="cx"> theButtons = {},
</span><span class="cx"> canvas = document.getElementById(id),
</span><span class="cx"> name = 'qt_' + id,
</span><span class="cx"> html = '',
</span><del>- i, tb, qb, btn, onclick;
</del><ins>+ i, tb, qb, btn, onclick, toolbar_id;
</ins><span class="cx">
</span><span class="cx"> if ( !id || !canvas )
</span><span class="cx"> return false;
</span><span class="lines">@@ -130,6 +155,9 @@
</span><span class="cx">
</span><span class="cx"> // default buttons
</span><span class="cx"> for ( i in edButtons ) {
</span><ins>+ if ( !edButtons[i] )
+ continue;
+
</ins><span class="cx"> buttons[edButtons[i].id] = edButtons[i];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -141,8 +169,8 @@
</span><span class="cx"> buttons[i] = new t._customButtons[i]();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( settings.quicktags_buttons ) {
- qb = settings.quicktags_buttons.split(',');
</del><ins>+ if ( settings.buttons ) {
+ qb = settings.buttons.split(',');
</ins><span class="cx">
</span><span class="cx"> for ( i in qb ) {
</span><span class="cx"> btn = qb[i];
</span><span class="lines">@@ -153,8 +181,8 @@
</span><span class="cx"> theButtons = buttons;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( settings.quicktags_disabled_buttons ) {
- qb = settings.quicktags_disabled_buttons.split(',');
</del><ins>+ if ( settings.disabled_buttons ) {
+ qb = settings.disabled_buttons.split(',');
</ins><span class="cx">
</span><span class="cx"> for ( i in qb ) {
</span><span class="cx"> btn = qb[i];
</span><span class="lines">@@ -166,8 +194,15 @@
</span><span class="cx"> for ( i in theButtons )
</span><span class="cx"> html += theButtons[i].html(name + '_');
</span><span class="cx">
</span><ins>+ if ( id == 'content' && !qt.instances[0] ) { // back compat hack :-(
+ edCanvas = canvas;
+ toolbar_id = 'ed_toolbar';
+ } else {
+ toolbar_id = name + '_toolbar';
+ }
+
</ins><span class="cx"> tb = document.createElement('div');
</span><del>- tb.id = name + '_toolbar';
</del><ins>+ tb.id = toolbar_id;
</ins><span class="cx"> tb.className = 'quicktags-toolbar';
</span><span class="cx">
</span><span class="cx"> canvas.parentNode.insertBefore(tb, canvas);
</span><span class="lines">@@ -197,6 +232,9 @@
</span><span class="cx"> tb.attachEvent('onclick', onclick);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ( !qt.instances[0] )
+ qt.instances[0] = t;
+
</ins><span class="cx"> qt.instances[id] = t;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -209,10 +247,66 @@
</span><span class="cx"> qt.getInstance = function(id) {
</span><span class="cx"> return qt.instances[id];
</span><span class="cx"> };
</span><ins>+
+ /**
+ * Main API function for adding a button to Quicktags
+ *
+ * Adds qt.Button or qt.TagButton depending on the args. The first three args are always required.
+ * For TagButton arg2 is also required. To be able to add button(s) to Quicktags, your script
+ * should be enqueued as dependant on "quicktags" and outputted in the footer. If you are echoing JS
+ * directly from PHP, use add_action( 'admin_print_footer_scripts', 'output_my_js', 100 ) or add_action( 'wp_footer', 'output_my_js', 100 )
+ *
+ * Minimun required to add a button that calls an external function:
+ * QTags.addButton( 'my_id', 'my button', my_callback );
+ * function my_callback() { alert('yeah!'); }
+ *
+ * Minimun required to add a button that inserts a tag:
+ * QTags.addButton( 'my_id', 'my button', '<span>', '</span>' );
+ *
+ * @param id string required button HTML ID
+ * @param display string required button's value="..."
+ * @param arg1 string || function required either a starting tag to be inserted like "<span>" or a callback that is executed when the button is pressed
+ * @param arg2 string ending tag like "</span>"
+ * @param arg3 int set to -1 if the inserted tag is self-closing
+ * @param access string access key for the button
+ * @param title string button's title="..."
+ * @param priority int number representing the desired position of the button in the toolbar. 1 - 9 = first, 11 - 19 = second, 21 - 29 = third, etc.
+ * @return bool TRUE on success FALSE on failure
+ */
+ qt.addButton = function( id, display, arg1, arg2, arg3, access, title, priority ) {
+ var btn;
+
+ if ( !id || !display )
+ return false;
</ins><span class="cx">
</span><del>- qt.insertContent = function(editor_id, content) {
- var sel, startPos, endPos, scrollTop, text, ed = document.getElementById(editor_id);
</del><ins>+ if ( typeof(arg1) == 'function' ) {
+ btn = new qt.Button(id, display, access, title);
+ btn.callback = arg1;
+ } else if ( typeof(arg1) == 'string' && arg1 && arg2 ) {
+ btn = new qt.TagButton(id, display, arg1, arg2, access, arg3, title);
+ } else {
+ return false;
+ }
</ins><span class="cx">
</span><ins>+ if ( priority ) {
+ while ( typeof(edButtons[priority]) != 'undefined' ) {
+ priority++
+ }
+
+ edButtons[priority] = btn;
+ } else {
+ edButtons[edButtons.length] = btn;
+ }
+
+ return true;
+ };
+
+ qt.insertContent = function(content) {
+ var sel, startPos, endPos, scrollTop, text, ed = document.getElementById(wpActiveEditor);
+
+ if ( !ed )
+ return false;
+
</ins><span class="cx"> if ( document.selection ) { //IE
</span><span class="cx"> ed.focus();
</span><span class="cx"> sel = document.selection.createRange();
</span><span class="lines">@@ -234,6 +328,7 @@
</span><span class="cx"> ed.value += content;
</span><span class="cx"> ed.focus();
</span><span class="cx"> }
</span><ins>+ return true;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // a plain, dumb button
</span><span class="lines">@@ -468,22 +563,19 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // ensure backward compatibility
</span><del>- edButtons = [
- new qt.TagButton('strong','b','<strong>','</strong>','b'),
- new qt.TagButton('em','i','<em>','</em>','i'),
- new qt.LinkButton(), // special case
- new qt.TagButton('block','b-quote','\n\n<blockquote>','</blockquote>\n\n','q'),
- new qt.TagButton('del','del','<del datetime="' + _datetime + '">','</del>','d'),
- new qt.TagButton('ins','ins','<ins datetime="' + _datetime + '">','</ins>','s'),
- new qt.ImgButton(), // special case
- new qt.TagButton('ul','ul','<ul>\n','</ul>\n\n','u'),
- new qt.TagButton('ol','ol','<ol>\n','</ol>\n\n','o'),
- new qt.TagButton('li','li','\t<li>','</li>\n','l'),
- new qt.TagButton('code','code','<code>','</code>','c'),
- new qt.TagButton('more','more','<!--more-->','','t',-1),
- new qt.SpellButton(),
- new qt.CloseButton()
- ];
</del><ins>+ edButtons[10] = new qt.TagButton('strong','b','<strong>','</strong>','b');
+ edButtons[20] = new qt.TagButton('em','i','<em>','</em>','i'),
+ edButtons[30] = new qt.LinkButton(), // special case
+ edButtons[40] = new qt.TagButton('block','b-quote','\n\n<blockquote>','</blockquote>\n\n','q'),
+ edButtons[50] = new qt.TagButton('del','del','<del datetime="' + _datetime + '">','</del>','d'),
+ edButtons[60] = new qt.TagButton('ins','ins','<ins datetime="' + _datetime + '">','</ins>','s'),
+ edButtons[70] = new qt.ImgButton(), // special case
+ edButtons[80] = new qt.TagButton('ul','ul','<ul>\n','</ul>\n\n','u'),
+ edButtons[90] = new qt.TagButton('ol','ol','<ol>\n','</ol>\n\n','o'),
+ edButtons[100] = new qt.TagButton('li','li','\t<li>','</li>\n','l'),
+ edButtons[110] = new qt.TagButton('code','code','<code>','</code>','c'),
+ edButtons[120] = new qt.TagButton('more','more','<!--more-->','','t',-1),
+ edButtons[130] = new qt.SpellButton(),
+ edButtons[140] = new qt.CloseButton()
</ins><span class="cx">
</span><del>- edButton = qt.TagButton;
</del><span class="cx"> })();
</span></span></pre></div>
<a id="trunkwpincludesjsquicktagsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/quicktags.js (18510 => 18511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/quicktags.js 2011-08-04 16:36:50 UTC (rev 18510)
+++ trunk/wp-includes/js/quicktags.js 2011-08-05 04:09:22 UTC (rev 18511)
</span><span class="lines">@@ -1 +1 @@
</span><del>-var QTags,edButtons,edButton;function quicktags(a){return new QTags(a)}(function(){var c=function(h){var g,f,e;if(typeof jQuery!="undefined"){jQuery(document).ready(h)}else{g=c;g.funcs=[];g.ready=function(){if(!g.isReady){g.isReady=true;for(f=0;f<g.funcs.length;f++){g.funcs[f]()}}};if(g.isReady){h()}else{g.funcs.push(h)}if(!g.eventAttached){if(document.addEventListener){e=function(){document.removeEventListener("DOMContentLoaded",e,false);g.ready()};document.addEventListener("DOMContentLoaded",e,false);window.addEventListener("load",g.ready,false)}else{if(document.attachEvent){e=function(){if(document.readyState==="complete"){document.detachEvent("onreadystatechange",e);g.ready()}};document.attachEvent("onreadystatechange",e);window.attachEvent("onload",g.ready);(function(){try{document.documentElement.doScroll("left")}catch(i){setTimeout(arguments.callee,50);return}g.rea
dy()})()}}g.eventAttached=true}}},a=(function(){var e=new Date(),f;f=function(g){var h=g.toString();if(h.length<2){h="0"+h}return h};return e.getUTCFullYear()+"-"+f(e.getUTCMonth()+1)+"-"+f(e.getUTCDate())+"T"+f(e.getUTCHours())+":"+f(e.getUTCMinutes())+":"+f(e.getUTCSeconds())+"+00:00"})(),b={},d;d=QTags=function(j){if(typeof(j)=="string"){j={quicktags_id:j}}else{if(typeof(j)!="object"){return false}}var r=this,f=j.quicktags_id,p={},o={},h=document.getElementById(f),e="qt_"+f,n="",m,k,l,g,q;if(!f||!h){return false}r.name=e;r.id=f;for(m in edButtons){p[edButtons[m].id]=edButtons[m]}if(f=="content"&&adminpage&&(adminpage=="post-new-php"||adminpage=="post-php")){p.fullscreen=new d.FullscreenButton()}for(m in r._customButtons){p[m]=new r._customButtons[m]()}if(j.quicktags_buttons){l=j.quicktags_buttons.split(","
);for(m in l){g=l[m];if(p[g]){o[g]=p[g]}}}else{o=p}if(j.quicktags_disabled_buttons){l=j.quicktags_disabled_buttons.split(",");for(m in l){g=l[m];if(o[g]){delete (o[g])}}}for(m in o){n+=o[m].html(e+"_")}k=document.createElement("div");k.id=e+"_toolbar";k.className="quicktags-toolbar";h.parentNode.insertBefore(k,h);k.innerHTML=n;r.toolbar=k;q=function(u){u=u||window.event;var t=u.target||u.srcElement,s;if(/\s+ed_button\s+/.test(" "+t.className+" ")){r.canvas=h=document.getElementById(f);s=t.id.replace(e+"_","");if(o[s]){o[s].callback.call(o[s],t,h,r)}}};if(k.addEventListener){k.addEventListener("click",q,false)}else{if(k.attachEvent){k.attachEvent("onclick",q)}}d.instances[f]=r};d.instances={};d.registerButton=function(f,e){b[f]=e};d.getInstance=function(e){return d.instances[e]};d.insertContent=function(l,h){var i,g,f,j,k,e=document.getElementById(l);if(document.selec
tion){e.focus();i=document.selection.createRange();i.text=h;e.focus()}else{if(e.selectionStart||e.selectionStart=="0"){k=e.value;g=e.selectionStart;f=e.selectionEnd;j=e.scrollTop;e.value=k.substring(0,g)+h+k.substring(f,k.length);e.focus();e.selectionStart=g+h.length;e.selectionEnd=g+h.length;e.scrollTop=j}else{e.value+=h;e.focus()}}};d.Button=function(i,g,e,h){var f=this;f.id=i;f.display=g;f.access=e;f.title=h||""};d.Button.prototype.html=function(f){var e=this.access?' accesskey="'+this.access+'"':"";return'<input type="button" id="'+f+this.id+'"'+e+' class="ed_button" title="'+this.title+'" value="'+this.display+'" />'};d.Button.prototype.callback=function(e){};d.TagButton=function(l,j,g,f,e,h,k){var i=this;d.Button.call(i,l,j,e,k);i.tagStart=g;i.tagEnd=f;i.open=h};d.TagButton.prototype=new d.Button();d.TagButton.prototype.openTag=function(h,f){var g=this;if(!f.openTags){f.open
Tags=[]}if(g.tagEnd){f.openTags.push(g.id);h.value="/"+h.value}};d.TagButton.prototype.closeTag=function(j,f){var h=this,g=h.isOpen(f);if(g!==false){f.openTags.splice(g,1)}j.value=h.display};d.TagButton.prototype.isOpen=function(e){var h=this,g=0,f=false;if(e.openTags){while(f===false&&g<e.openTags.length){f=e.openTags[g]==h.id?g:false;g++}}else{f=false}return f};d.TagButton.prototype.callback=function(o,j,q){var u=this,p,f,m,h,s,k,e,n,g;s=j.value;if(document.selection){j.focus();g=document.selection.createRange();if(g.text.length>0){g.text=u.tagStart+g.text+u.tagEnd}else{if(u.isOpen(q)===false||u.tagEnd===""){g.text=u.tagStart;u.openTag(o,q)}else{g.text=u.tagEnd;u.closeTag(o,q)}}j.focus()}else{if(j.selectionStart||j.selectionStart=="0"){p=j.selectionStart;f=j.selectionEnd;m=f;h=j.scrollTop;k=s.substring(0,p);e=s.substring(f,s.length);n=s.substring(p,f);if(p!=f){j.value=k+u.tagStart+n+u.tagEnd+e;if(u.tagEnd===""){m=p}m+=u
.tagStart.length+u.tagEnd.length}else{if(u.isOpen(q)===false||u.tagEnd===""){j.value=k+u.tagStart+e;u.openTag(o,q);m=p+u.tagStart.length}else{j.value=k+u.tagEnd+e;m=p+u.tagEnd.length;u.closeTag(o,q)}}j.focus();j.selectionStart=m;j.selectionEnd=m;j.scrollTop=h}else{if(u.isOpen(q)!==false||u.tagEnd===""){j.value+=u.tagStart;u.openTag(o,q)}else{j.value+=u.tagEnd;u.closeTag(o,q)}j.focus()}}};d.SpellButton=function(){d.Button.call(this,"spell",quicktagsL10n.lookup,"",quicktagsL10n.dictionaryLookup)};d.SpellButton.prototype=new d.Button();d.SpellButton.prototype.callback=function(h,g,i){var k="",j,f,e;if(document.selection){g.focus();j=document.selection.createRange();if(j.text.length>0){k=j.text}}else{if(g.selectionStart||g.selectionStart=="0"){f=g.selectionStart;e=g.selectionEnd;if(f!=e){k=g.value.substring(f,e)}}}if(k===""){k=prompt(quicktagsL10n.wordLookup,"")}if(k!==null&&/^\w[\w ]*$/.t
est(k)){window.open("http://www.answers.com/"+encodeURIComponent(k))}};d.CloseButton=function(){d.Button.call(this,"close",quicktagsL10n.closeTags,"",quicktagsL10n.closeAllOpenTags)};d.CloseButton.prototype=new d.Button();d.CloseButton.prototype.callback=function(j,k,f){var h,g,i=f.openTags;if(i){while(i.length>0){h=f.getButton(i[i.length-1]);g=document.getElementById(f.name+"_"+h.id);h.callback.call(h,g,k,f)}}};d.prototype.closeAllTags=function(){var e=this.getButton("close");e.callback.call(e,"",this.canvas,this.toolbar)};d.LinkButton=function(){d.TagButton.call(this,"link","link","","</a>","a")};d.LinkButton.prototype=new d.TagButton();d.LinkButton.prototype.callback=function(j,k,h,g){var f,i=this;if(typeof(wpLink)!="undefined"){wpLink.open();return}if(!g){g="http://"}if(i.isOpen(h)===false){f=prompt(quicktagsL10n.enterURL,g);if(f){i.t
agStart='<a href="'+f+'">';d.TagButton.prototype.callback.call(i,j,k,h)}}else{d.TagButton.prototype.callback.call(i,j,k,h)}};d.ImgButton=function(){d.TagButton.call(this,"img","img","","","m",-1)};d.ImgButton.prototype=new d.TagButton();d.ImgButton.prototype.callback=function(i,k,g,f){if(!f){f="http://"}var j=prompt(quicktagsL10n.enterImageURL,f),h;if(j){h=prompt(quicktagsL10n.enterImageDescription,"");this.tagStart='<img src="'+j+'" alt="'+h+'" />';d.TagButton.prototype.callback.call(this,i,k,g)}};d.FullscreenButton=function(){d.Button.call(this,"fullscreen",quicktagsL10n.fullscreen,"f",quicktagsL10n.toggleFullscreen)};d.FullscreenButton.prototype=new d.Button();d.FullscreenButton.prototype.callback=function(f,g){if(g.id!="content"||typeof(fullscreen)=="undefined"){return}fullscreen.on()};edButtons=[new d.TagButton("str
ong","b","<strong>","</strong>","b"),new d.TagButton("em","i","<em>","</em>","i"),new d.LinkButton(),new d.TagButton("block","b-quote","\n\n<blockquote>","</blockquote>\n\n","q"),new d.TagButton("del","del",'<del datetime="'+a+'">',"</del>","d"),new d.TagButton("ins","ins",'<ins datetime="'+a+'">',"</ins>","s"),new d.ImgButton(),new d.TagButton("ul","ul","<ul>\n","</ul>\n\n","u"),new d.TagButton("ol","ol","<ol>\n","</ol>\n\n","o"),new d.TagButton("li","li","\t<li>","</li>\n","l"),new d.TagButt
on("code","code","<code>","</code>","c"),new d.TagButton("more","more","<!--more-->","","t",-1),new d.SpellButton(),new d.CloseButton()];edButton=d.TagButton})();
</del><span class="cx">\ No newline at end of file
</span><ins>+var QTags,edButtons=[],edCanvas;function quicktags(a){return new QTags(a)}function edInsertContent(b,a){return QTags.insertContent(a)}function edButton(f,e,c,b,a,d){return QTags.addButton(f,e,c,b,d,a)}(function(){var c=function(h){var g,f,e;if(typeof jQuery!="undefined"){jQuery(document).ready(h)}else{g=c;g.funcs=[];g.ready=function(){if(!g.isReady){g.isReady=true;for(f=0;f<g.funcs.length;f++){g.funcs[f]()}}};if(g.isReady){h()}else{g.funcs.push(h)}if(!g.eventAttached){if(document.addEventListener){e=function(){document.removeEventListener("DOMContentLoaded",e,false);g.ready()};document.addEventListener("DOMContentLoaded",e,false);window.addEventListener("load",g.ready,false)}else{if(document.attachEvent){e=function(){if(document.readyState==="complete"){document.detachEvent("onreadystatechange",e);g.ready()}};document.attachEvent("onreadystatechange",e);window.attachEvent("onload",
g.ready);(function(){try{document.documentElement.doScroll("left")}catch(i){setTimeout(arguments.callee,50);return}g.ready()})()}}g.eventAttached=true}}},a=(function(){var e=new Date(),f;f=function(g){var h=g.toString();if(h.length<2){h="0"+h}return h};return e.getUTCFullYear()+"-"+f(e.getUTCMonth()+1)+"-"+f(e.getUTCDate())+"T"+f(e.getUTCHours())+":"+f(e.getUTCMinutes())+":"+f(e.getUTCSeconds())+"+00:00"})(),b={},d;d=QTags=function(k){if(typeof(k)=="string"){k={id:k}}else{if(typeof(k)!="object"){return false}}var s=this,g=k.id,q={},p={},j=document.getElementById(g),e="qt_"+g,o="",n,l,m,h,r,f;if(!g||!j){return false}s.name=e;s.id=g;for(n in edButtons){if(!edButtons[n]){continue}q[edButtons[n].id]=edButtons[n]}if(g=="content"&&adminpage&&(adminpage=="post-new-php"||adminpage=="post-php")){q.fullscreen=new d.Ful
lscreenButton()}for(n in s._customButtons){q[n]=new s._customButtons[n]()}if(k.buttons){m=k.buttons.split(",");for(n in m){h=m[n];if(q[h]){p[h]=q[h]}}}else{p=q}if(k.disabled_buttons){m=k.disabled_buttons.split(",");for(n in m){h=m[n];if(p[h]){delete (p[h])}}}for(n in p){o+=p[n].html(e+"_")}if(g=="content"&&!d.instances[0]){edCanvas=j;f="ed_toolbar"}else{f=e+"_toolbar"}l=document.createElement("div");l.id=f;l.className="quicktags-toolbar";j.parentNode.insertBefore(l,j);l.innerHTML=o;s.toolbar=l;r=function(v){v=v||window.event;var u=v.target||v.srcElement,t;if(/\s+ed_button\s+/.test(" "+u.className+" ")){s.canvas=j=document.getElementById(g);t=u.id.replace(e+"_","");if(p[t]){p[t].callback.call(p[t],u,j,s)}}};if(l.addEventListener){l.addEventListener("click",r,false)}else{if(l.attachEvent){l.attachEvent("onclick",r)}}if(!d.instances
[0]){d.instances[0]=s}d.instances[g]=s};d.instances={};d.registerButton=function(f,e){b[f]=e};d.getInstance=function(e){return d.instances[e]};d.addButton=function(e,k,j,i,h,g,l,m){var f;if(!e||!k){return false}if(typeof(j)=="function"){f=new d.Button(e,k,g,l);f.callback=j}else{if(typeof(j)=="string"&&j&&i){f=new d.TagButton(e,k,j,i,g,h,l)}else{return false}}if(m){while(typeof(edButtons[m])!="undefined"){m++}edButtons[m]=f}else{edButtons[edButtons.length]=f}return true};d.insertContent=function(h){var i,g,f,j,k,e=document.getElementById(wpActiveEditor);if(!e){return false}if(document.selection){e.focus();i=document.selection.createRange();i.text=h;e.focus()}else{if(e.selectionStart||e.selectionStart=="0"){k=e.value;g=e.selectionStart;f=e.selectionEnd;j=e.scrollTop;e.value=k.substring(0,g)+h+k.substring(f,k.length);e.focus();e.selectionStart=g+h.length;e.selectionEnd=g+h.length;e.scrollTop=j}else{e.value+=h;e.focus()}}re
turn true};d.Button=function(i,g,e,h){var f=this;f.id=i;f.display=g;f.access=e;f.title=h||""};d.Button.prototype.html=function(f){var e=this.access?' accesskey="'+this.access+'"':"";return'<input type="button" id="'+f+this.id+'"'+e+' class="ed_button" title="'+this.title+'" value="'+this.display+'" />'};d.Button.prototype.callback=function(e){};d.TagButton=function(l,j,g,f,e,h,k){var i=this;d.Button.call(i,l,j,e,k);i.tagStart=g;i.tagEnd=f;i.open=h};d.TagButton.prototype=new d.Button();d.TagButton.prototype.openTag=function(h,f){var g=this;if(!f.openTags){f.openTags=[]}if(g.tagEnd){f.openTags.push(g.id);h.value="/"+h.value}};d.TagButton.prototype.closeTag=function(j,f){var h=this,g=h.isOpen(f);if(g!==false){f.openTags.splice(g,1)}j.value=h.display};d.TagButton.prototype.isOpen=function(e){var h=this,g=0,f=false;if(e.openTags){while(f===false&&g<e.openTags.length){f=e.ope
nTags[g]==h.id?g:false;g++}}else{f=false}return f};d.TagButton.prototype.callback=function(o,j,q){var u=this,p,f,m,h,s,k,e,n,g;s=j.value;if(document.selection){j.focus();g=document.selection.createRange();if(g.text.length>0){g.text=u.tagStart+g.text+u.tagEnd}else{if(u.isOpen(q)===false||u.tagEnd===""){g.text=u.tagStart;u.openTag(o,q)}else{g.text=u.tagEnd;u.closeTag(o,q)}}j.focus()}else{if(j.selectionStart||j.selectionStart=="0"){p=j.selectionStart;f=j.selectionEnd;m=f;h=j.scrollTop;k=s.substring(0,p);e=s.substring(f,s.length);n=s.substring(p,f);if(p!=f){j.value=k+u.tagStart+n+u.tagEnd+e;if(u.tagEnd===""){m=p}m+=u.tagStart.length+u.tagEnd.length}else{if(u.isOpen(q)===false||u.tagEnd===""){j.value=k+u.tagStart+e;u.openTag(o,q);m=p+u.tagStart.length}else{j.value=k+u.tagEnd+e;m=p+u.tagEnd.length;u.closeTag(o,q)}}j.focus();j.selectionStart=m;j.selectionEnd=m;j.scrollTop=h}else{if(u.isOpen(q)!==false||u.tagEnd===""){j.value+=u.t
agStart;u.openTag(o,q)}else{j.value+=u.tagEnd;u.closeTag(o,q)}j.focus()}}};d.SpellButton=function(){d.Button.call(this,"spell",quicktagsL10n.lookup,"",quicktagsL10n.dictionaryLookup)};d.SpellButton.prototype=new d.Button();d.SpellButton.prototype.callback=function(h,g,i){var k="",j,f,e;if(document.selection){g.focus();j=document.selection.createRange();if(j.text.length>0){k=j.text}}else{if(g.selectionStart||g.selectionStart=="0"){f=g.selectionStart;e=g.selectionEnd;if(f!=e){k=g.value.substring(f,e)}}}if(k===""){k=prompt(quicktagsL10n.wordLookup,"")}if(k!==null&&/^\w[\w ]*$/.test(k)){window.open("http://www.answers.com/"+encodeURIComponent(k))}};d.CloseButton=function(){d.Button.call(this,"close",quicktagsL10n.closeTags,"",quicktagsL10n.closeAllOpenTags)};d.CloseButton.prototype=new d.Button();d.CloseButton.prototype.callback=function(j,k,f){var h,g,i=f.openTags;if(i){while(i.
length>0){h=f.getButton(i[i.length-1]);g=document.getElementById(f.name+"_"+h.id);h.callback.call(h,g,k,f)}}};d.prototype.closeAllTags=function(){var e=this.getButton("close");e.callback.call(e,"",this.canvas,this.toolbar)};d.LinkButton=function(){d.TagButton.call(this,"link","link","","</a>","a")};d.LinkButton.prototype=new d.TagButton();d.LinkButton.prototype.callback=function(j,k,h,g){var f,i=this;if(typeof(wpLink)!="undefined"){wpLink.open();return}if(!g){g="http://"}if(i.isOpen(h)===false){f=prompt(quicktagsL10n.enterURL,g);if(f){i.tagStart='<a href="'+f+'">';d.TagButton.prototype.callback.call(i,j,k,h)}}else{d.TagButton.prototype.callback.call(i,j,k,h)}};d.ImgButton=function(){d.TagButton.call(this,"img","img","","","m",-1)};d.ImgButton.prototype=new d.TagButton();d.ImgButton.prototype.callback=fu
nction(i,k,g,f){if(!f){f="http://"}var j=prompt(quicktagsL10n.enterImageURL,f),h;if(j){h=prompt(quicktagsL10n.enterImageDescription,"");this.tagStart='<img src="'+j+'" alt="'+h+'" />';d.TagButton.prototype.callback.call(this,i,k,g)}};d.FullscreenButton=function(){d.Button.call(this,"fullscreen",quicktagsL10n.fullscreen,"f",quicktagsL10n.toggleFullscreen)};d.FullscreenButton.prototype=new d.Button();d.FullscreenButton.prototype.callback=function(f,g){if(g.id!="content"||typeof(fullscreen)=="undefined"){return}fullscreen.on()};edButtons[10]=new d.TagButton("strong","b","<strong>","</strong>","b");edButtons[20]=new d.TagButton("em","i","<em>","</em>","i"),edButtons[30]=new d.LinkButton(),edButtons[40]=new d.TagButton("block","b-quote","\n\n<blo
ckquote>","</blockquote>\n\n","q"),edButtons[50]=new d.TagButton("del","del",'<del datetime="'+a+'">',"</del>","d"),edButtons[60]=new d.TagButton("ins","ins",'<ins datetime="'+a+'">',"</ins>","s"),edButtons[70]=new d.ImgButton(),edButtons[80]=new d.TagButton("ul","ul","<ul>\n","</ul>\n\n","u"),edButtons[90]=new d.TagButton("ol","ol","<ol>\n","</ol>\n\n","o"),edButtons[100]=new d.TagButton("li","li","\t<li>","</li>\n","l"),edButtons[110]=new d.TagButton("code","code","<code>","</code>","c"),edButtons[120]=new d.TagButton("more","more","<!--more-->
","","t",-1),edButtons[130]=new d.SpellButton(),edButtons[140]=new d.CloseButton()})();
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (18510 => 18511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2011-08-04 16:36:50 UTC (rev 18510)
+++ trunk/wp-includes/script-loader.php 2011-08-05 04:09:22 UTC (rev 18511)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'sack', "/wp-includes/js/tw-sack$suffix.js", false, '1.6.1', 1 );
</span><span class="cx">
</span><del>- $scripts->add( 'quicktags', "/wp-includes/js/quicktags$suffix.js", false, '20110802', 1 );
</del><ins>+ $scripts->add( 'quicktags', "/wp-includes/js/quicktags$suffix.js", false, '20110804', 1 );
</ins><span class="cx"> $scripts->add_script_data( 'quicktags', 'quicktagsL10n', array(
</span><span class="cx"> 'wordLookup' => __('Enter a word to look up:'),
</span><span class="cx"> 'dictionaryLookup' => esc_attr(__('Dictionary lookup')),
</span><span class="lines">@@ -269,7 +269,7 @@
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'admin-custom-fields', "/wp-admin/js/custom-fields$suffix.js", array('wp-lists'), '20110429', 1 );
</span><span class="cx">
</span><del>- $scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array('wp-lists', 'jquery-ui-resizable', 'quicktags', 'jquery-query'), '20110802', 1 );
</del><ins>+ $scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array('wp-lists', 'jquery-ui-resizable', 'quicktags', 'jquery-query'), '20110804', 1 );
</ins><span class="cx"> $scripts->add_script_data( 'admin-comments', 'adminCommentsL10n', array(
</span><span class="cx"> 'hotkeys_highlight_first' => isset($_GET['hotkeys_highlight_first']),
</span><span class="cx"> 'hotkeys_highlight_last' => isset($_GET['hotkeys_highlight_last']),
</span></span></pre>
</div>
</div>
</body>
</html>