From 188fce6c9b502e1bf9aa03850b3af8112977a61b Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Thu, 14 Nov 2013 18:41:10 +0000 Subject: [PATCH] Heartbeat: clean up code style, better naming, better code structure. Props carldanley, props evansolomon. Changes: - Add connectNow() public method to trigger a connection immediately. - Remove the "skipping" when no data to send. - Change the default interval to 60 sec. - Fix resetting the next connection time when changing the interval. See #25073. Built from https://develop.svn.wordpress.org/trunk@26169 git-svn-id: http://core.svn.wordpress.org/trunk@26078 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/post.php | 2 +- wp-admin/js/inline-edit-post.js | 5 + wp-admin/js/inline-edit-post.min.js | 2 +- wp-admin/js/post.js | 5 + wp-admin/js/post.min.js | 2 +- wp-includes/js/heartbeat.js | 714 ++++++++++++++++++---------- wp-includes/js/heartbeat.min.js | 2 +- 7 files changed, 480 insertions(+), 252 deletions(-) diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php index 7d074dd779..983e4e7023 100644 --- a/wp-admin/includes/post.php +++ b/wp-admin/includes/post.php @@ -1185,7 +1185,7 @@ function wp_check_post_lock( $post_id ) { $time = $lock[0]; $user = isset( $lock[1] ) ? $lock[1] : get_post_meta( $post->ID, '_edit_last', true ); - $time_window = apply_filters( 'wp_check_post_lock_window', 120 ); + $time_window = apply_filters( 'wp_check_post_lock_window', 150 ); if ( $time && $time > time() - $time_window && $user != get_current_user_id() ) return $user; diff --git a/wp-admin/js/inline-edit-post.js b/wp-admin/js/inline-edit-post.js index e2f05b5c3f..6036ba317b 100644 --- a/wp-admin/js/inline-edit-post.js +++ b/wp-admin/js/inline-edit-post.js @@ -325,6 +325,11 @@ $( document ).on( 'heartbeat-tick.wp-check-locked-posts', function( e, data ) { if ( check.length ) data['wp-check-locked-posts'] = check; +}).ready( function() { + // Set the heartbeat interval to 15 sec. + if ( typeof wp !== 'undefined' && wp.heartbeat ) { + wp.heartbeat.setInterval( 15 ); + } }); }(jQuery)); diff --git a/wp-admin/js/inline-edit-post.min.js b/wp-admin/js/inline-edit-post.min.js index 4016edc6c5..51f68d3001 100644 --- a/wp-admin/js/inline-edit-post.min.js +++ b/wp-admin/js/inline-edit-post.min.js @@ -1 +1 @@ -!function(a){inlineEditPost={init:function(){var b=this,c=a("#inline-edit"),d=a("#bulk-edit");b.type=a("table.widefat").hasClass("pages")?"page":"post",b.what="#post-",c.keyup(function(a){return 27==a.which?inlineEditPost.revert():void 0}),d.keyup(function(a){return 27==a.which?inlineEditPost.revert():void 0}),a("a.cancel",c).click(function(){return inlineEditPost.revert()}),a("a.save",c).click(function(){return inlineEditPost.save(this)}),a("td",c).keydown(function(a){return 13==a.which?inlineEditPost.save(this):void 0}),a("a.cancel",d).click(function(){return inlineEditPost.revert()}),a('#inline-edit .inline-edit-private input[value="private"]').click(function(){var b=a("input.inline-edit-password-input");a(this).prop("checked")?b.val("").prop("disabled",!0):b.prop("disabled",!1)}),a("#the-list").on("click","a.editinline",function(){return inlineEditPost.edit(this),!1}),a("#bulk-title-div").parents("fieldset").after(a("#inline-edit fieldset.inline-edit-categories").clone()).siblings("fieldset:last").prepend(a("#inline-edit label.inline-edit-tags").clone()),a('select[name="_status"] option[value="future"]',d).remove(),a("#doaction, #doaction2").click(function(c){var d=a(this).attr("id").substr(2);"edit"==a('select[name="'+d+'"]').val()?(c.preventDefault(),b.setBulk()):a("form#posts-filter tr.inline-editor").length>0&&b.revert()})},toggle:function(b){var c=this;"none"==a(c.what+c.getId(b)).css("display")?c.revert():c.edit(b)},setBulk:function(){var b,c="",d=this.type,e=!0;return this.revert(),a("#bulk-edit td").attr("colspan",a(".widefat:first thead th:visible").length),a("table.widefat tbody").prepend(a("#bulk-edit")),a("#bulk-edit").addClass("inline-editor").show(),a('tbody th.check-column input[type="checkbox"]').each(function(){if(a(this).prop("checked")){e=!1;var b,d=a(this).val();b=a("#inline_"+d+" .post_title").html()||inlineEditL10n.notitle,c+='
X'+b+"
"}}),e?this.revert():(a("#bulk-titles").html(c),a("#bulk-titles a").click(function(){var b=a(this).attr("id").substr(1);a('table.widefat input[value="'+b+'"]').prop("checked",!1),a("#ttle"+b).remove()}),"post"==d&&(b="post_tag",a('tr.inline-editor textarea[name="tax_input['+b+']"]').suggest(ajaxurl+"?action=ajax-tag-search&tax="+b,{delay:500,minchars:2,multiple:!0,multipleSep:inlineEditL10n.comma+" "})),a("html, body").animate({scrollTop:0},"fast"),void 0)},edit:function(b){var c,d,e,f,g,h,i,j,k,l,m=this,n=!0;for(m.revert(),"object"==typeof b&&(b=m.getId(b)),c=["post_title","post_name","post_author","_status","jj","mm","aa","hh","mn","ss","post_password","post_format","menu_order"],"page"==m.type&&c.push("post_parent","page_template"),d=a("#inline-edit").clone(!0),a("td",d).attr("colspan",a(".widefat:first thead th:visible").length),a(m.what+b).hasClass("alternate")&&a(d).addClass("alternate"),a(m.what+b).hide().after(d),e=a("#inline_"+b),a(':input[name="post_author"] option[value="'+a(".post_author",e).text()+'"]',d).val()||a(':input[name="post_author"]',d).prepend('"),1==a(':input[name="post_author"] option',d).length&&a("label.inline-edit-author",d).hide(),k=a(".post_format",e).text(),a("option.unsupported",d).each(function(){var b=a(this);b.val()!=k&&b.remove()}),l=0;l0){for(h=g[0].className.split("-")[1],i=g;n&&(i=i.next("option"),0!=i.length);)j=i[0].className.split("-")[1],h>=j?n=!1:(i.remove(),i=g);g.remove()}return a(d).attr("id","edit-"+b).addClass("inline-editor").show(),a(".ptitle",d).focus(),!1},save:function(b){var c,d,e=a(".post_status_page").val()||"";return"object"==typeof b&&(b=this.getId(b)),a("table.widefat .spinner").show(),c={action:"inline-save",post_type:typenow,post_ID:b,edit_date:"true",post_status:e},d=a("#edit-"+b).find(":input").serialize(),c=d+"&"+a.param(c),a.post(ajaxurl,c,function(c){a("table.widefat .spinner").hide(),c?-1!=c.indexOf("]*?>/g,""),a("#edit-"+b+" .inline-edit-save .error").html(c).show()):a("#edit-"+b+" .inline-edit-save .error").html(inlineEditL10n.error).show(),a("#post-"+b).prev().hasClass("alternate")&&a("#post-"+b).removeClass("alternate")},"html"),!1},revert:function(){var b=a("table.widefat tr.inline-editor").attr("id");return b&&(a("table.widefat .spinner").hide(),"bulk-edit"==b?(a("table.widefat #bulk-edit").removeClass("inline-editor").hide(),a("#bulk-titles").html(""),a("#inlineedit").append(a("#bulk-edit"))):(a("#"+b).remove(),b=b.substr(b.lastIndexOf("-")+1),a(this.what+b).show())),!1},getId:function(b){var c=a(b).closest("tr").attr("id"),d=c.split("-");return d[d.length-1]}},a(document).ready(function(){inlineEditPost.init()}),a(document).on("heartbeat-tick.wp-check-locked-posts",function(b,c){var d=c["wp-check-locked-posts"]||{};a("#the-list tr").each(function(b,c){var e,f,g=c.id,h=a(c);d.hasOwnProperty(g)?h.hasClass("wp-locked")||(e=d[g],h.find(".column-title .locked-text").text(e.text),h.find(".check-column checkbox").prop("checked",!1),e.avatar_src&&(f=a('').attr("src",e.avatar_src.replace(/&/g,"&")),h.find(".column-title .locked-avatar").empty().append(f)),h.addClass("wp-locked")):h.hasClass("wp-locked")&&h.removeClass("wp-locked").delay(1e3).find(".locked-info span").empty()})}).on("heartbeat-send.wp-check-locked-posts",function(b,c){var d=[];a("#the-list tr").each(function(a,b){b.id&&d.push(b.id)}),d.length&&(c["wp-check-locked-posts"]=d)})}(jQuery); \ No newline at end of file +!function(a){inlineEditPost={init:function(){var b=this,c=a("#inline-edit"),d=a("#bulk-edit");b.type=a("table.widefat").hasClass("pages")?"page":"post",b.what="#post-",c.keyup(function(a){return 27==a.which?inlineEditPost.revert():void 0}),d.keyup(function(a){return 27==a.which?inlineEditPost.revert():void 0}),a("a.cancel",c).click(function(){return inlineEditPost.revert()}),a("a.save",c).click(function(){return inlineEditPost.save(this)}),a("td",c).keydown(function(a){return 13==a.which?inlineEditPost.save(this):void 0}),a("a.cancel",d).click(function(){return inlineEditPost.revert()}),a('#inline-edit .inline-edit-private input[value="private"]').click(function(){var b=a("input.inline-edit-password-input");a(this).prop("checked")?b.val("").prop("disabled",!0):b.prop("disabled",!1)}),a("#the-list").on("click","a.editinline",function(){return inlineEditPost.edit(this),!1}),a("#bulk-title-div").parents("fieldset").after(a("#inline-edit fieldset.inline-edit-categories").clone()).siblings("fieldset:last").prepend(a("#inline-edit label.inline-edit-tags").clone()),a('select[name="_status"] option[value="future"]',d).remove(),a("#doaction, #doaction2").click(function(c){var d=a(this).attr("id").substr(2);"edit"==a('select[name="'+d+'"]').val()?(c.preventDefault(),b.setBulk()):a("form#posts-filter tr.inline-editor").length>0&&b.revert()})},toggle:function(b){var c=this;"none"==a(c.what+c.getId(b)).css("display")?c.revert():c.edit(b)},setBulk:function(){var b,c="",d=this.type,e=!0;return this.revert(),a("#bulk-edit td").attr("colspan",a(".widefat:first thead th:visible").length),a("table.widefat tbody").prepend(a("#bulk-edit")),a("#bulk-edit").addClass("inline-editor").show(),a('tbody th.check-column input[type="checkbox"]').each(function(){if(a(this).prop("checked")){e=!1;var b,d=a(this).val();b=a("#inline_"+d+" .post_title").html()||inlineEditL10n.notitle,c+='
X'+b+"
"}}),e?this.revert():(a("#bulk-titles").html(c),a("#bulk-titles a").click(function(){var b=a(this).attr("id").substr(1);a('table.widefat input[value="'+b+'"]').prop("checked",!1),a("#ttle"+b).remove()}),"post"==d&&(b="post_tag",a('tr.inline-editor textarea[name="tax_input['+b+']"]').suggest(ajaxurl+"?action=ajax-tag-search&tax="+b,{delay:500,minchars:2,multiple:!0,multipleSep:inlineEditL10n.comma+" "})),a("html, body").animate({scrollTop:0},"fast"),void 0)},edit:function(b){var c,d,e,f,g,h,i,j,k,l,m=this,n=!0;for(m.revert(),"object"==typeof b&&(b=m.getId(b)),c=["post_title","post_name","post_author","_status","jj","mm","aa","hh","mn","ss","post_password","post_format","menu_order"],"page"==m.type&&c.push("post_parent","page_template"),d=a("#inline-edit").clone(!0),a("td",d).attr("colspan",a(".widefat:first thead th:visible").length),a(m.what+b).hasClass("alternate")&&a(d).addClass("alternate"),a(m.what+b).hide().after(d),e=a("#inline_"+b),a(':input[name="post_author"] option[value="'+a(".post_author",e).text()+'"]',d).val()||a(':input[name="post_author"]',d).prepend('"),1==a(':input[name="post_author"] option',d).length&&a("label.inline-edit-author",d).hide(),k=a(".post_format",e).text(),a("option.unsupported",d).each(function(){var b=a(this);b.val()!=k&&b.remove()}),l=0;l0){for(h=g[0].className.split("-")[1],i=g;n&&(i=i.next("option"),0!=i.length);)j=i[0].className.split("-")[1],h>=j?n=!1:(i.remove(),i=g);g.remove()}return a(d).attr("id","edit-"+b).addClass("inline-editor").show(),a(".ptitle",d).focus(),!1},save:function(b){var c,d,e=a(".post_status_page").val()||"";return"object"==typeof b&&(b=this.getId(b)),a("table.widefat .spinner").show(),c={action:"inline-save",post_type:typenow,post_ID:b,edit_date:"true",post_status:e},d=a("#edit-"+b).find(":input").serialize(),c=d+"&"+a.param(c),a.post(ajaxurl,c,function(c){a("table.widefat .spinner").hide(),c?-1!=c.indexOf("]*?>/g,""),a("#edit-"+b+" .inline-edit-save .error").html(c).show()):a("#edit-"+b+" .inline-edit-save .error").html(inlineEditL10n.error).show(),a("#post-"+b).prev().hasClass("alternate")&&a("#post-"+b).removeClass("alternate")},"html"),!1},revert:function(){var b=a("table.widefat tr.inline-editor").attr("id");return b&&(a("table.widefat .spinner").hide(),"bulk-edit"==b?(a("table.widefat #bulk-edit").removeClass("inline-editor").hide(),a("#bulk-titles").html(""),a("#inlineedit").append(a("#bulk-edit"))):(a("#"+b).remove(),b=b.substr(b.lastIndexOf("-")+1),a(this.what+b).show())),!1},getId:function(b){var c=a(b).closest("tr").attr("id"),d=c.split("-");return d[d.length-1]}},a(document).ready(function(){inlineEditPost.init()}),a(document).on("heartbeat-tick.wp-check-locked-posts",function(b,c){var d=c["wp-check-locked-posts"]||{};a("#the-list tr").each(function(b,c){var e,f,g=c.id,h=a(c);d.hasOwnProperty(g)?h.hasClass("wp-locked")||(e=d[g],h.find(".column-title .locked-text").text(e.text),h.find(".check-column checkbox").prop("checked",!1),e.avatar_src&&(f=a('').attr("src",e.avatar_src.replace(/&/g,"&")),h.find(".column-title .locked-avatar").empty().append(f)),h.addClass("wp-locked")):h.hasClass("wp-locked")&&h.removeClass("wp-locked").delay(1e3).find(".locked-info span").empty()})}).on("heartbeat-send.wp-check-locked-posts",function(b,c){var d=[];a("#the-list tr").each(function(a,b){b.id&&d.push(b.id)}),d.length&&(c["wp-check-locked-posts"]=d)}).ready(function(){"undefined"!=typeof wp&&wp.heartbeat&&wp.heartbeat.setInterval(15)})}(jQuery); \ No newline at end of file diff --git a/wp-admin/js/post.js b/wp-admin/js/post.js index 7b7d4c3944..2bf93fc18e 100644 --- a/wp-admin/js/post.js +++ b/wp-admin/js/post.js @@ -370,6 +370,11 @@ jQuery(document).ready( function($) { e.preventDefault(); } }).filter(':visible').find('.wp-tab-first').focus(); + + // Set the heartbeat interval to 15 sec. if post lock dialogs are enabled + if ( typeof wp !== 'undefined' && wp.heartbeat && $('#post-lock-dialog').length ) { + wp.heartbeat.setInterval( 15 ); + } // multi-taxonomies if ( $('#tagsdiv-post_tag').length ) { diff --git a/wp-admin/js/post.min.js b/wp-admin/js/post.min.js index 379015a267..0983865d1a 100644 --- a/wp-admin/js/post.min.js +++ b/wp-admin/js/post.min.js @@ -1 +1 @@ -function array_unique_noempty(a){var b=[];return jQuery.each(a,function(a,c){c=jQuery.trim(c),c&&-1==jQuery.inArray(c,b)&&b.push(c)}),b}var tagBox,commentsBox,editPermalink,makeSlugeditClickable,WPSetThumbnailHTML,WPSetThumbnailID,WPRemoveThumbnail,wptitlehint;!function(a){tagBox={clean:function(a){var b=postL10n.comma;return","!==b&&(a=a.replace(new RegExp(b,"g"),",")),a=a.replace(/\s*,\s*/g,",").replace(/,+/g,",").replace(/[,\s]+$/,"").replace(/^[,\s]+/,""),","!==b&&(a=a.replace(/,/g,b)),a},parseTags:function(b){var c=b.id,d=c.split("-check-num-")[1],e=a(b).closest(".tagsdiv"),f=e.find(".the-tags"),g=postL10n.comma,h=f.val().split(g),i=[];return delete h[d],a.each(h,function(b,c){c=a.trim(c),c&&i.push(c)}),f.val(this.clean(i.join(g))),this.quickClicks(e),!1},quickClicks:function(b){var c,d,e=a(".the-tags",b),f=a(".tagchecklist",b),g=a(b).attr("id");e.length&&(d=e.prop("disabled"),c=e.val().split(postL10n.comma),f.empty(),a.each(c,function(b,c){var e,h;c=a.trim(c),c&&(e=a("").text(c),d||(h=a('X'),h.click(function(){tagBox.parseTags(this)}),e.prepend(" ").prepend(h)),f.append(e))}))},flushTags:function(b,c,d){c=c||!1;var e,f,g=a(".the-tags",b),h=a("input.newtag",b),i=postL10n.comma;return f=c?a(c).text():h.val(),tagsval=g.val(),e=tagsval?tagsval+i+f:f,e=this.clean(e),e=array_unique_noempty(e.split(i)).join(i),g.val(e),this.quickClicks(b),c||h.val(""),"undefined"==typeof d&&h.focus(),!1},get:function(b){var c=b.substr(b.indexOf("-")+1);a.post(ajaxurl,{action:"get-tagcloud",tax:c},function(d,e){(0==d||"success"!=e)&&(d=wpAjax.broken),d=a('

'+d+"

"),a("a",d).click(function(){return tagBox.flushTags(a(this).closest(".inside").children(".tagsdiv"),this),!1}),a("#"+b).after(d)})},init:function(){var b=this,c=a("div.ajaxtag");a(".tagsdiv").each(function(){tagBox.quickClicks(this)}),a("input.tagadd",c).click(function(){b.flushTags(a(this).closest(".tagsdiv"))}),a("div.taghint",c).click(function(){a(this).css("visibility","hidden").parent().siblings(".newtag").focus()}),a("input.newtag",c).blur(function(){""==this.value&&a(this).parent().siblings(".taghint").css("visibility","")}).focus(function(){a(this).parent().siblings(".taghint").css("visibility","hidden")}).keyup(function(b){return 13==b.which?(tagBox.flushTags(a(this).closest(".tagsdiv")),!1):void 0}).keypress(function(a){return 13==a.which?(a.preventDefault(),!1):void 0}).each(function(){var b=a(this).closest("div.tagsdiv").attr("id");a(this).suggest(ajaxurl+"?action=ajax-tag-search&tax="+b,{delay:500,minchars:2,multiple:!0,multipleSep:postL10n.comma+" "})}),a("#post").submit(function(){a("div.tagsdiv").each(function(){tagBox.flushTags(this,!1,1)})}),a("a.tagcloud-link").click(function(){return tagBox.get(a(this).attr("id")),a(this).unbind().click(function(){return a(this).siblings(".the-tagcloud").toggle(),!1}),!1})}},commentsBox={st:0,get:function(b,c){var d,e=this.st;return c||(c=20),this.st+=c,this.total=b,a("#commentsdiv .spinner").show(),d={action:"get-comments",mode:"single",_ajax_nonce:a("#add_comment_nonce").val(),p:a("#post_ID").val(),start:e,number:c},a.post(ajaxurl,d,function(b){return b=wpAjax.parseAjaxResponse(b),a("#commentsdiv .widefat").show(),a("#commentsdiv .spinner").hide(),"object"==typeof b&&b.responses[0]?(a("#the-comment-list").append(b.responses[0].data),theList=theExtraList=null,a("a[className*=':']").unbind(),commentsBox.st>commentsBox.total?a("#show-comments").hide():a("#show-comments").show().children("a").html(postL10n.showcomm),void 0):1==b?(a("#show-comments").html(postL10n.endcomm),void 0):(a("#the-comment-list").append(''+wpAjax.broken+""),void 0)}),!1}},WPSetThumbnailHTML=function(b){a(".inside","#postimagediv").html(b)},WPSetThumbnailID=function(b){var c=a('input[value="_thumbnail_id"]',"#list-table");c.size()>0&&a("#meta\\["+c.attr("id").match(/[0-9]+/)+"\\]\\[value\\]").text(b)},WPRemoveThumbnail=function(b){a.post(ajaxurl,{action:"set-post-thumbnail",post_id:a("#post_ID").val(),thumbnail_id:-1,_ajax_nonce:b,cookie:encodeURIComponent(document.cookie)},function(a){"0"==a?alert(setPostThumbnailL10n.error):WPSetThumbnailHTML(a)})},a(document).on("heartbeat-send.refresh-lock",function(b,c){var d=a("#active_post_lock").val(),e=a("#post_ID").val(),f={};e&&a("#post-lock-dialog").length&&(f.post_id=e,d&&(f.lock=d),c["wp-refresh-post-lock"]=f)}),a(document).on("heartbeat-tick.refresh-lock",function(b,c){var d,e,f;c["wp-refresh-post-lock"]&&(d=c["wp-refresh-post-lock"],d.lock_error?(e=a("#post-lock-dialog"),e.length&&!e.is(":visible")&&("function"==typeof autosave&&(a(document).on("autosave-disable-buttons.post-lock",function(){e.addClass("saving")}).on("autosave-enable-buttons.post-lock",function(){e.removeClass("saving").addClass("saved"),window.onbeforeunload=null}),autosave()||(window.onbeforeunload=null),autosave=function(){}),d.lock_error.avatar_src&&(f=a('').attr("src",d.lock_error.avatar_src.replace(/&/g,"&")),e.find("div.post-locked-avatar").empty().append(f)),e.show().find(".currently-editing").text(d.lock_error.text),e.find(".wp-tab-first").focus())):d.new_lock&&a("#active_post_lock").val(d.new_lock))})}(jQuery),function(a){function b(){c=!1,window.clearTimeout(d),d=window.setTimeout(function(){c=!0},3e5)}var c,d;a(document).on("heartbeat-send.wp-refresh-nonces",function(b,d){var e,f;c&&(f=a("#post_ID").val())&&(e=a("#_wpnonce").val())&&(d["wp-refresh-post-nonces"]={post_id:f,post_nonce:e})}).on("heartbeat-tick.wp-refresh-nonces",function(c,d){var e=d["wp-refresh-post-nonces"];e&&(b(),e.replace&&a.each(e.replace,function(b,c){a("#"+b).val(c)}),e.heartbeatNonce&&(window.heartbeatSettings.nonce=e.heartbeatNonce))}).ready(function(){b()})}(jQuery),jQuery(document).ready(function(a){function b(){var b=a("#post-visibility-select");"public"!=a("input:radio:checked",b).val()?(a("#sticky").prop("checked",!1),a("#sticky-span").hide()):a("#sticky-span").show(),"password"!=a("input:radio:checked",b).val()?a("#password-span").hide():a("#password-span").show()}function c(){if(!a("#timestampdiv").length)return!0;var b,c,e,f,g=a("#post_status"),h=a('option[value="publish"]',g),i=a("#aa").val(),j=a("#mm").val(),k=a("#jj").val(),l=a("#hh").val(),m=a("#mn").val();return b=new Date(i,j-1,k,l,m),c=new Date(a("#hidden_aa").val(),a("#hidden_mm").val()-1,a("#hidden_jj").val(),a("#hidden_hh").val(),a("#hidden_mn").val()),e=new Date(a("#cur_aa").val(),a("#cur_mm").val()-1,a("#cur_jj").val(),a("#cur_hh").val(),a("#cur_mn").val()),b.getFullYear()!=i||1+b.getMonth()!=j||b.getDate()!=k||b.getMinutes()!=m?(a(".timestamp-wrap","#timestampdiv").addClass("form-invalid"),!1):(a(".timestamp-wrap","#timestampdiv").removeClass("form-invalid"),b>e&&"future"!=a("#original_post_status").val()?(f=postL10n.publishOnFuture,a("#publish").val(postL10n.schedule)):e>=b&&"publish"!=a("#original_post_status").val()?(f=postL10n.publishOn,a("#publish").val(postL10n.publish)):(f=postL10n.publishOnPast,a("#publish").val(postL10n.update)),c.toUTCString()==b.toUTCString()?a("#timestamp").html(d):a("#timestamp").html(f+" "+postL10n.dateFormat.replace("%1$s",a('option[value="'+a("#mm").val()+'"]',"#mm").text()).replace("%2$s",k).replace("%3$s",i).replace("%4$s",l).replace("%5$s",m)+" "),"private"==a("input:radio:checked","#post-visibility-select").val()?(a("#publish").val(postL10n.update),0==h.length?g.append('"):h.html(postL10n.privatelyPublished),a('option[value="publish"]',g).prop("selected",!0),a(".edit-post-status","#misc-publishing-actions").hide()):("future"==a("#original_post_status").val()||"draft"==a("#original_post_status").val()?h.length&&(h.remove(),g.val(a("#hidden_post_status").val())):h.html(postL10n.published),g.is(":hidden")&&a(".edit-post-status","#misc-publishing-actions").show()),a("#post-status-display").html(a("option:selected",g).text()),"private"==a("option:selected",g).val()||"publish"==a("option:selected",g).val()?a("#save-post").hide():(a("#save-post").show(),"pending"==a("option:selected",g).val()?a("#save-post").show().val(postL10n.savePending):a("#save-post").show().val(postL10n.saveDraft)),!0)}var d,e,f="",g=0,h=a("#content");postboxes.add_postbox_toggles(pagenow),a("#post-lock-dialog .notification-dialog").on("keydown",function(b){if(9==b.which){var c=a(b.target);c.hasClass("wp-tab-first")&&b.shiftKey?(a(this).find(".wp-tab-last").focus(),b.preventDefault()):c.hasClass("wp-tab-last")&&!b.shiftKey&&(a(this).find(".wp-tab-first").focus(),b.preventDefault())}}).filter(":visible").find(".wp-tab-first").focus(),a("#tagsdiv-post_tag").length?tagBox.init():a("#side-sortables, #normal-sortables, #advanced-sortables").children("div.postbox").each(function(){return 0===this.id.indexOf("tagsdiv-")?(tagBox.init(),!1):void 0}),a(".categorydiv").each(function(){var b,c,d,e,f,g=a(this).attr("id");d=g.split("-"),d.shift(),e=d.join("-"),f=e+"_tab","category"==e&&(f="cats"),a("a","#"+e+"-tabs").click(function(){var b=a(this).attr("href");return a(this).parent().addClass("tabs").siblings("li").removeClass("tabs"),a("#"+e+"-tabs").siblings(".tabs-panel").hide(),a(b).show(),"#"+e+"-all"==b?deleteUserSetting(f):setUserSetting(f,"pop"),!1}),getUserSetting(f)&&a('a[href="#'+e+'-pop"]',"#"+e+"-tabs").click(),a("#new"+e).one("focus",function(){a(this).val("").removeClass("form-input-tip")}),a("#new"+e).keypress(function(b){13===b.keyCode&&(b.preventDefault(),a("#"+e+"-add-submit").click())}),a("#"+e+"-add-submit").click(function(){a("#new"+e).focus()}),b=function(b){return a("#new"+e).val()?(b.data+="&"+a(":checked","#"+e+"checklist").serialize(),a("#"+e+"-add-submit").prop("disabled",!0),b):!1},c=function(b,c){var d,f=a("#new"+e+"_parent");a("#"+e+"-add-submit").prop("disabled",!1),"undefined"!=c.parsed.responses[0]&&(d=c.parsed.responses[0].supplemental.newcat_parent)&&(f.before(d),f.remove())},a("#"+e+"checklist").wpList({alt:"",response:e+"-ajax-response",addBefore:b,addAfter:c}),a("#"+e+"-add-toggle").click(function(){return a("#"+e+"-adder").toggleClass("wp-hidden-children"),a('a[href="#'+e+'-all"]',"#"+e+"-tabs").click(),a("#new"+e).focus(),!1}),a("#"+e+"checklist, #"+e+"checklist-pop").on("click",'li.popular-category > label input[type="checkbox"]',function(){var b=a(this),c=b.is(":checked"),d=b.val();d&&b.parents("#taxonomy-"+e).length&&a("#in-"+e+"-"+d+", #in-popular-"+e+"-"+d).prop("checked",c)})}),a("#postcustom").length&&a("#the-list").wpList({addAfter:function(){a("table#list-table").show()},addBefore:function(b){return b.data+="&post_id="+a("#post_ID").val(),b}}),a("#submitdiv").length&&(d=a("#timestamp").html(),e=a("#post-visibility-display").html(),a(".edit-visibility","#visibility").click(function(){return a("#post-visibility-select").is(":hidden")&&(b(),a("#post-visibility-select").slideDown("fast"),a(this).hide()),!1}),a(".cancel-post-visibility","#post-visibility-select").click(function(){return a("#post-visibility-select").slideUp("fast"),a("#visibility-radio-"+a("#hidden-post-visibility").val()).prop("checked",!0),a("#post_password").val(a("#hidden-post-password").val()),a("#sticky").prop("checked",a("#hidden-post-sticky").prop("checked")),a("#post-visibility-display").html(e),a(".edit-visibility","#visibility").show(),c(),!1}),a(".save-post-visibility","#post-visibility-select").click(function(){var b=a("#post-visibility-select");return b.slideUp("fast"),a(".edit-visibility","#visibility").show(),c(),"public"!=a("input:radio:checked",b).val()&&a("#sticky").prop("checked",!1),f=1==a("#sticky").prop("checked")?"Sticky":"",a("#post-visibility-display").html(postL10n[a("input:radio:checked",b).val()+f]),!1}),a("input:radio","#post-visibility-select").change(function(){b()}),a("#timestampdiv").siblings("a.edit-timestamp").click(function(){return a("#timestampdiv").is(":hidden")&&(a("#timestampdiv").slideDown("fast"),a("#mm").focus(),a(this).hide()),!1}),a(".cancel-timestamp","#timestampdiv").click(function(){return a("#timestampdiv").slideUp("fast"),a("#mm").val(a("#hidden_mm").val()),a("#jj").val(a("#hidden_jj").val()),a("#aa").val(a("#hidden_aa").val()),a("#hh").val(a("#hidden_hh").val()),a("#mn").val(a("#hidden_mn").val()),a("#timestampdiv").siblings("a.edit-timestamp").show(),c(),!1}),a(".save-timestamp","#timestampdiv").click(function(){return c()&&(a("#timestampdiv").slideUp("fast"),a("#timestampdiv").siblings("a.edit-timestamp").show()),!1}),a("#post").on("submit",function(b){return c()?void 0:(b.preventDefault(),a("#timestampdiv").show(),a("#publishing-action .spinner").hide(),a("#publish").prop("disabled",!1).removeClass("button-primary-disabled"),!1)}),a("#post-status-select").siblings("a.edit-post-status").click(function(){return a("#post-status-select").is(":hidden")&&(a("#post-status-select").slideDown("fast"),a(this).hide()),!1}),a(".save-post-status","#post-status-select").click(function(){return a("#post-status-select").slideUp("fast"),a("#post-status-select").siblings("a.edit-post-status").show(),c(),!1}),a(".cancel-post-status","#post-status-select").click(function(){return a("#post-status-select").slideUp("fast"),a("#post_status").val(a("#hidden_post_status").val()),a("#post-status-select").siblings("a.edit-post-status").show(),c(),!1})),a("#edit-slug-box").length&&(editPermalink=function(b){var c,d=0,e=a("#editable-post-name"),f=e.html(),g=a("#post_name"),h=g.val(),i=a("#edit-slug-buttons"),j=i.html(),k=a("#editable-post-name-full").html();for(a("#view-post-btn").hide(),i.html(''+postL10n.ok+' '+postL10n.cancel+""),i.children(".save").click(function(){var c=e.children("input").val();return c==a("#editable-post-name-full").text()?a(".cancel","#edit-slug-buttons").click():(a.post(ajaxurl,{action:"sample-permalink",post_id:b,new_slug:c,new_title:a("#title").val(),samplepermalinknonce:a("#samplepermalinknonce").val()},function(b){var d=a("#edit-slug-box");d.html(b),d.hasClass("hidden")&&d.fadeIn("fast",function(){d.removeClass("hidden")}),i.html(j),g.val(c),makeSlugeditClickable(),a("#view-post-btn").show()}),!1)}),a(".cancel","#edit-slug-buttons").click(function(){return a("#view-post-btn").show(),e.html(f),i.html(j),g.val(h),!1}),c=0;ck.length/4?"":k,e.html('').children("input").keypress(function(a){var b=a.keyCode||0;return 13==b?(i.children(".save").click(),!1):27==b?(i.children(".cancel").click(),!1):void 0}).keyup(function(){g.val(this.value)}).focus()},makeSlugeditClickable=function(){a("#editable-post-name").click(function(){a("#edit-slug-buttons").children(".edit-slug").click()})},makeSlugeditClickable()),"undefined"!=typeof wpWordCount&&(a(document).triggerHandler("wpcountwords",[h.val()]),h.keyup(function(b){var c=b.keyCode||b.charCode;return c==g?!0:((13==c||8==g||46==g)&&a(document).triggerHandler("wpcountwords",[h.val()]),g=c,!0)})),wptitlehint=function(b){b=b||"title";var c=a("#"+b),d=a("#"+b+"-prompt-text");""==c.val()&&d.removeClass("screen-reader-text"),d.click(function(){a(this).addClass("screen-reader-text"),c.focus()}),c.blur(function(){""==this.value&&d.removeClass("screen-reader-text")}).focus(function(){d.addClass("screen-reader-text")}).keydown(function(b){d.addClass("screen-reader-text"),a(this).unbind(b)})},wptitlehint(),function(){function b(a){return e.height(Math.max(50,f+a.pageY)+"px"),!1}function c(){var d;e.focus(),a(document).unbind("mousemove",b).unbind("mouseup",c),d=parseInt(e.css("height"),10),d&&d>50&&5e3>d&&setUserSetting("ed_size",d)}var d,e=a("textarea#content"),f=null;!e.length||"ontouchstart"in window||(e.css("resize","none"),d=a('

'),a("#wp-content-wrap").append(d),d.on("mousedown",function(d){return f=e.height()-d.pageY,e.blur(),a(document).mousemove(b).mouseup(c),!1}))}(),"undefined"!=typeof tinymce&&(tinymce.onAddEditor.add(function(b,c){function d(){var b,c=document.getElementById("content_ifr"),d=c?parseInt(c.style.height,10):0,e=a("#content_tbl tr.mceFirst").height();return d&&e?(b=d+e+21,b-=33):!1}"content"!=c.id||tinymce.isIOS5||(c.onLoadContent.add(function(){var b,c=document.getElementById("content"),d=c?parseInt(c.style.height,10):0,e=a("#content_tbl tr.mceFirst").height()||33;(!d||50>d||d>5e3)&&(d=360),getUserSetting("ed_size")>5e3&&setUserSetting("ed_size",360),b=d-e+12,b>50&&5e3>b&&(a("#content_tbl").css("height",""),a("#content_ifr").css("height",b+"px"))}),c.onSaveContent.add(function(){var b=d();!b||50>b||b>5e3||a("textarea#content").css("height",b+"px")}),c.onPostRender.add(function(){a("#content_resize").on("mousedown.wp-mce-resize",function(){a(document).on("mouseup.wp-mce-resize",function(){var b;a(document).off("mouseup.wp-mce-resize"),b=d(),b&&b>50&&5e3>b&&setUserSetting("ed_size",b)})})}))}),a("#post-formats-select input.post-format").on("change.set-editor-class",function(){var b,c,d=this.id;d&&a(this).prop("checked")&&(b=tinymce.get("content"),b&&(c=b.getBody(),c.className=c.className.replace(/\bpost-format-[^ ]+/,""),b.dom.addClass(c,"post-format-0"==d?"post-format-standard":d)))}))}); \ No newline at end of file +function array_unique_noempty(a){var b=[];return jQuery.each(a,function(a,c){c=jQuery.trim(c),c&&-1==jQuery.inArray(c,b)&&b.push(c)}),b}var tagBox,commentsBox,editPermalink,makeSlugeditClickable,WPSetThumbnailHTML,WPSetThumbnailID,WPRemoveThumbnail,wptitlehint;!function(a){tagBox={clean:function(a){var b=postL10n.comma;return","!==b&&(a=a.replace(new RegExp(b,"g"),",")),a=a.replace(/\s*,\s*/g,",").replace(/,+/g,",").replace(/[,\s]+$/,"").replace(/^[,\s]+/,""),","!==b&&(a=a.replace(/,/g,b)),a},parseTags:function(b){var c=b.id,d=c.split("-check-num-")[1],e=a(b).closest(".tagsdiv"),f=e.find(".the-tags"),g=postL10n.comma,h=f.val().split(g),i=[];return delete h[d],a.each(h,function(b,c){c=a.trim(c),c&&i.push(c)}),f.val(this.clean(i.join(g))),this.quickClicks(e),!1},quickClicks:function(b){var c,d,e=a(".the-tags",b),f=a(".tagchecklist",b),g=a(b).attr("id");e.length&&(d=e.prop("disabled"),c=e.val().split(postL10n.comma),f.empty(),a.each(c,function(b,c){var e,h;c=a.trim(c),c&&(e=a("").text(c),d||(h=a('X'),h.click(function(){tagBox.parseTags(this)}),e.prepend(" ").prepend(h)),f.append(e))}))},flushTags:function(b,c,d){c=c||!1;var e,f,g=a(".the-tags",b),h=a("input.newtag",b),i=postL10n.comma;return f=c?a(c).text():h.val(),tagsval=g.val(),e=tagsval?tagsval+i+f:f,e=this.clean(e),e=array_unique_noempty(e.split(i)).join(i),g.val(e),this.quickClicks(b),c||h.val(""),"undefined"==typeof d&&h.focus(),!1},get:function(b){var c=b.substr(b.indexOf("-")+1);a.post(ajaxurl,{action:"get-tagcloud",tax:c},function(d,e){(0==d||"success"!=e)&&(d=wpAjax.broken),d=a('

'+d+"

"),a("a",d).click(function(){return tagBox.flushTags(a(this).closest(".inside").children(".tagsdiv"),this),!1}),a("#"+b).after(d)})},init:function(){var b=this,c=a("div.ajaxtag");a(".tagsdiv").each(function(){tagBox.quickClicks(this)}),a("input.tagadd",c).click(function(){b.flushTags(a(this).closest(".tagsdiv"))}),a("div.taghint",c).click(function(){a(this).css("visibility","hidden").parent().siblings(".newtag").focus()}),a("input.newtag",c).blur(function(){""==this.value&&a(this).parent().siblings(".taghint").css("visibility","")}).focus(function(){a(this).parent().siblings(".taghint").css("visibility","hidden")}).keyup(function(b){return 13==b.which?(tagBox.flushTags(a(this).closest(".tagsdiv")),!1):void 0}).keypress(function(a){return 13==a.which?(a.preventDefault(),!1):void 0}).each(function(){var b=a(this).closest("div.tagsdiv").attr("id");a(this).suggest(ajaxurl+"?action=ajax-tag-search&tax="+b,{delay:500,minchars:2,multiple:!0,multipleSep:postL10n.comma+" "})}),a("#post").submit(function(){a("div.tagsdiv").each(function(){tagBox.flushTags(this,!1,1)})}),a("a.tagcloud-link").click(function(){return tagBox.get(a(this).attr("id")),a(this).unbind().click(function(){return a(this).siblings(".the-tagcloud").toggle(),!1}),!1})}},commentsBox={st:0,get:function(b,c){var d,e=this.st;return c||(c=20),this.st+=c,this.total=b,a("#commentsdiv .spinner").show(),d={action:"get-comments",mode:"single",_ajax_nonce:a("#add_comment_nonce").val(),p:a("#post_ID").val(),start:e,number:c},a.post(ajaxurl,d,function(b){return b=wpAjax.parseAjaxResponse(b),a("#commentsdiv .widefat").show(),a("#commentsdiv .spinner").hide(),"object"==typeof b&&b.responses[0]?(a("#the-comment-list").append(b.responses[0].data),theList=theExtraList=null,a("a[className*=':']").unbind(),commentsBox.st>commentsBox.total?a("#show-comments").hide():a("#show-comments").show().children("a").html(postL10n.showcomm),void 0):1==b?(a("#show-comments").html(postL10n.endcomm),void 0):(a("#the-comment-list").append(''+wpAjax.broken+""),void 0)}),!1}},WPSetThumbnailHTML=function(b){a(".inside","#postimagediv").html(b)},WPSetThumbnailID=function(b){var c=a('input[value="_thumbnail_id"]',"#list-table");c.size()>0&&a("#meta\\["+c.attr("id").match(/[0-9]+/)+"\\]\\[value\\]").text(b)},WPRemoveThumbnail=function(b){a.post(ajaxurl,{action:"set-post-thumbnail",post_id:a("#post_ID").val(),thumbnail_id:-1,_ajax_nonce:b,cookie:encodeURIComponent(document.cookie)},function(a){"0"==a?alert(setPostThumbnailL10n.error):WPSetThumbnailHTML(a)})},a(document).on("heartbeat-send.refresh-lock",function(b,c){var d=a("#active_post_lock").val(),e=a("#post_ID").val(),f={};e&&a("#post-lock-dialog").length&&(f.post_id=e,d&&(f.lock=d),c["wp-refresh-post-lock"]=f)}),a(document).on("heartbeat-tick.refresh-lock",function(b,c){var d,e,f;c["wp-refresh-post-lock"]&&(d=c["wp-refresh-post-lock"],d.lock_error?(e=a("#post-lock-dialog"),e.length&&!e.is(":visible")&&("function"==typeof autosave&&(a(document).on("autosave-disable-buttons.post-lock",function(){e.addClass("saving")}).on("autosave-enable-buttons.post-lock",function(){e.removeClass("saving").addClass("saved"),window.onbeforeunload=null}),autosave()||(window.onbeforeunload=null),autosave=function(){}),d.lock_error.avatar_src&&(f=a('').attr("src",d.lock_error.avatar_src.replace(/&/g,"&")),e.find("div.post-locked-avatar").empty().append(f)),e.show().find(".currently-editing").text(d.lock_error.text),e.find(".wp-tab-first").focus())):d.new_lock&&a("#active_post_lock").val(d.new_lock))})}(jQuery),function(a){function b(){c=!1,window.clearTimeout(d),d=window.setTimeout(function(){c=!0},3e5)}var c,d;a(document).on("heartbeat-send.wp-refresh-nonces",function(b,d){var e,f;c&&(f=a("#post_ID").val())&&(e=a("#_wpnonce").val())&&(d["wp-refresh-post-nonces"]={post_id:f,post_nonce:e})}).on("heartbeat-tick.wp-refresh-nonces",function(c,d){var e=d["wp-refresh-post-nonces"];e&&(b(),e.replace&&a.each(e.replace,function(b,c){a("#"+b).val(c)}),e.heartbeatNonce&&(window.heartbeatSettings.nonce=e.heartbeatNonce))}).ready(function(){b()})}(jQuery),jQuery(document).ready(function(a){function b(){var b=a("#post-visibility-select");"public"!=a("input:radio:checked",b).val()?(a("#sticky").prop("checked",!1),a("#sticky-span").hide()):a("#sticky-span").show(),"password"!=a("input:radio:checked",b).val()?a("#password-span").hide():a("#password-span").show()}function c(){if(!a("#timestampdiv").length)return!0;var b,c,e,f,g=a("#post_status"),h=a('option[value="publish"]',g),i=a("#aa").val(),j=a("#mm").val(),k=a("#jj").val(),l=a("#hh").val(),m=a("#mn").val();return b=new Date(i,j-1,k,l,m),c=new Date(a("#hidden_aa").val(),a("#hidden_mm").val()-1,a("#hidden_jj").val(),a("#hidden_hh").val(),a("#hidden_mn").val()),e=new Date(a("#cur_aa").val(),a("#cur_mm").val()-1,a("#cur_jj").val(),a("#cur_hh").val(),a("#cur_mn").val()),b.getFullYear()!=i||1+b.getMonth()!=j||b.getDate()!=k||b.getMinutes()!=m?(a(".timestamp-wrap","#timestampdiv").addClass("form-invalid"),!1):(a(".timestamp-wrap","#timestampdiv").removeClass("form-invalid"),b>e&&"future"!=a("#original_post_status").val()?(f=postL10n.publishOnFuture,a("#publish").val(postL10n.schedule)):e>=b&&"publish"!=a("#original_post_status").val()?(f=postL10n.publishOn,a("#publish").val(postL10n.publish)):(f=postL10n.publishOnPast,a("#publish").val(postL10n.update)),c.toUTCString()==b.toUTCString()?a("#timestamp").html(d):a("#timestamp").html(f+" "+postL10n.dateFormat.replace("%1$s",a('option[value="'+a("#mm").val()+'"]',"#mm").text()).replace("%2$s",k).replace("%3$s",i).replace("%4$s",l).replace("%5$s",m)+" "),"private"==a("input:radio:checked","#post-visibility-select").val()?(a("#publish").val(postL10n.update),0==h.length?g.append('"):h.html(postL10n.privatelyPublished),a('option[value="publish"]',g).prop("selected",!0),a(".edit-post-status","#misc-publishing-actions").hide()):("future"==a("#original_post_status").val()||"draft"==a("#original_post_status").val()?h.length&&(h.remove(),g.val(a("#hidden_post_status").val())):h.html(postL10n.published),g.is(":hidden")&&a(".edit-post-status","#misc-publishing-actions").show()),a("#post-status-display").html(a("option:selected",g).text()),"private"==a("option:selected",g).val()||"publish"==a("option:selected",g).val()?a("#save-post").hide():(a("#save-post").show(),"pending"==a("option:selected",g).val()?a("#save-post").show().val(postL10n.savePending):a("#save-post").show().val(postL10n.saveDraft)),!0)}var d,e,f="",g=0,h=a("#content");postboxes.add_postbox_toggles(pagenow),a("#post-lock-dialog .notification-dialog").on("keydown",function(b){if(9==b.which){var c=a(b.target);c.hasClass("wp-tab-first")&&b.shiftKey?(a(this).find(".wp-tab-last").focus(),b.preventDefault()):c.hasClass("wp-tab-last")&&!b.shiftKey&&(a(this).find(".wp-tab-first").focus(),b.preventDefault())}}).filter(":visible").find(".wp-tab-first").focus(),"undefined"!=typeof wp&&wp.heartbeat&&a("#post-lock-dialog").length&&wp.heartbeat.setInterval(15),a("#tagsdiv-post_tag").length?tagBox.init():a("#side-sortables, #normal-sortables, #advanced-sortables").children("div.postbox").each(function(){return 0===this.id.indexOf("tagsdiv-")?(tagBox.init(),!1):void 0}),a(".categorydiv").each(function(){var b,c,d,e,f,g=a(this).attr("id");d=g.split("-"),d.shift(),e=d.join("-"),f=e+"_tab","category"==e&&(f="cats"),a("a","#"+e+"-tabs").click(function(){var b=a(this).attr("href");return a(this).parent().addClass("tabs").siblings("li").removeClass("tabs"),a("#"+e+"-tabs").siblings(".tabs-panel").hide(),a(b).show(),"#"+e+"-all"==b?deleteUserSetting(f):setUserSetting(f,"pop"),!1}),getUserSetting(f)&&a('a[href="#'+e+'-pop"]',"#"+e+"-tabs").click(),a("#new"+e).one("focus",function(){a(this).val("").removeClass("form-input-tip")}),a("#new"+e).keypress(function(b){13===b.keyCode&&(b.preventDefault(),a("#"+e+"-add-submit").click())}),a("#"+e+"-add-submit").click(function(){a("#new"+e).focus()}),b=function(b){return a("#new"+e).val()?(b.data+="&"+a(":checked","#"+e+"checklist").serialize(),a("#"+e+"-add-submit").prop("disabled",!0),b):!1},c=function(b,c){var d,f=a("#new"+e+"_parent");a("#"+e+"-add-submit").prop("disabled",!1),"undefined"!=c.parsed.responses[0]&&(d=c.parsed.responses[0].supplemental.newcat_parent)&&(f.before(d),f.remove())},a("#"+e+"checklist").wpList({alt:"",response:e+"-ajax-response",addBefore:b,addAfter:c}),a("#"+e+"-add-toggle").click(function(){return a("#"+e+"-adder").toggleClass("wp-hidden-children"),a('a[href="#'+e+'-all"]',"#"+e+"-tabs").click(),a("#new"+e).focus(),!1}),a("#"+e+"checklist, #"+e+"checklist-pop").on("click",'li.popular-category > label input[type="checkbox"]',function(){var b=a(this),c=b.is(":checked"),d=b.val();d&&b.parents("#taxonomy-"+e).length&&a("#in-"+e+"-"+d+", #in-popular-"+e+"-"+d).prop("checked",c)})}),a("#postcustom").length&&a("#the-list").wpList({addAfter:function(){a("table#list-table").show()},addBefore:function(b){return b.data+="&post_id="+a("#post_ID").val(),b}}),a("#submitdiv").length&&(d=a("#timestamp").html(),e=a("#post-visibility-display").html(),a(".edit-visibility","#visibility").click(function(){return a("#post-visibility-select").is(":hidden")&&(b(),a("#post-visibility-select").slideDown("fast"),a(this).hide()),!1}),a(".cancel-post-visibility","#post-visibility-select").click(function(){return a("#post-visibility-select").slideUp("fast"),a("#visibility-radio-"+a("#hidden-post-visibility").val()).prop("checked",!0),a("#post_password").val(a("#hidden-post-password").val()),a("#sticky").prop("checked",a("#hidden-post-sticky").prop("checked")),a("#post-visibility-display").html(e),a(".edit-visibility","#visibility").show(),c(),!1}),a(".save-post-visibility","#post-visibility-select").click(function(){var b=a("#post-visibility-select");return b.slideUp("fast"),a(".edit-visibility","#visibility").show(),c(),"public"!=a("input:radio:checked",b).val()&&a("#sticky").prop("checked",!1),f=1==a("#sticky").prop("checked")?"Sticky":"",a("#post-visibility-display").html(postL10n[a("input:radio:checked",b).val()+f]),!1}),a("input:radio","#post-visibility-select").change(function(){b()}),a("#timestampdiv").siblings("a.edit-timestamp").click(function(){return a("#timestampdiv").is(":hidden")&&(a("#timestampdiv").slideDown("fast"),a("#mm").focus(),a(this).hide()),!1}),a(".cancel-timestamp","#timestampdiv").click(function(){return a("#timestampdiv").slideUp("fast"),a("#mm").val(a("#hidden_mm").val()),a("#jj").val(a("#hidden_jj").val()),a("#aa").val(a("#hidden_aa").val()),a("#hh").val(a("#hidden_hh").val()),a("#mn").val(a("#hidden_mn").val()),a("#timestampdiv").siblings("a.edit-timestamp").show(),c(),!1}),a(".save-timestamp","#timestampdiv").click(function(){return c()&&(a("#timestampdiv").slideUp("fast"),a("#timestampdiv").siblings("a.edit-timestamp").show()),!1}),a("#post").on("submit",function(b){return c()?void 0:(b.preventDefault(),a("#timestampdiv").show(),a("#publishing-action .spinner").hide(),a("#publish").prop("disabled",!1).removeClass("button-primary-disabled"),!1)}),a("#post-status-select").siblings("a.edit-post-status").click(function(){return a("#post-status-select").is(":hidden")&&(a("#post-status-select").slideDown("fast"),a(this).hide()),!1}),a(".save-post-status","#post-status-select").click(function(){return a("#post-status-select").slideUp("fast"),a("#post-status-select").siblings("a.edit-post-status").show(),c(),!1}),a(".cancel-post-status","#post-status-select").click(function(){return a("#post-status-select").slideUp("fast"),a("#post_status").val(a("#hidden_post_status").val()),a("#post-status-select").siblings("a.edit-post-status").show(),c(),!1})),a("#edit-slug-box").length&&(editPermalink=function(b){var c,d=0,e=a("#editable-post-name"),f=e.html(),g=a("#post_name"),h=g.val(),i=a("#edit-slug-buttons"),j=i.html(),k=a("#editable-post-name-full").html();for(a("#view-post-btn").hide(),i.html(''+postL10n.ok+' '+postL10n.cancel+""),i.children(".save").click(function(){var c=e.children("input").val();return c==a("#editable-post-name-full").text()?a(".cancel","#edit-slug-buttons").click():(a.post(ajaxurl,{action:"sample-permalink",post_id:b,new_slug:c,new_title:a("#title").val(),samplepermalinknonce:a("#samplepermalinknonce").val()},function(b){var d=a("#edit-slug-box");d.html(b),d.hasClass("hidden")&&d.fadeIn("fast",function(){d.removeClass("hidden")}),i.html(j),g.val(c),makeSlugeditClickable(),a("#view-post-btn").show()}),!1)}),a(".cancel","#edit-slug-buttons").click(function(){return a("#view-post-btn").show(),e.html(f),i.html(j),g.val(h),!1}),c=0;ck.length/4?"":k,e.html('').children("input").keypress(function(a){var b=a.keyCode||0;return 13==b?(i.children(".save").click(),!1):27==b?(i.children(".cancel").click(),!1):void 0}).keyup(function(){g.val(this.value)}).focus()},makeSlugeditClickable=function(){a("#editable-post-name").click(function(){a("#edit-slug-buttons").children(".edit-slug").click()})},makeSlugeditClickable()),"undefined"!=typeof wpWordCount&&(a(document).triggerHandler("wpcountwords",[h.val()]),h.keyup(function(b){var c=b.keyCode||b.charCode;return c==g?!0:((13==c||8==g||46==g)&&a(document).triggerHandler("wpcountwords",[h.val()]),g=c,!0)})),wptitlehint=function(b){b=b||"title";var c=a("#"+b),d=a("#"+b+"-prompt-text");""==c.val()&&d.removeClass("screen-reader-text"),d.click(function(){a(this).addClass("screen-reader-text"),c.focus()}),c.blur(function(){""==this.value&&d.removeClass("screen-reader-text")}).focus(function(){d.addClass("screen-reader-text")}).keydown(function(b){d.addClass("screen-reader-text"),a(this).unbind(b)})},wptitlehint(),function(){function b(a){return e.height(Math.max(50,f+a.pageY)+"px"),!1}function c(){var d;e.focus(),a(document).unbind("mousemove",b).unbind("mouseup",c),d=parseInt(e.css("height"),10),d&&d>50&&5e3>d&&setUserSetting("ed_size",d)}var d,e=a("textarea#content"),f=null;!e.length||"ontouchstart"in window||(e.css("resize","none"),d=a('

'),a("#wp-content-wrap").append(d),d.on("mousedown",function(d){return f=e.height()-d.pageY,e.blur(),a(document).mousemove(b).mouseup(c),!1}))}(),"undefined"!=typeof tinymce&&(tinymce.onAddEditor.add(function(b,c){function d(){var b,c=document.getElementById("content_ifr"),d=c?parseInt(c.style.height,10):0,e=a("#content_tbl tr.mceFirst").height();return d&&e?(b=d+e+21,b-=33):!1}"content"!=c.id||tinymce.isIOS5||(c.onLoadContent.add(function(){var b,c=document.getElementById("content"),d=c?parseInt(c.style.height,10):0,e=a("#content_tbl tr.mceFirst").height()||33;(!d||50>d||d>5e3)&&(d=360),getUserSetting("ed_size")>5e3&&setUserSetting("ed_size",360),b=d-e+12,b>50&&5e3>b&&(a("#content_tbl").css("height",""),a("#content_ifr").css("height",b+"px"))}),c.onSaveContent.add(function(){var b=d();!b||50>b||b>5e3||a("textarea#content").css("height",b+"px")}),c.onPostRender.add(function(){a("#content_resize").on("mousedown.wp-mce-resize",function(){a(document).on("mouseup.wp-mce-resize",function(){var b;a(document).off("mouseup.wp-mce-resize"),b=d(),b&&b>50&&5e3>b&&setUserSetting("ed_size",b)})})}))}),a("#post-formats-select input.post-format").on("change.set-editor-class",function(){var b,c,d=this.id;d&&a(this).prop("checked")&&(b=tinymce.get("content"),b&&(c=b.getBody(),c.className=c.className.replace(/\bpost-format-[^ ]+/,""),b.dom.addClass(c,"post-format-0"==d?"post-format-standard":d)))}))}); \ No newline at end of file diff --git a/wp-includes/js/heartbeat.js b/wp-includes/js/heartbeat.js index f8e55886fa..330d2085ae 100644 --- a/wp-includes/js/heartbeat.js +++ b/wp-includes/js/heartbeat.js @@ -6,11 +6,11 @@ * to use it, please follow the development closely. * * Heartbeat is a simple server polling API that sends XHR requests to - * the server every 15 seconds and triggers events (or callbacks) upon + * the server every 15 - 60 seconds and triggers events (or callbacks) upon * receiving data. Currently these 'ticks' handle transports for post locking, * login-expiration warnings, and related tasks while a user is logged in. * - * Available filters in ajax-actions.php: + * Available PHP filters (in ajax-actions.php): * - heartbeat_received * - heartbeat_send * - heartbeat_tick @@ -19,96 +19,195 @@ * - heartbeat_nopriv_tick * @see wp_ajax_nopriv_heartbeat(), wp_ajax_heartbeat() * + * Custom jQuery events: + * - heartbeat-send + * - heartbeat-tick + * - heartbeat-error + * - heartbeat-connection-lost + * - heartbeat-connection-restored + * - heartbeat-nonces-expired + * * @since 3.6.0 */ - // Ensure the global `wp` object exists. -window.wp = window.wp || {}; - -(function($){ +( function( $, window, undefined ) { var Heartbeat = function() { - var self = this, - running, - beat, - screenId = typeof pagenow != 'undefined' ? pagenow : '', - url = typeof ajaxurl != 'undefined' ? ajaxurl : '', - settings, - tick = 0, - queue = {}, - interval, - connecting, - countdown = 0, - errorcount = 0, - tempInterval, - hasFocus = true, - isUserActive, - userActiveEvents, - winBlurTimeout, - frameBlurTimeout = -1, - hasConnectionError = null; + var $document = $(document), + settings = { + // Used to stop the "beat" + isRunning: true, + + // Current screen id, defaults to the JS global 'pagenow' when present (in the admin) or 'front' + screenId: '', + + // XHR request URL, defaults to the JS global 'ajaxurl' when present + url: '', + + // Timestamp, start of the last connection request + lastTick: 0, + + // Container for the enqueued items + queue: {}, + + // Connect interval (in seconds) + mainInterval: 60, + + // Used when the interval is set to 5 sec. temporarily + tempInterval: 0, + + // Used when the interval is reset + originalInterval: 0, + + // Used together with tempInterval + countdown: 0, + + // Whether a connection is currently in progress + connecting: false, + + // Whether a connection error occured + connectionError: false, + + // Used to track non-critical errors + errorcount: 0, + + // Whether at least one connection has completed successfully + hasConnected: false, + + // Whether the current browser window is in focus and the user is active + hasFocus: true, + + // Timestamp, last time the user was active. Checked every 30 sec. + userActivity: 0, + + // Flags whether events tracking user activity were set + userActivityEvents: false, + + // References to various timeouts + beatTimer: 0, + winBlurTimer: 0, + frameBlurTimer: 0 + }; /** - * Returns a boolean that's indicative of whether or not there is a connection error + * Set local vars and events, then start * - * @returns boolean + * @access private + * + * @return void */ - this.hasConnectionError = function() { - return !! hasConnectionError; - }; + function initialize() { + if ( typeof window.pagenow === 'string' ) { + settings.screenId = window.pagenow; + } - if ( typeof( window.heartbeatSettings ) == 'object' ) { - settings = $.extend( {}, window.heartbeatSettings ); + if ( typeof window.ajaxurl === 'string' ) { + settings.url = window.ajaxurl; + } - // Add private vars - url = settings.ajaxurl || url; - delete settings.ajaxurl; - delete settings.nonce; + // Pull in options passed from PHP + if ( typeof window.heartbeatSettings === 'object' ) { + var options = window.heartbeatSettings; - interval = settings.interval || 15; // default interval - delete settings.interval; - // The interval can be from 15 to 60 sec. and can be set temporarily to 5 sec. - if ( interval < 15 ) - interval = 15; - else if ( interval > 60 ) - interval = 60; + // The XHR URL can be passed as option when window.ajaxurl is not set + if ( ! settings.url && options.ajaxurl ) { + settings.url = options.ajaxurl; + } - interval = interval * 1000; + // The interval can be from 15 to 60 sec. and can be set temporarily to 5 sec. + if ( options.interval ) { + settings.mainInterval = options.interval; - // 'screenId' can be added from settings on the front-end where the JS global 'pagenow' is not set - screenId = screenId || settings.screenId || 'front'; - delete settings.screenId; + if ( settings.mainInterval < 15 ) { + settings.mainInterval = 15; + } else if ( settings.mainInterval > 60 ) { + settings.mainInterval = 60; + } + } - // Add or overwrite public vars - $.extend( this, settings ); + // 'screenId' can be added from settings on the front-end where the JS global 'pagenow' is not set + if ( ! settings.screenId ) { + settings.screenId = options.screenId || 'front'; + } + } + + // Convert to milliseconds + settings.mainInterval = settings.mainInterval * 1000; + settings.originalInterval = settings.mainInterval; + + // Set focus/blur events on the window + $(window).on( 'blur.wp-heartbeat-focus', function() { + setFrameFocusEvents(); + // We don't know why the 'blur' was fired. Either the user clicked in an iframe or outside the browser. + // Running blurred() after some timeout lets us cancel it if the user clicked in an iframe. + settings.winBlurTimer = window.setTimeout( function(){ blurred(); }, 500 ); + }).on( 'focus.wp-heartbeat-focus', function() { + removeFrameFocusEvents(); + focused(); + }).on( 'unload.wp-heartbeat', function() { + // Don't connect any more + settings.isRunning = false; + }); + + // Check for user activity every 30 seconds. + window.setInterval( function(){ checkUserActivity(); }, 30000 ); + + // Start one tick after DOM ready + $document.ready( function() { + settings.lastTick = time(); + scheduleNextTick(); + }); } - function time(s) { - if ( s ) - return parseInt( (new Date()).getTime() / 1000 ); - + /** + * Return the current time according to the browser + * + * @access private + * + * @return int + */ + function time() { return (new Date()).getTime(); } + /** + * Check if the iframe is from the same origin + * + * @access private + * + * @return bool + */ function isLocalFrame( frame ) { var origin, src = frame.src; + // Need to compare strings as WebKit doesn't throw JS errors when iframes have different origin. + // It throws uncatchable exceptions. if ( src && /^https?:\/\//.test( src ) ) { origin = window.location.origin ? window.location.origin : window.location.protocol + '//' + window.location.host; - if ( src.indexOf( origin ) !== 0 ) + if ( src.indexOf( origin ) !== 0 ) { return false; + } } try { - if ( frame.contentWindow.document ) + if ( frame.contentWindow.document ) { return true; + } } catch(e) {} return false; } - // Set error state and fire an event on XHR errors or timeout - function errorstate( error, status ) { + /** + * Set error state and fire an event on XHR errors or timeout + * + * @access private + * + * @param string error The error type passed from the XHR + * @param int status The HTTP status code passed from jqXHR (200, 404, 500, etc.) + * @return void + */ + function setErrorState( error, status ) { var trigger; if ( error ) { @@ -120,203 +219,273 @@ window.wp = window.wp || {}; // no response for 30 sec. trigger = true; break; - case 'parsererror': case 'error': + if ( 503 === status && settings.hasConnected ) { + trigger = true; + break; + } + // Pass through other error statuses + case 'parsererror': case 'empty': case 'unknown': - errorcount++; + settings.errorcount++; - if ( errorcount > 2 ) + if ( settings.errorcount > 2 && settings.hasConnected ) { trigger = true; + } break; } - if ( 503 == status && false === hasConnectionError ) { - trigger = true; - } - - if ( trigger && ! self.hasConnectionError() ) { - hasConnectionError = true; + if ( trigger && ! hasConnectionError() ) { + settings.connectionError = true; $(document).trigger( 'heartbeat-connection-lost', [error, status] ); } - } else if ( self.hasConnectionError() ) { - errorcount = 0; - hasConnectionError = false; - $(document).trigger( 'heartbeat-connection-restored' ); - } else if ( null === hasConnectionError ) { - hasConnectionError = false; } } - function connect() { - var send = {}, data, i, empty = true, - nonce = typeof window.heartbeatSettings == 'object' ? window.heartbeatSettings.nonce : ''; - tick = time(); + /** + * Clear the error state and fire an event + * + * @access private + * + * @return void + */ + function clearErrorState() { + // Has connected successfully + settings.hasConnected = true; - data = $.extend( {}, queue ); - // Clear the data queue, anything added after this point will be send on the next tick - queue = {}; - - $(document).trigger( 'heartbeat-send', [data] ); - - for ( i in data ) { - if ( data.hasOwnProperty( i ) ) { - empty = false; - break; - } + if ( hasConnectionError() ) { + settings.errorcount = 0; + settings.connectionError = false; + $document.trigger( 'heartbeat-connection-restored' ); } + } - // If nothing to send (nothing is expecting a response), - // schedule the next tick and bail - if ( empty && ! self.hasConnectionError() ) { - connecting = false; - next(); + /** + * Gather the data and connect to the server + * + * @access private + * + * @return void + */ + function connect() { + var ajaxData, heartbeatData; + + // If the connection to the server is slower than the interval, + // heartbeat connects as soon as the previous connection's response is received. + if ( settings.connecting ) { return; } - send.data = data; - send.interval = interval / 1000; - send._nonce = nonce; - send.action = 'heartbeat'; - send.screen_id = screenId; - send.has_focus = hasFocus; + settings.lastTick = time(); - connecting = true; - self.xhr = $.ajax({ - url: url, + heartbeatData = $.extend( {}, settings.queue ); + // Clear the data queue, anything added after this point will be send on the next tick + settings.queue = {}; + + $document.trigger( 'heartbeat-send', [ heartbeatData ] ); + + ajaxData = { + data: heartbeatData, + interval: settings.tempInterval ? settings.tempInterval / 1000 : settings.mainInterval / 1000, + _nonce: typeof window.heartbeatSettings === 'object' ? window.heartbeatSettings.nonce : '', + action: 'heartbeat', + screen_id: settings.screenId, + has_focus: settings.hasFocus + }; + + settings.connecting = true; + settings.xhr = $.ajax({ + url: settings.url, type: 'post', timeout: 30000, // throw an error if not completed after 30 sec. - data: send, + data: ajaxData, dataType: 'json' + }).always( function() { + settings.connecting = false; + scheduleNextTick(); }).done( function( response, textStatus, jqXHR ) { - var new_interval; + var newInterval; - if ( ! response ) - return errorstate( 'empty' ); + if ( ! response ) { + setErrorState( 'empty' ); + return; + } - // Clear error state - if ( self.hasConnectionError() ) - errorstate(); + clearErrorState(); if ( response.nonces_expired ) { - $(document).trigger( 'heartbeat-nonces-expired' ); + $document.trigger( 'heartbeat-nonces-expired' ); return; } // Change the interval from PHP if ( response.heartbeat_interval ) { - new_interval = response.heartbeat_interval; + newInterval = response.heartbeat_interval; delete response.heartbeat_interval; } - self.tick( response, textStatus, jqXHR ); + $document.trigger( 'heartbeat-tick', [response, textStatus, jqXHR] ); - // do this last, can trigger the next XHR if connection time > 5 sec. and new_interval == 'fast' - if ( new_interval ) - self.interval.call( self, new_interval ); - }).always( function() { - connecting = false; - next(); + // Do this last, can trigger the next XHR if connection time > 5 sec. and newInterval == 'fast' + if ( newInterval ) { + setInterval( newInterval ); + } }).fail( function( jqXHR, textStatus, error ) { - errorstate( textStatus || 'unknown', jqXHR.status ); - self.error( jqXHR, textStatus, error ); + setErrorState( textStatus || 'unknown', jqXHR.status ); + $document.trigger( 'heartbeat-error', [jqXHR, textStatus, error] ); }); } - function next() { - var delta = time() - tick, t = interval; + /** + * Schedule the next connection + * + * Fires immediately if the connection time is longer than the interval. + * + * @access private + * + * @return void + */ + function scheduleNextTick() { + var delta = time() - settings.lastTick, + interval = settings.mainInterval; - if ( ! running ) + if ( ! settings.isRunning ) { return; - - if ( ! hasFocus ) { - t = 100000; // 100 sec. Post locks expire after 120 sec. - } else if ( countdown > 0 && tempInterval ) { - t = tempInterval; - countdown--; } - window.clearTimeout(beat); + if ( ! settings.hasFocus ) { + interval = 120000; // 120 sec. Post locks expire after 150 sec. + } else if ( settings.countdown > 0 && settings.tempInterval ) { + interval = settings.tempInterval; + settings.countdown--; - if ( delta < t ) { - beat = window.setTimeout( - function(){ - if ( running ) + if ( settings.countdown < 1 ) { + settings.tempInterval = 0; + } + } + + window.clearTimeout( settings.beatTimer ); + + if ( delta < interval ) { + settings.beatTimer = window.setTimeout( + function() { connect(); }, - t - delta + interval - delta ); } else { connect(); } } + /** + * Set the internal state when the browser window looses focus + * + * @access private + * + * @return void + */ function blurred() { - window.clearTimeout(winBlurTimeout); - window.clearTimeout(frameBlurTimeout); - winBlurTimeout = frameBlurTimeout = 0; - - hasFocus = false; + clearFocusTimers(); + settings.hasFocus = false; } + /** + * Set the internal state when the browser window is focused + * + * @access private + * + * @return void + */ function focused() { - window.clearTimeout(winBlurTimeout); - window.clearTimeout(frameBlurTimeout); - winBlurTimeout = frameBlurTimeout = 0; + clearFocusTimers(); + settings.userActivity = time(); - isUserActive = time(); - - if ( hasFocus ) - return; - - hasFocus = true; - window.clearTimeout(beat); - - if ( ! connecting ) - next(); + if ( ! settings.hasFocus ) { + settings.hasFocus = true; + scheduleNextTick(); + } } - function setFrameEvents() { - $('iframe').each( function( i, frame ){ - if ( ! isLocalFrame( frame ) ) + /** + * Add focus/blur events to all local iframes + * + * Used to detect when focus is moved from the main window to an iframe + * + * @access private + * + * @return void + */ + function setFrameFocusEvents() { + $('iframe').each( function( i, frame ) { + if ( ! isLocalFrame( frame ) ) { return; + } - if ( $.data( frame, 'wp-heartbeat-focus' ) ) + if ( $.data( frame, 'wp-heartbeat-focus' ) ) { return; + } $.data( frame, 'wp-heartbeat-focus', 1 ); - $( frame.contentWindow ).on( 'focus.wp-heartbeat-focus', function(e) { + $( frame.contentWindow ).on( 'focus.wp-heartbeat-focus', function() { focused(); - }).on('blur.wp-heartbeat-focus', function(e) { - setFrameEvents(); - frameBlurTimeout = window.setTimeout( function(){ blurred(); }, 500 ); + }).on('blur.wp-heartbeat-focus', function() { + setFrameFocusEvents(); + // We don't know why 'blur' was fired. Either the user clicked in the main window or outside the browser. + // Running blurred() after some timeout lets us cancel it if the user clicked in the main window. + settings.frameBlurTimer = window.setTimeout( function(){ blurred(); }, 500 ); }); }); } - $(window).on( 'blur.wp-heartbeat-focus', function(e) { - setFrameEvents(); - winBlurTimeout = window.setTimeout( function(){ blurred(); }, 500 ); - }).on( 'focus.wp-heartbeat-focus', function() { + /** + * Remove the focus/blur events to all local iframes + * + * @access private + * + * @return void + */ + function removeFrameFocusEvents() { $('iframe').each( function( i, frame ) { - if ( !isLocalFrame( frame ) ) + if ( ! isLocalFrame( frame ) ) { return; + } $.removeData( frame, 'wp-heartbeat-focus' ); $( frame.contentWindow ).off( '.wp-heartbeat-focus' ); }); + } - focused(); - }); + /** + * Clear the reset timers for focus/blur events on the window and iframes + * + * @access private + * + * @return void + */ + function clearFocusTimers() { + window.clearTimeout( settings.winBlurTimer ); + window.clearTimeout( settings.frameBlurTimer ); + } + /** + * Runs when the user becomes active after a period of inactivity + * + * @access private + * + * @return void + */ function userIsActive() { - userActiveEvents = false; - $(document).off( '.wp-heartbeat-active' ); + settings.userActivityEvents = false; + $document.off( '.wp-heartbeat-active' ); + $('iframe').each( function( i, frame ) { - if ( ! isLocalFrame( frame ) ) + if ( ! isLocalFrame( frame ) ) { return; + } $( frame.contentWindow ).off( '.wp-heartbeat-active' ); }); @@ -324,101 +493,139 @@ window.wp = window.wp || {}; focused(); } - // Set 'hasFocus = true' if user is active and the window is in the background. - // Set 'hasFocus = false' if the user has been inactive (no mouse or keyboard activity) for 5 min. even when the window has focus. - function checkUserActive() { - var lastActive = isUserActive ? time() - isUserActive : 0; + /** + * Check for user activity + * + * Runs every 30 sec. + * Sets 'hasFocus = true' if user is active and the window is in the background. + * Set 'hasFocus = false' if the user has been inactive (no mouse or keyboard activity) + * for 5 min. even when the window has focus. + * + * @access private + * + * @return void + */ + function checkUserActivity() { + var lastActive = settings.userActivity ? time() - settings.userActivity : 0; - // Throttle down when no mouse or keyboard activity for 5 min - if ( lastActive > 300000 && hasFocus ) - blurred(); + if ( lastActive > 300000 && settings.hasFocus ) { + // Throttle down when no mouse or keyboard activity for 5 min + blurred(); + } - if ( ! userActiveEvents ) { - $(document).on( 'mouseover.wp-heartbeat-active keyup.wp-heartbeat-active', function(){ userIsActive(); } ); + if ( ! settings.userActivityEvents ) { + $document.on( 'mouseover.wp-heartbeat-active keyup.wp-heartbeat-active', function(){ userIsActive(); } ); $('iframe').each( function( i, frame ) { - if ( ! isLocalFrame( frame ) ) + if ( ! isLocalFrame( frame ) ) { return; + } $( frame.contentWindow ).on( 'mouseover.wp-heartbeat-active keyup.wp-heartbeat-active', function(){ userIsActive(); } ); }); - userActiveEvents = true; + settings.userActivityEvents = true; } } - // Check for user activity every 30 seconds. - window.setInterval( function(){ checkUserActive(); }, 30000 ); - $(document).ready( function() { - // Start one tick (15 sec) after DOM ready - running = true; - tick = time(); - next(); - }); + // Public methods - this.hasFocus = function() { - return hasFocus; - }; + /** + * Whether the window (or any local iframe in it) has focus, or the user is active + * + * @return bool + */ + function hasFocus() { + return settings.hasFocus; + } + + /** + * Whether there is a connection error + * + * @return bool + */ + function hasConnectionError() { + return settings.connectionError; + } + + /** + * Connect asap regardless of 'hasFocus' + * + * Will not open two concurrent connections. If a connection is in progress, + * will connect again immediately after the current connection completes. + * + * @return void + */ + function connectNow() { + settings.lastTick = 0; + scheduleNextTick(); + } /** * Get/Set the interval * - * When setting to 'fast', the interval is 5 sec. for the next 30 ticks (for 2 min and 30 sec). + * When setting to 'fast' or 5, by default interval is 5 sec. for the next 30 ticks (for 2 min and 30 sec). + * In this case the number of 'ticks' can be passed as second argument. * If the window doesn't have focus, the interval slows down to 2 min. * - * @param string speed Interval speed: 'fast' (5sec), 'standard' (15sec) default, 'slow' (60sec) - * @param string ticks Used with speed = 'fast', how many ticks before the speed reverts back + * @param mixed speed Interval: 'fast' or 5, 15, 30, 60 + * @param string ticks Used with speed = 'fast' or 5, how many ticks before the interval reverts back * @return int Current interval in seconds */ - this.interval = function( speed, ticks ) { - var reset, seconds; - ticks = parseInt( ticks, 10 ) || 30; - ticks = ticks < 1 || ticks > 30 ? 30 : ticks; + function setInterval( speed, ticks ) { + var interval, oldInerval = settings.tempInterval ? settings.tempInterval : settings.mainInterval; if ( speed ) { switch ( speed ) { case 'fast': - seconds = 5; - countdown = ticks; + case 5: + interval = 5000; break; - case 'slow': - seconds = 60; - countdown = 0; + case 15: + interval = 15000; + break; + case 30: + interval = 30000; + break; + case 60: + interval = 60000; break; case 'long-polling': // Allow long polling, (experimental) - interval = 0; + settings.mainInterval = 0; return 0; break; default: - seconds = 15; - countdown = 0; + interval = settings.originalInterval; } - // Reset when the new interval value is lower than the current one - reset = seconds * 1000 < interval; + if ( 5000 === interval ) { + ticks = parseInt( ticks, 10 ) || 30; + ticks = ticks < 1 || ticks > 30 ? 30 : ticks; - if ( countdown > 0 ) { - tempInterval = seconds * 1000; + settings.countdown = ticks; + settings.tempInterval = interval; } else { - interval = seconds * 1000; - tempInterval = 0; + settings.countdown = 0; + settings.tempInterval = 0; + settings.mainInterval = interval; } - if ( reset ) - next(); + // Change the next connection time if new interval has been set. + // Will connect immediately if the time since the last connection + // is greater than the new interval. + if ( interval !== oldInerval ) { + scheduleNextTick(); + } } - if ( ! hasFocus ) - return 120; - - return tempInterval ? tempInterval / 1000 : interval / 1000; - }; + return settings.tempInterval ? settings.tempInterval / 1000 : settings.mainInterval / 1000; + } /** * Enqueue data to send with the next XHR * - * As the data is sent later, this function doesn't return the XHR response. + * As the data is send asynchronously, this function doesn't return the XHR response. * To see the response, use the custom jQuery event 'heartbeat-tick' on the document, example: * $(document).on( 'heartbeat-tick.myname', function( event, data, textStatus, jqXHR ) { * // code @@ -428,19 +635,20 @@ window.wp = window.wp || {}; * * $param string handle Unique handle for the data. The handle is used in PHP to receive the data. * $param mixed data The data to send. - * $param bool dont_overwrite Whether to overwrite existing data in the queue. + * $param bool noOverwrite Whether to overwrite existing data in the queue. * $return bool Whether the data was queued or not. */ - this.enqueue = function( handle, data, dont_overwrite ) { + function enqueue( handle, data, noOverwrite ) { if ( handle ) { - if ( dont_overwrite && this.isQueued( handle ) ) + if ( noOverwrite && this.isQueued( handle ) ) { return false; + } - queue[handle] = data; + settings.queue[handle] = data; return true; } return false; - }; + } /** * Check if data with a particular handle is queued @@ -448,10 +656,11 @@ window.wp = window.wp || {}; * $param string handle The handle for the data * $return bool Whether some data is queued with this handle */ - this.isQueued = function( handle ) { - if ( handle ) - return queue.hasOwnProperty( handle ); - }; + function isQueued( handle ) { + if ( handle ) { + return settings.queue.hasOwnProperty( handle ); + } + } /** * Remove data with a particular handle from the queue @@ -459,10 +668,11 @@ window.wp = window.wp || {}; * $param string handle The handle for the data * $return void */ - this.dequeue = function( handle ) { - if ( handle ) - delete queue[handle]; - }; + function dequeue( handle ) { + if ( handle ) { + delete settings.queue[handle]; + } + } /** * Get data that was enqueued with a particular handle @@ -470,21 +680,29 @@ window.wp = window.wp || {}; * $param string handle The handle for the data * $return mixed The data or undefined */ - this.getQueuedItem = function( handle ) { - if ( handle ) - return this.isQueued( handle ) ? queue[handle] : undefined; + function getQueuedItem( handle ) { + if ( handle ) { + return this.isQueued( handle ) ? settings.queue[handle] : undefined; + } + } + + initialize(); + + // Expose public methods + return { + hasFocus: hasFocus, + connectNow: connectNow, + setInterval: setInterval, + hasConnectionError: hasConnectionError, + enqueue: enqueue, + dequeue: dequeue, + isQueued: isQueued, + getQueuedItem: getQueuedItem }; }; - $.extend( Heartbeat.prototype, { - tick: function( data, textStatus, jqXHR ) { - $(document).trigger( 'heartbeat-tick', [data, textStatus, jqXHR] ); - }, - error: function( jqXHR, textStatus, error ) { - $(document).trigger( 'heartbeat-error', [jqXHR, textStatus, error] ); - } - }); + // Ensure the global `wp` object exists. + window.wp = window.wp || {}; + window.wp.heartbeat = new Heartbeat(); - wp.heartbeat = new Heartbeat(); - -}(jQuery)); +}( jQuery, window )); diff --git a/wp-includes/js/heartbeat.min.js b/wp-includes/js/heartbeat.min.js index 81039d4f9f..9fe8c06b80 100644 --- a/wp-includes/js/heartbeat.min.js +++ b/wp-includes/js/heartbeat.min.js @@ -1 +1 @@ -window.wp=window.wp||{},function(a){var b=function(){function b(a){return a?parseInt((new Date).getTime()/1e3):(new Date).getTime()}function c(a){var b,c=a.src;if(c&&/^https?:\/\//.test(c)&&(b=window.location.origin?window.location.origin:window.location.protocol+"//"+window.location.host,0!==c.indexOf(b)))return!1;try{if(a.contentWindow.document)return!0}catch(d){}return!1}function d(b,c){var d;if(b){switch(b){case"abort":break;case"timeout":d=!0;break;case"parsererror":case"error":case"empty":case"unknown":A++,A>2&&(d=!0)}503==c&&!1===D&&(d=!0),d&&!u.hasConnectionError()&&(D=!0,a(document).trigger("heartbeat-connection-lost",[b,c]))}else u.hasConnectionError()?(A=0,D=!1,a(document).trigger("heartbeat-connection-restored")):null===D&&(D=!1)}function e(){var c,e,g={},h=!0,i="object"==typeof window.heartbeatSettings?window.heartbeatSettings.nonce:"";x=b(),c=a.extend({},y),y={},a(document).trigger("heartbeat-send",[c]);for(e in c)if(c.hasOwnProperty(e)){h=!1;break}return h&&!u.hasConnectionError()?(p=!1,f(),void 0):(g.data=c,g.interval=o/1e3,g._nonce=i,g.action="heartbeat",g.screen_id=v,g.has_focus=B,p=!0,u.xhr=a.ajax({url:w,type:"post",timeout:3e4,data:g,dataType:"json"}).done(function(b,c,e){var f;return b?(u.hasConnectionError()&&d(),b.nonces_expired?(a(document).trigger("heartbeat-nonces-expired"),void 0):(b.heartbeat_interval&&(f=b.heartbeat_interval,delete b.heartbeat_interval),u.tick(b,c,e),f&&u.interval.call(u,f),void 0)):d("empty")}).always(function(){p=!1,f()}).fail(function(a,b,c){d(b||"unknown",a.status),u.error(a,b,c)}),void 0)}function f(){var a=b()-x,c=o;l&&(B?z>0&&q&&(c=q,z--):c=1e5,window.clearTimeout(m),c>a?m=window.setTimeout(function(){l&&e()},c-a):e())}function g(){window.clearTimeout(t),window.clearTimeout(C),t=C=0,B=!1}function h(){window.clearTimeout(t),window.clearTimeout(C),t=C=0,r=b(),B||(B=!0,window.clearTimeout(m),p||f())}function i(){a("iframe").each(function(b,d){c(d)&&(a.data(d,"wp-heartbeat-focus")||(a.data(d,"wp-heartbeat-focus",1),a(d.contentWindow).on("focus.wp-heartbeat-focus",function(){h()}).on("blur.wp-heartbeat-focus",function(){i(),C=window.setTimeout(function(){g()},500)})))})}function j(){s=!1,a(document).off(".wp-heartbeat-active"),a("iframe").each(function(b,d){c(d)&&a(d.contentWindow).off(".wp-heartbeat-active")}),h()}function k(){var d=r?b()-r:0;d>3e5&&B&&g(),s||(a(document).on("mouseover.wp-heartbeat-active keyup.wp-heartbeat-active",function(){j()}),a("iframe").each(function(b,d){c(d)&&a(d.contentWindow).on("mouseover.wp-heartbeat-active keyup.wp-heartbeat-active",function(){j()})}),s=!0)}var l,m,n,o,p,q,r,s,t,u=this,v="undefined"!=typeof pagenow?pagenow:"",w="undefined"!=typeof ajaxurl?ajaxurl:"",x=0,y={},z=0,A=0,B=!0,C=-1,D=null;this.hasConnectionError=function(){return!!D},"object"==typeof window.heartbeatSettings&&(n=a.extend({},window.heartbeatSettings),w=n.ajaxurl||w,delete n.ajaxurl,delete n.nonce,o=n.interval||15,delete n.interval,15>o?o=15:o>60&&(o=60),o=1e3*o,v=v||n.screenId||"front",delete n.screenId,a.extend(this,n)),a(window).on("blur.wp-heartbeat-focus",function(){i(),t=window.setTimeout(function(){g()},500)}).on("focus.wp-heartbeat-focus",function(){a("iframe").each(function(b,d){c(d)&&(a.removeData(d,"wp-heartbeat-focus"),a(d.contentWindow).off(".wp-heartbeat-focus"))}),h()}),window.setInterval(function(){k()},3e4),a(document).ready(function(){l=!0,x=b(),f()}),this.hasFocus=function(){return B},this.interval=function(a,b){var c,d;if(b=parseInt(b,10)||30,b=1>b||b>30?30:b,a){switch(a){case"fast":d=5,z=b;break;case"slow":d=60,z=0;break;case"long-polling":return o=0,0;default:d=15,z=0}c=o>1e3*d,z>0?q=1e3*d:(o=1e3*d,q=0),c&&f()}return B?q?q/1e3:o/1e3:120},this.enqueue=function(a,b,c){return a?c&&this.isQueued(a)?!1:(y[a]=b,!0):!1},this.isQueued=function(a){return a?y.hasOwnProperty(a):void 0},this.dequeue=function(a){a&&delete y[a]},this.getQueuedItem=function(a){return a?this.isQueued(a)?y[a]:void 0:void 0}};a.extend(b.prototype,{tick:function(b,c,d){a(document).trigger("heartbeat-tick",[b,c,d])},error:function(b,c,d){a(document).trigger("heartbeat-error",[b,c,d])}}),wp.heartbeat=new b}(jQuery); \ No newline at end of file +!function(a,b,c){var d=function(){function d(){if("string"==typeof b.pagenow&&(A.screenId=b.pagenow),"string"==typeof b.ajaxurl&&(A.url=b.ajaxurl),"object"==typeof b.heartbeatSettings){var c=b.heartbeatSettings;!A.url&&c.ajaxurl&&(A.url=c.ajaxurl),c.interval&&(A.mainInterval=c.interval,A.mainInterval<15?A.mainInterval=15:A.mainInterval>60&&(A.mainInterval=60)),A.screenId||(A.screenId=c.screenId||"front")}A.mainInterval=1e3*A.mainInterval,A.originalInterval=A.mainInterval,a(b).on("blur.wp-heartbeat-focus",function(){m(),A.winBlurTimer=b.setTimeout(function(){k()},500)}).on("focus.wp-heartbeat-focus",function(){n(),l()}).on("unload.wp-heartbeat",function(){A.isRunning=!1}),b.setInterval(function(){q()},3e4),z.ready(function(){A.lastTick=e(),j()})}function e(){return(new Date).getTime()}function f(a){var c,d=a.src;if(d&&/^https?:\/\//.test(d)&&(c=b.location.origin?b.location.origin:b.location.protocol+"//"+b.location.host,0!==d.indexOf(c)))return!1;try{if(a.contentWindow.document)return!0}catch(e){}return!1}function g(b,c){var d;if(b){switch(b){case"abort":break;case"timeout":d=!0;break;case"error":if(503===c&&A.hasConnected){d=!0;break}case"parsererror":case"empty":case"unknown":A.errorcount++,A.errorcount>2&&A.hasConnected&&(d=!0)}d&&!s()&&(A.connectionError=!0,a(document).trigger("heartbeat-connection-lost",[b,c]))}}function h(){A.hasConnected=!0,s()&&(A.errorcount=0,A.connectionError=!1,z.trigger("heartbeat-connection-restored"))}function i(){var c,d;A.connecting||(A.lastTick=e(),d=a.extend({},A.queue),A.queue={},z.trigger("heartbeat-send",[d]),c={data:d,interval:A.tempInterval?A.tempInterval/1e3:A.mainInterval/1e3,_nonce:"object"==typeof b.heartbeatSettings?b.heartbeatSettings.nonce:"",action:"heartbeat",screen_id:A.screenId,has_focus:A.hasFocus},A.connecting=!0,A.xhr=a.ajax({url:A.url,type:"post",timeout:3e4,data:c,dataType:"json"}).always(function(){A.connecting=!1,j()}).done(function(a,b,c){var d;return a?(h(),a.nonces_expired?(z.trigger("heartbeat-nonces-expired"),void 0):(a.heartbeat_interval&&(d=a.heartbeat_interval,delete a.heartbeat_interval),z.trigger("heartbeat-tick",[a,b,c]),d&&u(d),void 0)):(g("empty"),void 0)}).fail(function(a,b,c){g(b||"unknown",a.status),z.trigger("heartbeat-error",[a,b,c])}))}function j(){var a=e()-A.lastTick,c=A.mainInterval;A.isRunning&&(A.hasFocus?A.countdown>0&&A.tempInterval&&(c=A.tempInterval,A.countdown--,A.countdown<1&&(A.tempInterval=0)):c=12e4,b.clearTimeout(A.beatTimer),c>a?A.beatTimer=b.setTimeout(function(){i()},c-a):i())}function k(){o(),A.hasFocus=!1}function l(){o(),A.userActivity=e(),A.hasFocus||(A.hasFocus=!0,j())}function m(){a("iframe").each(function(c,d){f(d)&&(a.data(d,"wp-heartbeat-focus")||(a.data(d,"wp-heartbeat-focus",1),a(d.contentWindow).on("focus.wp-heartbeat-focus",function(){l()}).on("blur.wp-heartbeat-focus",function(){m(),A.frameBlurTimer=b.setTimeout(function(){k()},500)})))})}function n(){a("iframe").each(function(b,c){f(c)&&(a.removeData(c,"wp-heartbeat-focus"),a(c.contentWindow).off(".wp-heartbeat-focus"))})}function o(){b.clearTimeout(A.winBlurTimer),b.clearTimeout(A.frameBlurTimer)}function p(){A.userActivityEvents=!1,z.off(".wp-heartbeat-active"),a("iframe").each(function(b,c){f(c)&&a(c.contentWindow).off(".wp-heartbeat-active")}),l()}function q(){var b=A.userActivity?e()-A.userActivity:0;b>3e5&&A.hasFocus&&k(),A.userActivityEvents||(z.on("mouseover.wp-heartbeat-active keyup.wp-heartbeat-active",function(){p()}),a("iframe").each(function(b,c){f(c)&&a(c.contentWindow).on("mouseover.wp-heartbeat-active keyup.wp-heartbeat-active",function(){p()})}),A.userActivityEvents=!0)}function r(){return A.hasFocus}function s(){return A.connectionError}function t(){A.lastTick=0,j()}function u(a,b){var c,d=A.tempInterval?A.tempInterval:A.mainInterval;if(a){switch(a){case"fast":case 5:c=5e3;break;case 15:c=15e3;break;case 30:c=3e4;break;case 60:c=6e4;break;case"long-polling":return A.mainInterval=0,0;default:c=A.originalInterval}5e3===c?(b=parseInt(b,10)||30,b=1>b||b>30?30:b,A.countdown=b,A.tempInterval=c):(A.countdown=0,A.tempInterval=0,A.mainInterval=c),c!==d&&j()}return A.tempInterval?A.tempInterval/1e3:A.mainInterval/1e3}function v(a,b,c){return a?c&&this.isQueued(a)?!1:(A.queue[a]=b,!0):!1}function w(a){return a?A.queue.hasOwnProperty(a):void 0}function x(a){a&&delete A.queue[a]}function y(a){return a?this.isQueued(a)?A.queue[a]:c:void 0}var z=a(document),A={isRunning:!0,screenId:"",url:"",lastTick:0,queue:{},mainInterval:60,tempInterval:0,originalInterval:0,countdown:0,connecting:!1,connectionError:!1,errorcount:0,hasConnected:!1,hasFocus:!0,userActivity:0,userActivityEvents:!1,beatTimer:0,winBlurTimer:0,frameBlurTimer:0};return d(),{hasFocus:r,connectNow:t,setInterval:u,hasConnectionError:s,enqueue:v,dequeue:x,isQueued:w,getQueuedItem:y}};b.wp=b.wp||{},b.wp.heartbeat=new d}(jQuery,window); \ No newline at end of file