- ' + '
- ' + o.timeText + ' ' + + ''; + + // Create the markup + for (i = 0, l = this.units.length; i < l; i++) { + litem = this.units[i]; + uitem = litem.substr(0, 1).toUpperCase() + litem.substr(1); + show = o['show' + uitem] !== null ? o['show' + uitem] : this.support[litem]; + + // Added by Peter Medeiros: + // - Figure out what the hour/minute/second max should be based on the step values. + // - Example: if stepMinute is 15, then minMax is 45. + max[litem] = parseInt((o[litem + 'Max'] - ((o[litem + 'Max'] - o[litem + 'Min']) % o['step' + uitem])), 10); + gridSize[litem] = 0; + + html += '
- ' + o[litem + 'Text'] + ' ' + + '
- ';
+
+ if (show && o[litem + 'Grid'] > 0) {
+ html += ''; + } + html += '
'; + + if (litem === 'hour') { + for (var h = o[litem + 'Min']; h <= max[litem]; h += parseInt(o[litem + 'Grid'], 10)) { + gridSize[litem]++; + var tmph = $.datepicker.formatTime(this.support.ampm ? 'hht' : 'HH', {hour: h}, o); + html += ' ' + tmph + ' '; + } + } + else { + for (var m = o[litem + 'Min']; m <= max[litem]; m += parseInt(o[litem + 'Grid'], 10)) { + gridSize[litem]++; + html += '' + ((m < 10) ? '0' : '') + m + ' '; + } + } + + html += ' ';
+ }
+
+ // Timezone
+ var showTz = o.showTimezone !== null ? o.showTimezone : this.support.timezone;
+ html += ' - ' + o.timezoneText + ' '; + html += ''; + + // Create the elements from string + html += '
- '+b.timeText+' ";for(j=0,k=this.units.length;k>j;j++){if(d=this.units[j],e=d.substr(0,1).toUpperCase()+d.substr(1),f=null!==b["show"+e]?b["show"+e]:this.support[d],g[d]=parseInt(b[d+"Max"]-(b[d+"Max"]-b[d+"Min"])%b["step"+e],10),h[d]=0,m+='
- '+b[d+"Text"]+'
- ',f&&b[d+"Grid"]>0){if(m+='"}m+="
',"hour"===d)for(var n=b[d+"Min"];n<=g[d];n+=parseInt(b[d+"Grid"],10)){h[d]++;var o=$.datepicker.formatTime(this.support.ampm?"hht":"HH",{hour:n},b);m+=' '+o+" "}else for(var p=b[d+"Min"];p<=g[d];p+=parseInt(b[d+"Grid"],10))h[d]++,m+=''+(10>p?"0":"")+p+" ";m+=" "}var q=null!==b.showTimezone?b.showTimezone:this.support.timezone;m+=' - '+b.timezoneText+" ",m+='',m+="
'+t+"
"),$("body").append(this.$el);var i=10;target_w=e.$el.outerWidth(),target_h=e.$el.outerHeight(),target_t=e.$el.offset().top,target_l=e.$el.offset().left,tooltip_w=this.$el.outerWidth(),tooltip_h=this.$el.outerHeight();var a=target_t-tooltip_h,n=target_l+target_w/2-tooltip_w/2;i>n?(this.$el.addClass("right"),n=target_l+target_w,a=target_t+target_h/2-tooltip_h/2):n+tooltip_w+i>$(window).width()?(this.$el.addClass("left"),n=target_l-tooltip_w,a=target_t+target_h/2-tooltip_h/2):a-$(window).scrollTop()',''+acf._e("restricted")+"",''+s+"",'","
"].join(""))}e.prototype.toggleSelection.apply(this,arguments)},select:function(t,i){var a=acf.media.frame(),n=this.controller.state(),s=n.get("selection"),o=acf.maybe_get(this,"model.attributes.acf_errors");return a&&o?s.remove(t):e.prototype.select.apply(this,arguments)}})},customize_AttachmentFiltersAll:function(){wp.media.view.AttachmentFilters.All.prototype.refresh=function(){this.$el.html(_.chain(this.filters).map(function(e,t){return{el:$("").val(t).html(e.text)[0],priority:e.priority||50}},this).sortBy("priority").pluck("el").value())}},customize_AttachmentCompat:function(){var e=wp.media.view.AttachmentCompat;wp.media.view.AttachmentCompat=e.extend({render:function(){var t=this;return this.ignore_render?this:(setTimeout(function(){var e=t.$el.closest(".media-modal");if(!e.find(".media-frame-router .acf-expand-details").exists()){var i=$(['',''+acf._e("expand_details")+"",''+acf._e("collapse_details")+"",""].join(""));i.on("click",function(t){t.preventDefault(),e.hasClass("acf-expanded")?e.removeClass("acf-expanded"):e.addClass("acf-expanded")}),e.find(".media-frame-router").append(i)}},0),clearTimeout(acf.media.render_timout),acf.media.render_timout=setTimeout(function(){acf.do_action("append",t.$el)},50),e.prototype.render.apply(this,arguments))},dispose:function(){return acf.do_action("remove",this.$el),e.prototype.dispose.apply(this,arguments)},save:function(e){e&&e.preventDefault();var t=acf.serialize_form(this.$el);this.ignore_render=!0,this.model.saveCompat(t)}})}})}(jQuery),function($){acf.fields.oembed={search:function(e){var t=e.find('[data-name="search-input"]').val();"http"!=t.substr(0,4)&&(t="http://"+t,e.find('[data-name="search-input"]').val(t)),e.addClass("is-loading");var i={action:"acf/fields/oembed/search",nonce:acf.get("nonce"),s:t,width:acf.get_data(e,"width"),height:acf.get_data(e,"height")};e.data("xhr")&&e.data("xhr").abort();var a=$.ajax({url:acf.get("ajaxurl"),data:i,type:"post",dataType:"html",success:function(i){e.removeClass("is-loading"),acf.fields.oembed.search_success(e,t,i),i||acf.fields.oembed.search_error(e)}});e.data("xhr",a)},search_success:function(e,t,i){e.removeClass("has-error").addClass("has-value"),e.find('[data-name="value-input"]').val(t),e.find('[data-name="value-title"]').html(t),e.find('[data-name="value-embed"]').html(i)},search_error:function(e){e.removeClass("has-value").addClass("has-error")},clear:function(e){e.removeClass("has-error has-value"),e.find('[data-name="search-input"]').val(""),e.find('[data-name="value-input"]').val(""),e.find('[data-name="value-title"]').html(""),e.find('[data-name="value-embed"]').html("")},edit:function(e){e.addClass("is-editing");var t=e.find('[data-name="value-title"]').text();e.find('[data-name="search-input"]').val(t).focus()},blur:function(e){e.removeClass("is-editing");var t=e.find('[data-name="value-title"]').text(),i=e.find('[data-name="search-input"]').val(),a=e.find('[data-name="value-embed"]').html();return i?void(i!=t&&this.search(e)):void this.clear(e)}},$(document).on("click",'.acf-oembed [data-name="search-button"]',function(e){e.preventDefault(),acf.fields.oembed.search($(this).closest(".acf-oembed")),$(this).blur()}),$(document).on("click",'.acf-oembed [data-name="clear-button"]',function(e){e.preventDefault(),acf.fields.oembed.clear($(this).closest(".acf-oembed")),$(this).blur()}),$(document).on("click",'.acf-oembed [data-name="value-title"]',function(e){e.preventDefault(),acf.fields.oembed.edit($(this).closest(".acf-oembed"))}),$(document).on("keypress",'.acf-oembed [data-name="search-input"]',function(e){13==e.which&&e.preventDefault()}),$(document).on("keyup",'.acf-oembed [data-name="search-input"]',function(e){$(this).val()&&e.which&&acf.fields.oembed.search($(this).closest(".acf-oembed"))}),$(document).on("blur",'.acf-oembed [data-name="search-input"]',function(e){acf.fields.oembed.blur($(this).closest(".acf-oembed"))})}(jQuery),function($){acf.fields.radio=acf.field.extend({type:"radio",$ul:null,events:{'click input[type="radio"]':"click"},focus:function(){this.$ul=this.$field.find("ul"),this.o=acf.get_data(this.$ul)},click:function(e){var t=e.$el,i=t.parent("label"),a=i.hasClass("selected"),n=t.val();if(this.$ul.find(".selected").removeClass("selected"),i.addClass("selected"),this.o.allow_null&&a&&(e.$el.prop("checked",!1),i.removeClass("selected"),n=!1,e.$el.trigger("change")),this.o.other_choice){var s=this.$ul.find('input[type="text"]');"other"===n?s.prop("disabled",!1).attr("name",t.attr("name")):s.prop("disabled",!0).attr("name","")}}})}(jQuery),function($){acf.fields.relationship=acf.field.extend({type:"relationship",$el:null,$input:null,$filters:null,$choices:null,$values:null,actions:{ready:"initialize",append:"initialize"},events:{"keypress [data-filter]":"submit_filter","change [data-filter]":"change_filter","keyup [data-filter]":"change_filter","click .choices .acf-rel-item":"add_item",'click [data-name="remove_item"]':"remove_item"},focus:function(){this.$el=this.$field.find(".acf-relationship"),this.$input=this.$el.find(".acf-hidden input"),this.$choices=this.$el.find(".choices"),this.$values=this.$el.find(".values"),this.o=acf.get_data(this.$el)},initialize:function(){var e=this,t=this.$field,i=this.$el,a=this.$input;this.$values.children(".list").sortable({items:"li",forceHelperSize:!0,forcePlaceholderSize:!0,scroll:!0,update:function(){a.trigger("change")}}),this.$choices.children(".list").scrollTop(0).on("scroll",function(a){if(!i.hasClass("is-loading")&&!i.hasClass("is-empty")&&Math.ceil($(this).scrollTop())+$(this).innerHeight()>=$(this).get(0).scrollHeight){var n=i.data("paged")||1;i.data("paged",n+1),e.doFocus(t),e.fetch()}}),this.fetch()},maybe_fetch:function(){var e=this,t=this.$field;this.o.timeout&&clearTimeout(this.o.timeout);var i=setTimeout(function(){e.doFocus(t),e.fetch()},400);this.$el.data("timeout",i)},fetch:function(){var e=this,t=this.$field;this.$el.addClass("is-loading"),this.o.xhr&&(this.o.xhr.abort(),this.o.xhr=!1),this.o.action="acf/fields/relationship/query",this.o.field_key=t.data("key"),this.o.post_id=acf.get("post_id");var i=acf.prepare_for_ajax(this.o);1==i.paged&&this.$choices.children(".list").html(""),this.$choices.find("ul:last").append(''+acf._e("relationship","loading")+"
");var a=$.ajax({url:acf.get("ajaxurl"),dataType:"json",type:"post",data:i,success:function(i){e.doFocus(t),e.render(i)}});this.$el.data("xhr",a)},render:function(e){if(this.$el.removeClass("is-loading is-empty"),this.$choices.find("p").remove(),!e||!e.length)return this.$el.addClass("is-empty"),void(1==this.o.paged&&this.$choices.children(".list").append(""+acf._e("relationship","empty")+"
"));var t=$(this.walker(e));if(this.$values.find(".acf-rel-item").each(function(){t.find('.acf-rel-item[data-id="'+$(this).data("id")+'"]').addClass("disabled")}),this.o.s){var i=this.o.s;t.find(".acf-rel-item").each(function(){var e=$(this).text(),t=e.replace(new RegExp("("+i+")","gi"),"$1");$(this).html($(this).html().replace(e,t))})}this.$choices.children(".list").append(t);var a="",n=null;this.$choices.find(".acf-rel-label").each(function(){return $(this).text()==a?(n.append($(this).siblings("ul").html()),void $(this).parent().remove()):(a=$(this).text(),void(n=$(this).siblings("ul")))})},walker:function(e){var t="";if($.isArray(e))for(var i in e)t+=this.walker(e[i]);else $.isPlainObject(e)&&(void 0!==e.children?(t+='- ',t+=this.walker(e.children),t+="
'+t+"
"),$("body").append(this.$el);var i=10;target_w=e.$el.outerWidth(),target_h=e.$el.outerHeight(),target_t=e.$el.offset().top,target_l=e.$el.offset().left,tooltip_w=this.$el.outerWidth(),tooltip_h=this.$el.outerHeight();var a=target_t-tooltip_h,n=target_l+target_w/2-tooltip_w/2;i>n?(this.$el.addClass("right"),n=target_l+target_w,a=target_t+target_h/2-tooltip_h/2):n+tooltip_w+i>$(window).width()?(this.$el.addClass("left"),n=target_l-tooltip_w,a=target_t+target_h/2-tooltip_h/2):a-$(window).scrollTop()',''+acf._e("restricted")+"",''+s+"",'","
"].join(""))}e.prototype.toggleSelection.apply(this,arguments)},select:function(t,i){var a=acf.media.frame(),n=this.controller.state(),s=n.get("selection"),o=acf.maybe_get(this,"model.attributes.acf_errors");return a&&o?s.remove(t):e.prototype.select.apply(this,arguments)}})},customize_AttachmentFiltersAll:function(){wp.media.view.AttachmentFilters.All.prototype.refresh=function(){this.$el.html(_.chain(this.filters).map(function(e,t){return{el:$("").val(t).html(e.text)[0],priority:e.priority||50}},this).sortBy("priority").pluck("el").value())}},customize_AttachmentCompat:function(){var e=wp.media.view.AttachmentCompat;wp.media.view.AttachmentCompat=e.extend({render:function(){var t=this;return this.ignore_render?this:(setTimeout(function(){var e=t.$el.closest(".media-modal");if(!e.find(".media-frame-router .acf-expand-details").exists()){var i=$(['',''+acf._e("expand_details")+"",''+acf._e("collapse_details")+"",""].join(""));i.on("click",function(t){t.preventDefault(),e.hasClass("acf-expanded")?e.removeClass("acf-expanded"):e.addClass("acf-expanded")}),e.find(".media-frame-router").append(i)}},0),clearTimeout(acf.media.render_timout),acf.media.render_timout=setTimeout(function(){acf.do_action("append",t.$el)},50),e.prototype.render.apply(this,arguments))},dispose:function(){return acf.do_action("remove",this.$el),e.prototype.dispose.apply(this,arguments)},save:function(e){e&&e.preventDefault();var t=acf.serialize_form(this.$el);this.ignore_render=!0,this.model.saveCompat(t)}})}})}(jQuery),function($){acf.fields.oembed={search:function(e){var t=e.find('[data-name="search-input"]').val();"http"!=t.substr(0,4)&&(t="http://"+t,e.find('[data-name="search-input"]').val(t)),e.addClass("is-loading");var i={action:"acf/fields/oembed/search",nonce:acf.get("nonce"),s:t,width:acf.get_data(e,"width"),height:acf.get_data(e,"height")};e.data("xhr")&&e.data("xhr").abort();var a=$.ajax({url:acf.get("ajaxurl"),data:i,type:"post",dataType:"html",success:function(i){e.removeClass("is-loading"),acf.fields.oembed.search_success(e,t,i),i||acf.fields.oembed.search_error(e)}});e.data("xhr",a)},search_success:function(e,t,i){e.removeClass("has-error").addClass("has-value"),e.find('[data-name="value-input"]').val(t),e.find('[data-name="value-title"]').html(t),e.find('[data-name="value-embed"]').html(i)},search_error:function(e){e.removeClass("has-value").addClass("has-error")},clear:function(e){e.removeClass("has-error has-value"),e.find('[data-name="search-input"]').val(""),e.find('[data-name="value-input"]').val(""),e.find('[data-name="value-title"]').html(""),e.find('[data-name="value-embed"]').html("")},edit:function(e){e.addClass("is-editing");var t=e.find('[data-name="value-title"]').text();e.find('[data-name="search-input"]').val(t).focus()},blur:function(e){e.removeClass("is-editing");var t=e.find('[data-name="value-title"]').text(),i=e.find('[data-name="search-input"]').val(),a=e.find('[data-name="value-embed"]').html();return i?void(i!=t&&this.search(e)):void this.clear(e)}},$(document).on("click",'.acf-oembed [data-name="search-button"]',function(e){e.preventDefault(),acf.fields.oembed.search($(this).closest(".acf-oembed")),$(this).blur()}),$(document).on("click",'.acf-oembed [data-name="clear-button"]',function(e){e.preventDefault(),acf.fields.oembed.clear($(this).closest(".acf-oembed")),$(this).blur()}),$(document).on("click",'.acf-oembed [data-name="value-title"]',function(e){e.preventDefault(),acf.fields.oembed.edit($(this).closest(".acf-oembed"))}),$(document).on("keypress",'.acf-oembed [data-name="search-input"]',function(e){13==e.which&&e.preventDefault()}),$(document).on("keyup",'.acf-oembed [data-name="search-input"]',function(e){$(this).val()&&e.which&&acf.fields.oembed.search($(this).closest(".acf-oembed"))}),$(document).on("blur",'.acf-oembed [data-name="search-input"]',function(e){acf.fields.oembed.blur($(this).closest(".acf-oembed"))})}(jQuery),function($){acf.fields.radio=acf.field.extend({type:"radio",$ul:null,events:{'click input[type="radio"]':"click"},focus:function(){this.$ul=this.$field.find(".acf-radio-list"),this.o=acf.get_data(this.$ul)},click:function(e){var t=e.$el,i=t.parent("label"),a=i.hasClass("selected"),n=t.val();if(this.$ul.find(".selected").removeClass("selected"),i.addClass("selected"),this.o.allow_null&&a&&(e.$el.prop("checked",!1),i.removeClass("selected"),n=!1,e.$el.trigger("change")),this.o.other_choice){var s=this.$ul.find('input[type="text"]');"other"===n?s.prop("disabled",!1).attr("name",t.attr("name")):s.prop("disabled",!0).attr("name","")}}})}(jQuery),function($){acf.fields.relationship=acf.field.extend({type:"relationship",$el:null,$input:null,$filters:null,$choices:null,$values:null,actions:{ready:"initialize",append:"initialize"},events:{"keypress [data-filter]":"submit_filter","change [data-filter]":"change_filter","keyup [data-filter]":"change_filter","click .choices .acf-rel-item":"add_item",'click [data-name="remove_item"]':"remove_item"},focus:function(){this.$el=this.$field.find(".acf-relationship"),this.$input=this.$el.find(".acf-hidden input"),this.$choices=this.$el.find(".choices"),this.$values=this.$el.find(".values"),this.o=acf.get_data(this.$el)},initialize:function(){var e=this,t=this.$field,i=this.$el,a=this.$input;this.$values.children(".list").sortable({items:"li",forceHelperSize:!0,forcePlaceholderSize:!0,scroll:!0,update:function(){a.trigger("change")}}),this.$choices.children(".list").scrollTop(0).on("scroll",function(a){if(!i.hasClass("is-loading")&&!i.hasClass("is-empty")&&Math.ceil($(this).scrollTop())+$(this).innerHeight()>=$(this).get(0).scrollHeight){var n=i.data("paged")||1;i.data("paged",n+1),e.doFocus(t),e.fetch()}}),this.fetch()},maybe_fetch:function(){var e=this,t=this.$field;this.o.timeout&&clearTimeout(this.o.timeout);var i=setTimeout(function(){e.doFocus(t),e.fetch()},400);this.$el.data("timeout",i)},fetch:function(){var e=this,t=this.$field;this.$el.addClass("is-loading"),this.o.xhr&&(this.o.xhr.abort(),this.o.xhr=!1),this.o.action="acf/fields/relationship/query",this.o.field_key=t.data("key"),this.o.post_id=acf.get("post_id");var i=acf.prepare_for_ajax(this.o);1==i.paged&&this.$choices.children(".list").html(""),this.$choices.find("ul:last").append(''+acf._e("relationship","loading")+"
");var a=$.ajax({url:acf.get("ajaxurl"),dataType:"json",type:"post",data:i,success:function(i){e.doFocus(t),e.render(i)}});this.$el.data("xhr",a)},render:function(e){if(this.$el.removeClass("is-loading is-empty"),this.$choices.find("p").remove(),!e||!e.length)return this.$el.addClass("is-empty"),void(1==this.o.paged&&this.$choices.children(".list").append(""+acf._e("relationship","empty")+"
"));var t=$(this.walker(e));if(this.$values.find(".acf-rel-item").each(function(){t.find('.acf-rel-item[data-id="'+$(this).data("id")+'"]').addClass("disabled")}),this.o.s){var i=this.o.s;t.find(".acf-rel-item").each(function(){var e=$(this).text(),t=e.replace(new RegExp("("+i+")","gi"),"$1");$(this).html($(this).html().replace(e,t))})}this.$choices.children(".list").append(t);var a="",n=null;this.$choices.find(".acf-rel-label").each(function(){return $(this).text()==a?(n.append($(this).siblings("ul").html()),void $(this).parent().remove()):(a=$(this).text(),void(n=$(this).siblings("ul")))})},walker:function(e){var t="";if($.isArray(e))for(var i in e)t+=this.walker(e[i]);else $.isPlainObject(e)&&(void 0!==e.children?(t+='- ',t+=this.walker(e.children),t+="
' . $info['upgrade_notice'] . '
';
+
+ }
+
+
+ // filter
+ $message = apply_filters('acf/updates/plugin_update_message', $message, $plugin_data, $r );
+
+
+ // return
+ echo $message;
+
+ }
+
+}
+
+// initialize
+acf()->updates = new acf_updates();
+
+endif; // class_exists check
+
+
+
+/*
+* acf_get_remote_plugin_info
+*
+* This function will return an array of data from the plugin's readme.txt file (remote)
+*
+* @type function
+* @date 8/06/2016
+* @since 5.3.9
+*
+* @param n/a
+* @return (array)
+*/
+
+function acf_get_remote_plugin_info() {
+
+ // vars
+ $transient_name = 'acf_get_remote_plugin_info';
+
+
+ // clear transient if force check is enabled
+ if( !empty($_GET['force-check']) ) {
+
+ // only allow transient to be deleted once per page load
+ if( empty($_GET['acf-ignore-force-check']) ) {
+
+ delete_transient( 'acf_get_remote_plugin_info' );
+
+ }
+
+
+ // update $_GET
+ $_GET['acf-ignore-force-check'] = true;
+
+ }
+
+
+ // get transient
+ $transient = get_transient( $transient_name );
+
+ // fake
+/*
+ if( $transient ) {
+
+ $transient['upgrade_notice'] .= '5.3.8.1
- This update will do this
- and that
', $orig) ); + + + // loop + foreach( $bits as $bit ) { + + // vars + $bit = explode('
', $bit); + $version = trim($bit[0]); + $text = trim($bit[1]); + + + // is relevant? + if( version_compare($info['version'], $version, '==') ) { + + $new = '' . $version . '
' . $text; + break; + + } + + } + + + // update + $info[ $k ] = $new; + + } + + + // allow transient to save empty + if( empty($info) ) $info = 0; + + + // update transient + set_transient( $transient_name, $info, DAY_IN_SECONDS ); + + + // return + return $info; + +} + + +/* +* acf_get_wporg_remote_plugin_info +* +* This function will return an array of data from the wordpress.org plugin's readme.txt file (remote) +* +* @type function +* @date 8/06/2016 +* @since 5.3.9 +* +* @param n/a +* @return (array) +*/ + + +function acf_get_wporg_remote_plugin_info() { + + // create basic version of plugin info. + // this should replicate the data available via plugin_api() + // doing so allows ACF PRO to load data from external source + $info = array( + 'name' => acf_get_setting('name'), + 'slug' => acf_get_setting('slug'), + 'version' => acf_get_setting('version'), + 'changelog' => '', + 'upgrade_notice' => '' + ); + + + // get readme + $response = wp_safe_remote_get('https://plugins.svn.wordpress.org/advanced-custom-fields/trunk/readme.txt'); + + + // bail early if no response + if( is_wp_error($response) || empty($response['body']) ) return $info; + + + // use regex to find upgrade notice + $matches = null; + $regexp = '/(== Upgrade Notice ==)([\s\S]+?)(==|$)/'; + + + // bail early if no match + if( !preg_match($regexp, $response['body'], $matches) ) return $info; + + + // convert to html + $text = wp_kses_post( trim($matches[2]) ); + + + // pretify + $text = preg_replace('/^= (.*?) =/m', '$1
', $text); + $text = preg_replace('/^[\*] (.*?)(\n|$)/m', '- $1', $text); + $text = preg_replace('/(<\/li>)(?!
- )/', '$1
';
+ $e .= '';
$e .= '';
- $e .= '';
$e .= '
';
@@ -230,32 +251,7 @@ class acf_field_date_picker extends acf_field {
function format_value( $value, $post_id, $field ) {
- // bail early if no value
- if( empty($value) ) {
-
- return $value;
-
- }
-
-
- // get time
- $unixtimestamp = strtotime( $value );
-
-
- // bail early if timestamp is not correct
- if( !$unixtimestamp ) {
-
- return $value;
-
- }
-
-
- // translate
- $value = date_i18n($field['return_format'], $unixtimestamp);
-
-
- // return
- return $value;
+ return acf_format_date( $value, $field['return_format'] );
}
diff --git a/fields/date_time_picker.php b/fields/date_time_picker.php
new file mode 100644
index 0000000..923f37b
--- /dev/null
+++ b/fields/date_time_picker.php
@@ -0,0 +1,310 @@
+name = 'date_time_picker';
+ $this->label = __("Date Time Picker",'acf');
+ $this->category = 'jquery';
+ $this->defaults = array(
+ 'display_format' => 'd/m/Y g:i a',
+ 'return_format' => 'd/m/Y g:i a',
+ 'first_day' => 1
+ );
+ $this->l10n = array(
+ 'timeOnlyTitle' => _x('Choose Time', 'Date Time Picker JS timeOnlyTitle', 'acf'),
+ 'timeText' => _x('Time', 'Date Time Picker JS timeText', 'acf'),
+ 'hourText' => _x('Hour', 'Date Time Picker JS hourText', 'acf'),
+ 'minuteText' => _x('Minute', 'Date Time Picker JS minuteText', 'acf'),
+ 'secondText' => _x('Second', 'Date Time Picker JS secondText', 'acf'),
+ 'millisecText' => _x('Millisecond', 'Date Time Picker JS millisecText', 'acf'),
+ 'microsecText' => _x('Microsecond', 'Date Time Picker JS microsecText', 'acf'),
+ 'timezoneText' => _x('Time Zone', 'Date Time Picker JS timezoneText', 'acf'),
+ 'currentText' => _x('Now', 'Date Time Picker JS currentText', 'acf'),
+ 'closeText' => _x('Done', 'Date Time Picker JS closeText', 'acf'),
+ 'amNames' => array(
+ _x('AM', 'Date Time Picker JS amText', 'acf'),
+ _x('A', 'Date Time Picker JS amTextShort', 'acf'),
+ ),
+ 'pmNames' => array(
+ _x('PM', 'Date Time Picker JS pmText', 'acf'),
+ _x('P', 'Date Time Picker JS pmTextShort', 'acf'),
+ )
+ );
+
+
+ // do not delete!
+ parent::__construct();
+ }
+
+
+ /*
+ * input_admin_enqueue_scripts
+ *
+ * description
+ *
+ * @type function
+ * @date 16/12/2015
+ * @since 5.3.2
+ *
+ * @param $post_id (int)
+ * @return $post_id (int)
+ */
+
+ function input_admin_enqueue_scripts() {
+
+ // vars
+ $version = '1.6.1';
+
+
+ // script
+ wp_enqueue_script('acf-timepicker', acf_get_dir('assets/inc/timepicker/jquery-ui-timepicker-addon.min.js'), array('jquery-ui-datepicker'), $version);
+
+
+ // style
+ wp_enqueue_style('acf-timepicker', acf_get_dir('assets/inc/timepicker/jquery-ui-timepicker-addon.min.css'), '', $version);
+
+ }
+
+
+ /*
+ * _split_date_time
+ *
+ * This function will split a format string into seperate date and time
+ *
+ * @type function
+ * @date 26/05/2016
+ * @since 5.3.8
+ *
+ * @param $format (string)
+ * @return $formats (array)
+ */
+
+ function _split_date_time( $date_time = '' ) {
+
+ // vars
+ $time = array( 'a', 'A', 'h', 'g', 'H', 'G', 'i', 's' );
+ $chars = str_split($date_time);
+ $index = false;
+
+
+ // default
+ $data = array(
+ 'date' => $date_time,
+ 'time' => ''
+ );
+
+
+ // loop
+ foreach( $chars as $i => $c ) {
+
+ // i is set, break loop
+ if( in_array($c, $time) ) {
+
+ $index = $i;
+ break;
+
+ }
+
+ }
+
+
+ // if index found
+ if( $index !== false ) {
+
+ $data['date'] = trim(substr($date_time, 0, $i));
+ $data['time'] = trim(substr($date_time, $i));
+
+ }
+
+
+ // return
+ return $data;
+
+ }
+
+
+ /*
+ * render_field()
+ *
+ * Create the HTML interface for your field
+ *
+ * @param $field - an array holding all the field's data
+ *
+ * @type action
+ * @since 3.6
+ * @date 23/01/13
+ */
+
+ function render_field( $field ) {
+
+ // format value
+ $display_value = '';
+
+ if( $field['value'] ) {
+
+ $display_value = acf_format_date( $field['value'], $field['display_format'] );
+
+ }
+
+
+ // convert display_format to date and time
+ // the letter 'm' is used for date and minute in JS, so this must be done here in PHP
+ $formats = $this->_split_date_time($field['display_format']);
+
+
+ // vars
+ $e = '';
+ $div = array(
+ 'class' => 'acf-date-time-picker acf-input-wrap',
+ 'data-date_format' => acf_convert_date_to_js($formats['date']),
+ 'data-time_format' => acf_convert_time_to_js($formats['time']),
+ 'data-first_day' => $field['first_day'],
+ );
+ $hidden = array(
+ 'id' => $field['id'],
+ 'class' => 'input-alt',
+ 'type' => 'hidden',
+ 'name' => $field['name'],
+ 'value' => $field['value'],
+ );
+ $input = array(
+ 'class' => 'input',
+ 'type' => 'text',
+ 'value' => $display_value,
+ );
+
+
+ // html
+ $e .= '';
+ $e .= '';
+ $e .= '';
+ $e .= '
';
+
+
+ // return
+ echo $e;
+ }
+
+
+ /*
+ * render_field_settings()
+ *
+ * Create extra options for your field. This is rendered when editing a field.
+ * The value of $field['name'] can be used (like bellow) to save extra data to the $field
+ *
+ * @type action
+ * @since 3.6
+ * @date 23/01/13
+ *
+ * @param $field - an array holding all the field's data
+ */
+
+ function render_field_settings( $field ) {
+
+ // global
+ global $wp_locale;
+
+
+ // display_format
+ acf_render_field_setting( $field, array(
+ 'label' => __('Display Format','acf'),
+ 'instructions' => __('The format displayed when editing a post','acf'),
+ 'type' => 'radio',
+ 'name' => 'display_format',
+ 'other_choice' => 1,
+ 'choices' => array(
+ 'd/m/Y g:i a' => date('d/m/Y g:i a'),
+ 'm/d/Y g:i a' => date('m/d/Y g:i a'),
+ 'F j, Y g:i a' => date('F j, Y g:i a'),
+ 'Y-m-d H:i:s' => date('Y-m-d H:i:s'),
+ )
+ ));
+
+
+ // return_format
+ acf_render_field_setting( $field, array(
+ 'label' => __('Return Format','acf'),
+ 'instructions' => __('The format returned via template functions','acf'),
+ 'type' => 'radio',
+ 'name' => 'return_format',
+ 'other_choice' => 1,
+ 'choices' => array(
+ 'd/m/Y g:i a' => date('d/m/Y g:i a'),
+ 'm/d/Y g:i a' => date('m/d/Y g:i a'),
+ 'F j, Y g:i a' => date('F j, Y g:i a'),
+ 'Y-m-d H:i:s' => date('Y-m-d H:i:s'),
+ )
+ ));
+
+
+ // first_day
+ acf_render_field_setting( $field, array(
+ 'label' => __('Week Starts On','acf'),
+ 'instructions' => '',
+ 'type' => 'select',
+ 'name' => 'first_day',
+ 'choices' => array_values( $wp_locale->weekday )
+ ));
+
+ }
+
+
+ /*
+ * format_value()
+ *
+ * This filter is appied to the $value after it is loaded from the db and before it is returned to the template
+ *
+ * @type filter
+ * @since 3.6
+ * @date 23/01/13
+ *
+ * @param $value (mixed) the value which was loaded from the database
+ * @param $post_id (mixed) the $post_id from which the value was loaded
+ * @param $field (array) the field array holding all the field options
+ *
+ * @return $value (mixed) the modified value
+ */
+
+ function format_value( $value, $post_id, $field ) {
+
+ return acf_format_date( $value, $field['return_format'] );
+
+ }
+
+}
+
+new acf_field_date_and_time_picker();
+
+endif;
+
+?>
diff --git a/fields/page_link.php b/fields/page_link.php
index 51e246d..c30e9f9 100644
--- a/fields/page_link.php
+++ b/fields/page_link.php
@@ -92,11 +92,7 @@ class acf_field_page_link extends acf_field {
// load field
$field = acf_get_field( $options['field_key'] );
- if( !$field ) {
-
- return false;
-
- }
+ if( !$field ) return false;
// update $args
@@ -148,6 +144,10 @@ class acf_field_page_link extends acf_field {
$args = apply_filters('acf/fields/page_link/query/key=' . $field['key'], $args, $field, $options['post_id'] );
+ // is search
+ $is_search = !empty( $args['s'] );
+
+
// add archives to $r
if( $args['paged'] == 1 ) {
@@ -174,7 +174,7 @@ class acf_field_page_link extends acf_field {
// search
- if( !empty($args['s']) ) {
+ if( $is_search ) {
foreach( array_keys($archives) as $i ) {
@@ -231,7 +231,7 @@ class acf_field_page_link extends acf_field {
// order by search
- if( !empty($args['s']) ) {
+ if( $is_search ) {
$posts = acf_order_by_search( $posts, $args['s'] );
@@ -320,14 +320,14 @@ class acf_field_page_link extends acf_field {
* @return (string)
*/
- function get_post_title( $post, $field, $post_id = 0 ) {
+ function get_post_title( $post, $field, $post_id = 0, $is_search = 0 ) {
// get post_id
if( !$post_id ) $post_id = acf_get_form_data('post_id');
// vars
- $title = acf_get_post_title( $post );
+ $title = acf_get_post_title( $post, $is_search );
// filters
diff --git a/fields/post_object.php b/fields/post_object.php
index b244e97..2ed0eb3 100644
--- a/fields/post_object.php
+++ b/fields/post_object.php
@@ -149,64 +149,70 @@ class acf_field_post_object extends acf_field {
$args = apply_filters('acf/fields/post_object/query/key=' . $field['key'], $args, $field, $options['post_id'] );
+ // is search
+ $is_search = !empty( $args['s'] );
+
+
// get posts grouped by post type
$groups = acf_get_grouped_posts( $args );
- if( !empty($groups) ) {
+
+ // bail early if no posts
+ if( empty($groups) ) return false;
+
+
+ // loop
+ foreach( array_keys($groups) as $group_title ) {
- foreach( array_keys($groups) as $group_title ) {
+ // vars
+ $posts = acf_extract_var( $groups, $group_title );
+ $titles = array();
+
+
+ // data
+ $data = array(
+ 'text' => $group_title,
+ 'children' => array()
+ );
+
+
+ foreach( array_keys($posts) as $post_id ) {
- // vars
- $posts = acf_extract_var( $groups, $group_title );
- $titles = array();
+ // override data
+ $posts[ $post_id ] = $this->get_post_title( $posts[ $post_id ], $field, $options['post_id'] );
+ };
+
+
+ // order by search
+ if( $is_search ) {
- // data
- $data = array(
- 'text' => $group_title,
- 'children' => array()
+ $posts = acf_order_by_search( $posts, $args['s'] );
+
+ }
+
+
+ // append to $data
+ foreach( array_keys($posts) as $post_id ) {
+
+ $data['children'][] = array(
+ 'id' => $post_id,
+ 'text' => $posts[ $post_id ]
);
-
- foreach( array_keys($posts) as $post_id ) {
-
- // override data
- $posts[ $post_id ] = $this->get_post_title( $posts[ $post_id ], $field, $options['post_id'] );
-
- };
-
-
- // order by search
- if( !empty($args['s']) ) {
-
- $posts = acf_order_by_search( $posts, $args['s'] );
-
- }
-
-
- // append to $data
- foreach( array_keys($posts) as $post_id ) {
-
- $data['children'][] = array(
- 'id' => $post_id,
- 'text' => $posts[ $post_id ]
- );
-
- }
-
-
- // append to $r
- $r[] = $data;
-
}
- // optgroup or single
- if( count($args['post_type']) == 1 ) {
-
- $r = $r[0]['children'];
-
- }
+ // append to $r
+ $r[] = $data;
+
+ }
+
+
+ // optgroup or single
+ if( count($args['post_type']) == 1 ) {
+
+ $r = $r[0]['children'];
}
@@ -274,14 +280,14 @@ class acf_field_post_object extends acf_field {
* @return (string)
*/
- function get_post_title( $post, $field, $post_id = 0 ) {
+ function get_post_title( $post, $field, $post_id = 0, $is_search = 0 ) {
// get post_id
if( !$post_id ) $post_id = acf_get_form_data('post_id');
// vars
- $title = acf_get_post_title( $post );
+ $title = acf_get_post_title( $post, $is_search );
// filters
diff --git a/fields/relationship.php b/fields/relationship.php
index 6aa00dd..d8a273e 100644
--- a/fields/relationship.php
+++ b/fields/relationship.php
@@ -103,11 +103,7 @@ class acf_field_relationship extends acf_field {
// load field
$field = acf_get_field( $options['field_key'] );
- if( !$field ) {
-
- return false;
-
- }
+ if( !$field ) return false;
// update $args
@@ -180,68 +176,76 @@ class acf_field_relationship extends acf_field {
$args = apply_filters('acf/fields/relationship/query/key=' . $field['key'], $args, $field, $options['post_id'] );
+ // is search
+ $is_search = !empty( $args['s'] );
+
+
// get posts grouped by post type
$groups = acf_get_grouped_posts( $args );
- if( !empty($groups) ) {
+
+ // bail early if no posts
+ if( empty($groups) ) return false;
+
+
+ // loop
+ foreach( array_keys($groups) as $group_title ) {
- foreach( array_keys($groups) as $group_title ) {
+ // vars
+ $posts = acf_extract_var( $groups, $group_title );
+ $titles = array();
+
+
+ // data
+ $data = array(
+ 'text' => $group_title,
+ 'children' => array()
+ );
+
+
+ foreach( array_keys($posts) as $post_id ) {
- // vars
- $posts = acf_extract_var( $groups, $group_title );
- $titles = array();
+ // override data
+ $posts[ $post_id ] = $this->get_post_title( $posts[ $post_id ], $field, $options['post_id'] );
+ };
+
+
+ // order by search
+ if( $is_search ) {
- // data
- $data = array(
- 'text' => $group_title,
- 'children' => array()
+ $posts = acf_order_by_search( $posts, $args['s'] );
+
+ }
+
+
+ // append to $data
+ foreach( array_keys($posts) as $post_id ) {
+
+ $data['children'][] = array(
+ 'id' => $post_id,
+ 'text' => $posts[ $post_id ]
);
-
- foreach( array_keys($posts) as $post_id ) {
-
- // override data
- $posts[ $post_id ] = $this->get_post_title( $posts[ $post_id ], $field, $options['post_id'] );
-
- };
-
-
- // order by search
- if( !empty($args['s']) ) {
-
- $posts = acf_order_by_search( $posts, $args['s'] );
-
- }
-
-
- // append to $data
- foreach( array_keys($posts) as $post_id ) {
-
- $data['children'][] = array(
- 'id' => $post_id,
- 'text' => $posts[ $post_id ]
- );
-
- }
-
-
- // append to $r
- $r[] = $data;
-
}
- // add as optgroup or results
- if( count($args['post_type']) == 1 ) {
-
- $r = $r[0]['children'];
-
- }
+ // append to $r
+ $r[] = $data;
}
+ // add as optgroup or results
+ if( count($args['post_type']) == 1 ) {
+
+ $r = $r[0]['children'];
+
+ }
+
+
+
+
// return
return $r;
@@ -305,44 +309,35 @@ class acf_field_relationship extends acf_field {
* @return (string)
*/
- function get_post_title( $post, $field, $post_id = 0 ) {
+ function get_post_title( $post, $field, $post_id = 0, $is_search = 0 ) {
// get post_id
- if( !$post_id ) {
-
- $post_id = acf_get_setting('form_data/post_id', get_the_ID());
-
- }
+ if( !$post_id ) $post_id = acf_get_form_data('post_id');
// vars
- $title = acf_get_post_title( $post );
+ $title = acf_get_post_title( $post, $is_search );
- // elements
- if( !empty($field['elements']) ) {
+ // featured_image
+ if( acf_in_array('featured_image', $field['elements']) ) {
- // featured_image
- if( in_array('featured_image', $field['elements']) ) {
+ // vars
+ $class = 'thumbnail';
+ $thumbnail = acf_get_post_thumbnail($post->ID, array(17, 17));
+
+
+ // icon
+ if( $thumbnail['type'] == 'icon' ) {
- // vars
- $class = 'thumbnail';
- $thumbnail = acf_get_post_thumbnail($post->ID, array(17, 17));
-
-
- // icon
- if( $thumbnail['type'] == 'icon' ) {
-
- $class .= ' -' . $thumbnail['type'];
-
- }
-
-
- // append
- $title = '' . $thumbnail['html'] . '
' . $title;
+ $class .= ' -' . $thumbnail['type'];
}
+
+ // append
+ $title = '' . $thumbnail['html'] . '
' . $title;
+
}
diff --git a/fields/select.php b/fields/select.php
index 1774339..d53a337 100644
--- a/fields/select.php
+++ b/fields/select.php
@@ -46,6 +46,20 @@ class acf_field_select extends acf_field {
'disabled' => 0,
'readonly' => 0,
);
+ $this->l10n = array(
+ 'matches_1' => _x('One result is available, press enter to select it.', 'Select2 JS matches_1', 'acf'),
+ 'matches_n' => _x('%d results are available, use up and down arrow keys to navigate.', 'Select2 JS matches_n', 'acf'),
+ 'matches_0' => _x('No matches found', 'Select2 JS matches_0', 'acf'),
+ 'input_too_short_1' => _x('Please enter 1 or more characters', 'Select2 JS input_too_short_1', 'acf' ),
+ 'input_too_short_n' => _x('Please enter %d or more characters', 'Select2 JS input_too_short_n', 'acf' ),
+ 'input_too_long_1' => _x('Please delete 1 character', 'Select2 JS input_too_long_1', 'acf' ),
+ 'input_too_long_n' => _x('Please delete %d characters', 'Select2 JS input_too_long_n', 'acf' ),
+ 'selection_too_long_1' => _x('You can only select 1 item', 'Select2 JS selection_too_long_1', 'acf' ),
+ 'selection_too_long_n' => _x('You can only select %d items', 'Select2 JS selection_too_long_n', 'acf' ),
+ 'load_more' => _x('Loading more results…', 'Select2 JS load_more', 'acf' ),
+ 'searching' => _x('Searching…', 'Select2 JS searching', 'acf' ),
+ 'load_fail' => _x('Loading failed', 'Select2 JS load_fail', 'acf' ),
+ );
// ajax
@@ -57,7 +71,46 @@ class acf_field_select extends acf_field {
parent::__construct();
}
+
+
+ /*
+ * input_admin_enqueue_scripts
+ *
+ * description
+ *
+ * @type function
+ * @date 16/12/2015
+ * @since 5.3.2
+ *
+ * @param $post_id (int)
+ * @return $post_id (int)
+ */
+
+ function input_admin_enqueue_scripts() {
+
+ // globals
+ global $wp_scripts, $wp_styles;
+
+
+ // vars
+ $version = '3.5.2';
+ $min = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
+
+
+ // script
+ wp_enqueue_script('select2', acf_get_dir("assets/inc/select2/select2{$min}.js"), array('jquery'), $version );
+
+
+ // style
+ wp_enqueue_style('select2', acf_get_dir('assets/inc/select2/select2.css'), '', $version );
+
+ // v4
+ //wp_enqueue_script('select2', acf_get_dir("assets/inc/select2/dist/js/select2.full.js"), array('jquery'), '4.0', true );
+ //wp_enqueue_style('select2', acf_get_dir("assets/inc/select2/dist/css/select2{$min}.css"), '', '4.0' );
+
+ }
+
/*
* query_posts
@@ -217,6 +270,14 @@ class acf_field_select extends acf_field {
}
+ // custom ajax action
+ if( !empty($field['ajax_action']) ) {
+
+ $atts['data-ajax_action'] = $field['ajax_action'];
+
+ }
+
+
// hidden input
if( $field['ui'] ) {
@@ -542,112 +603,6 @@ class acf_field_select extends acf_field {
}
-
- /*
- * enqueue_assets
- *
- * This function will enqueue the Select2 JS library
- * moved to the footer in an attempt to allow 3rd party to register Select2 paths
- *
- * @type function
- * @date 16/12/2015
- * @since 5.3.3
- *
- * @param n/a
- * @return n/a
- */
-
- function input_admin_enqueue_scripts() {
-
- $this->enqueue_assets();
-
- }
-
-
- function field_group_admin_enqueue_scripts() {
-
- $this->enqueue_assets();
-
- }
-
- function enqueue_assets() {
-
- // globals
- global $wp_scripts, $wp_styles;
-
-
- // vars
- $version = '3.5.2';
- $lang = get_locale();
- $min = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
- //$lang = 'fr';
-
-
- // v4
-/*
- wp_enqueue_script('select2', acf_get_dir("assets/inc/select2/dist/js/select2.full.js"), array('jquery'), '4.0', true );
- wp_enqueue_style('select2', acf_get_dir("assets/inc/select2/dist/css/select2{$min}.css"), '', '4.0' );
- return;
-*/
-
-
- // register script
- if( !isset($wp_scripts->registered['select2']) ) {
-
- // scripts
- wp_register_script('select2', acf_get_dir("assets/inc/select2/select2{$min}.js"), array('jquery'), $version );
-
-
- // translation
- if( $lang ) {
-
- // vars
- $lang = str_replace('_', '-', $lang);
- $lang_code = substr($lang, 0, 2);
- $lang_src = '';
-
-
- // attempt 1
- if( file_exists(acf_get_path("assets/inc/select2/select2_locale_{$lang_code}.js")) ) {
-
- $lang_src = acf_get_dir("assets/inc/select2/select2_locale_{$lang_code}.js");
-
- // attempt 2
- } elseif( file_exists(acf_get_path("assets/inc/select2/select2_locale_{$lang}.js")) ) {
-
- $lang_src = acf_get_dir("assets/inc/select2/select2_locale_{$lang}.js");
-
- }
-
-
- // enqueue
- if( $lang_src ) {
-
- wp_enqueue_script('select2-l10n', $lang_src, array('select2'), $version );
-
- }
-
- }
- // end translation
-
- }
-
-
- // register style
- if( !isset($wp_styles->registered['select2']) ) {
-
- wp_register_style('select2', acf_get_dir('assets/inc/select2/select2.css'), '', $version );
-
- }
-
-
- // enqueue
- wp_enqueue_script('select2');
- wp_enqueue_style('select2');
-
-
- }
-
}
new acf_field_select();
diff --git a/fields/taxonomy.php b/fields/taxonomy.php
index 9389fa4..f4e079c 100644
--- a/fields/taxonomy.php
+++ b/fields/taxonomy.php
@@ -48,12 +48,17 @@ class acf_field_taxonomy extends acf_field {
);
- // extra
+ // ajax
add_action('wp_ajax_acf/fields/taxonomy/query', array($this, 'ajax_query'));
add_action('wp_ajax_nopriv_acf/fields/taxonomy/query', array($this, 'ajax_query'));
add_action('wp_ajax_acf/fields/taxonomy/add_term', array($this, 'ajax_add_term'));
+ // custom set_terms
+ $this->save_post_terms = array();
+ add_action('acf/save_post', array($this, 'save_post'), 15, 1);
+
+
// do not delete!
parent::__construct();
@@ -416,7 +421,7 @@ class acf_field_taxonomy extends acf_field {
$term_ids = array_map('intval', $term_ids);
- // bypass $this->set_terms if called directly from update_field
+ // if called directly from frontend update_field()
if( !did_action('acf/save_post') ) {
wp_set_object_terms( $post_id, $term_ids, $taxonomy, false );
@@ -426,27 +431,12 @@ class acf_field_taxonomy extends acf_field {
}
- // initialize
- if( empty($this->set_terms) ) {
-
- // create holder
- $this->set_terms = array();
-
-
- // add action
- add_action('acf/save_post', array($this, 'set_terms'), 15, 1);
-
- }
+ // get existing term id's (from a previously saved field)
+ $old_term_ids = isset($this->save_post_terms[ $taxonomy ]) ? $this->save_post_terms[ $taxonomy ] : array();
// append
- if( empty($this->set_terms[ $taxonomy ]) ) {
-
- $this->set_terms[ $taxonomy ] = array();
-
- }
-
- $this->set_terms[ $taxonomy ] = array_merge($this->set_terms[ $taxonomy ], $term_ids);
+ $this->save_post_terms[ $taxonomy ] = array_merge($old_term_ids, $term_ids);
}
@@ -458,38 +448,36 @@ class acf_field_taxonomy extends acf_field {
/*
- * set_terms
+ * save_post
*
- * description
+ * This function will save any terms in the save_post_terms array
*
* @type function
* @date 26/11/2014
* @since 5.0.9
*
* @param $post_id (int)
- * @return $post_id (int)
+ * @return n/a
*/
- function set_terms( $post_id ) {
+ function save_post( $post_id ) {
// bail ealry if no terms
- if( empty($this->set_terms) ) {
-
- return;
-
- }
+ if( empty($this->save_post_terms) ) return;
+
// loop over terms
- foreach( $this->set_terms as $taxonomy => $term_ids ){
+ foreach( $this->save_post_terms as $taxonomy => $term_ids ){
wp_set_object_terms( $post_id, $term_ids, $taxonomy, false );
+
}
// reset array ( WP saves twice )
- $this->set_terms = array();
+ $this->save_post_terms = array();
}
diff --git a/fields/time_picker.php b/fields/time_picker.php
new file mode 100644
index 0000000..4f6b833
--- /dev/null
+++ b/fields/time_picker.php
@@ -0,0 +1,182 @@
+name = 'time_picker';
+ $this->label = __("Time Picker",'acf');
+ $this->category = 'jquery';
+ $this->defaults = array(
+ 'display_format' => 'g:i a',
+ 'return_format' => 'g:i a'
+ );
+
+
+ // do not delete!
+ parent::__construct();
+ }
+
+
+ /*
+ * render_field()
+ *
+ * Create the HTML interface for your field
+ *
+ * @param $field - an array holding all the field's data
+ *
+ * @type action
+ * @since 3.6
+ * @date 23/01/13
+ */
+
+ function render_field( $field ) {
+
+ // format value
+ $display_value = '';
+
+ if( $field['value'] ) {
+
+ $display_value = acf_format_date( $field['value'], $field['display_format'] );
+
+ }
+
+
+ // vars
+ $e = '';
+ $div = array(
+ 'class' => 'acf-time-picker acf-input-wrap',
+ 'data-time_format' => acf_convert_time_to_js($field['display_format'])
+ );
+ $hidden = array(
+ 'id' => $field['id'],
+ 'class' => 'input-alt',
+ 'type' => 'hidden',
+ 'name' => $field['name'],
+ 'value' => $field['value'],
+ );
+ $input = array(
+ 'class' => 'input',
+ 'type' => 'text',
+ 'value' => $display_value,
+ );
+
+
+ // html
+ $e .= '';
+ $e .= '';
+ $e .= '';
+ $e .= '
';
+
+
+ // return
+ echo $e;
+ }
+
+
+ /*
+ * render_field_settings()
+ *
+ * Create extra options for your field. This is rendered when editing a field.
+ * The value of $field['name'] can be used (like bellow) to save extra data to the $field
+ *
+ * @type action
+ * @since 3.6
+ * @date 23/01/13
+ *
+ * @param $field - an array holding all the field's data
+ */
+
+ function render_field_settings( $field ) {
+
+ // global
+ global $wp_locale;
+
+
+ // display_format
+ acf_render_field_setting( $field, array(
+ 'label' => __('Display Format','acf'),
+ 'instructions' => __('The format displayed when editing a post','acf'),
+ 'type' => 'radio',
+ 'name' => 'display_format',
+ 'other_choice' => 1,
+ 'choices' => array(
+ 'g:i a' => date('g:i a'),
+ 'H:i:s' => date('H:i:s'),
+ )
+ ));
+
+
+ // return_format
+ acf_render_field_setting( $field, array(
+ 'label' => __('Return Format','acf'),
+ 'instructions' => __('The format returned via template functions','acf'),
+ 'type' => 'radio',
+ 'name' => 'return_format',
+ 'other_choice' => 1,
+ 'choices' => array(
+ 'g:i a' => date('g:i a'),
+ 'H:i:s' => date('H:i:s'),
+ )
+ ));
+
+ }
+
+
+ /*
+ * format_value()
+ *
+ * This filter is appied to the $value after it is loaded from the db and before it is returned to the template
+ *
+ * @type filter
+ * @since 3.6
+ * @date 23/01/13
+ *
+ * @param $value (mixed) the value which was loaded from the database
+ * @param $post_id (mixed) the $post_id from which the value was loaded
+ * @param $field (array) the field array holding all the field options
+ *
+ * @return $value (mixed) the modified value
+ */
+
+ function format_value( $value, $post_id, $field ) {
+
+ return acf_format_date( $value, $field['return_format'] );
+
+ }
+
+}
+
+new acf_field_time_picker();
+
+endif;
+
+?>
diff --git a/forms/post.php b/forms/post.php
index 5c320af..9265fba 100644
--- a/forms/post.php
+++ b/forms/post.php
@@ -225,6 +225,7 @@ class acf_form_post {
// remove ACF from meta postbox
add_filter('is_protected_meta', array($this, 'is_protected_meta'), 10, 3);
+
}
@@ -381,16 +382,11 @@ if( typeof acf !== 'undefined' ) {
// vars
$json = array();
- $nonce = acf_extract_var( $options, 'nonce' );
$exists = acf_extract_var( $options, 'exists' );
// verify nonce
- if( !wp_verify_nonce($nonce, 'acf_nonce') ) {
-
- die;
-
- }
+ if( !acf_verify_ajax() ) die();
// get field groups
diff --git a/lang/acf-ar.mo b/lang/acf-ar.mo
new file mode 100644
index 0000000..b1abaf2
Binary files /dev/null and b/lang/acf-ar.mo differ
diff --git a/lang/acf-ar.po b/lang/acf-ar.po
new file mode 100644
index 0000000..0b3034e
--- /dev/null
+++ b/lang/acf-ar.po
@@ -0,0 +1,2600 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Advanced Custom Fields Pro\n"
+"POT-Creation-Date: 2016-05-19 15:59+0200\n"
+"PO-Revision-Date: 2016-05-24 12:56+0200\n"
+"Last-Translator: \n"
+"Language-Team: Adil el hallaoui do menor para o maior valor" - -# @ acf -#, fuzzy -#~ msgid "flexible_content" -#~ msgstr "Conteúdo Flexível" - -# @ acf -#, fuzzy -#~ msgid "gallery" -#~ msgstr "Galeria" - -# @ acf -#, fuzzy -#~ msgid "image" -#~ msgstr "Imagem" - -# @ acf -#, fuzzy -#~ msgid "repeater" -#~ msgstr "Repetidor" - -# @ acf -#~ msgid "Hide / Show All" -#~ msgstr "Ocultar / Mostrar todos" - -# @ acf -#~ msgid "Pending Review" -#~ msgstr "Revisão Pendente" - -# @ acf -#~ msgid "Draft" -#~ msgstr "Rascunho" - -# @ acf -#~ msgid "Future" -#~ msgstr "Futuro" - -# @ acf -#~ msgid "Private" -#~ msgstr "Privado" - -# @ acf -#~ msgid "Revision" -#~ msgstr "Revisão" - -# @ acf -#~ msgid "Trash" -#~ msgstr "Lixeira" - -# @ acf -#~ msgid "Import / Export" -#~ msgstr "Importar / Exportar" - -# @ acf -#~ msgid "ACF PRO Required" -#~ msgstr "É necessário o ACF PRO" - -# @ acf -#~ msgid "" -#~ "We have detected an issue which requires your attention: This website " -#~ "makes use of premium add-ons (%s) which are no longer compatible with ACF." -#~ msgstr "" -#~ "Detectamos um problema que requer sua atenção: Este website usa Add-ons " -#~ "Premium (%s) que não são mais compatíveis com o ACF." - -# @ acf -#~ msgid "" -#~ "Don't panic, you can simply roll back the plugin and continue using ACF " -#~ "as you know it!" -#~ msgstr "" -#~ "Não se preocupe, você pode voltar para a versão anterior e continuar " -#~ "usando o ACF que estava acostumado!" - -# @ acf -#~ msgid "Roll back to ACF v%s" -#~ msgstr "Voltar para a versão v%s do ACF" - -# @ acf -#~ msgid "Learn why ACF PRO is required for my site" -#~ msgstr "Saiba por que é necessário utilizar o ACF PRO em meu site" - -# @ acf -#~ msgid "Update Database" -#~ msgstr "Atualizar Banco de Dados" - -# @ acf -#~ msgid "Data Upgrade" -#~ msgstr "Atualização de Dados" - -# @ acf -#~ msgid "Data upgraded successfully." -#~ msgstr "Dados atualizados com sucesso." - -# @ acf -#~ msgid "Data is at the latest version." -#~ msgstr "Os dados estão na versão mais recente." - -# @ acf -#~ msgid "1 required field below is empty" -#~ msgid_plural "%s required fields below are empty" -#~ msgstr[0] "1 campo obrigatório abaixo está vazio" -#~ msgstr[1] "%s campos obrigatórios abaixo estão vazios" - -# @ acf -#~ msgid "Load & Save Terms to Post" -#~ msgstr "Carregar & Salvar Termos do Post" - -# @ acf -#~ msgid "" -#~ "Load value based on the post's terms and update the post's terms on save" -#~ msgstr "" -#~ "Carregar opções com base nos termos do post, e atualizá-los ao salvar." - -# @ acf -#, fuzzy -#~ msgid "expand_details" -#~ msgstr "Expandir Detalhes" - -# @ acf -#, fuzzy -#~ msgid "collapse_details" -#~ msgstr "Recolher Detalhes" - -# @ acf -#, fuzzy -#~ msgid "relationship" -#~ msgstr "Relação" - -# @ acf -#, fuzzy -#~ msgid "title_is_required" -#~ msgstr "O título do grupo de campos é obrigatório" - -# @ acf -#, fuzzy -#~ msgid "move_field" -#~ msgstr "Mover Campo" - -# @ acf -#, fuzzy -#~ msgid "Controls how HTML tags are rendered" -#~ msgstr "Controla como as novas linhas são renderizadas" - -# @ acf -#~ msgid "Attachment Details" -#~ msgstr "Detalhes do Anexo" - -# @ acf -#~ msgid "Validation Failed. One or more fields below are required." -#~ msgstr "Falha na Validação. Um ou mais campos abaixo são obrigatórios." - -# @ acf -#~ msgid "Field group duplicated! Edit the new \"%s\" field group." -#~ msgstr "Grupo de campos duplicado! Edite o nome grupo de campos \"%s\"." - -# @ acf -#~ msgid "Import/Export" -#~ msgstr "Importar/Exportar" - -# @ acf -#~ msgid "" -#~ "The following code can be used to register a local version of the " -#~ "selected field group(s). A local field group can provide many benefits " -#~ "such as faster load times, version control & dynamic fields/settings. " -#~ "Simply copy and paste the following code to your theme's functions.php " -#~ "file" -#~ msgstr "" -#~ "O código abaixo pode ser utilizado para registrar uma versão local do(s) " -#~ "grupo(s) de campos selecionado(s). Um grupo de campos local pode oferecer " -#~ "diversos benefícios, como carregar mais rapidamente, permitir o controle " -#~ "de versão, além de possibilitar ainda mais dinamismo nos campos e " -#~ "definições. Basta copiar e colar o seguinte código no arquivo functions." -#~ "php do seu tema." - -# @ acf -#~ msgid "form_attributes" -#~ msgstr "form_attributes" - -# @ acf -#~ msgid "classlayout" -#~ msgstr "classlayout" - -# @ acf -#~ msgid "Column Width" -#~ msgstr "Largura da Coluna" - -# @ acf -#~ msgid "" -#~ "Fully customise WordPress edit screens with powerful fields. Boasting a " -#~ "professional interface and a powerful API, it’s a must have for any web " -#~ "developer working with WordPress. Field types include: Wysiwyg, text, " -#~ "textarea, image, file, select, checkbox, page link, post object, date " -#~ "picker, color picker, repeater, flexible content, gallery and more!" -#~ msgstr "" -#~ "Personaliza totalmente as telas de edição do WordPress com incríveis " -#~ "campos personalizados. Fazendo uso de uma interface profissional e uma " -#~ "poderosa API, é um plugin essencial para qualquer desenvolvedor que " -#~ "trabalha com WordPress. Dentre os tipos de campos personalizados, estão " -#~ "incluidos: editor Wysiwyg, texto simples, área de texto, imagem, arquivo, " -#~ "menu de seleção, checkbox, link de página, objeto do post, seletor de " -#~ "data, seletor de cor, repetidor, conteúdo flexível, galeria dentro outros!" - -# @ acf -#~ msgid "Custom field updated." -#~ msgstr "Campo atualizado." - -# @ acf -#~ msgid "Custom field deleted." -#~ msgstr "Campo excluído." diff --git a/lang/acf-pt_PT.mo b/lang/acf-pt_PT.mo index ce78f26..3e44dab 100644 Binary files a/lang/acf-pt_PT.mo and b/lang/acf-pt_PT.mo differ diff --git a/lang/acf-pt_PT.po b/lang/acf-pt_PT.po index 3409358..8ff688b 100644 --- a/lang/acf-pt_PT.po +++ b/lang/acf-pt_PT.po @@ -2,10 +2,10 @@ # This file is distributed under the same license as the package. msgid "" msgstr "" -"Project-Id-Version: Advanced Custom Fields PRO 5.3.7\n" +"Project-Id-Version: Advanced Custom Fields PRO 5.4.0\n" "Report-Msgid-Bugs-To: http://support.advancedcustomfields.com\n" -"POT-Creation-Date: 2016-05-03 14:12+0100\n" -"PO-Revision-Date: 2016-05-03 14:48+0100\n" +"POT-Creation-Date: 2016-06-18 14:59+0100\n" +"PO-Revision-Date: 2016-06-18 14:59+0100\n" "Last-Translator: Pedro Mendonça
', $info['changelog']); + $this->view['changelog'] = acf_maybe_get($info, 'changelog'); + $this->view['upgrade_notice'] = acf_maybe_get($info, 'upgrade_notice'); - foreach( $changelogs as $changelog ) - { - // validate (first segment is always empty due to explode) - if( empty($changelog) ) - { - continue; - } - - - // explode - $changelog = explode('
', $changelog); - $changelog_version = trim($changelog[0]); - $changelog_text = trim($changelog[1]); - $changelog_text = str_replace('- ', '
- ', $changelog_text);
-
- if( version_compare($this->view['remote_version'], $changelog_version, '==') )
- {
- $this->view['changelog'] = $changelog_text;
- break;
- }
-
- }
-
-
- // upgrade_notice
- $upgrade_notices = explode('
', $info['upgrade_notice']); - - foreach( $upgrade_notices as $upgrade_notice ) - { - // validate (first segment is always empty due to explode) - if( empty($upgrade_notice) ) - { - continue; - } - - - // explode - $upgrade_notice = explode('
', $upgrade_notice); - $upgrade_version = trim($upgrade_notice[0]); - $upgrade_text = trim($upgrade_notice[1]); - $upgrade_text = str_replace('- ', '
- ', $upgrade_text);
-
- if( version_compare($this->view['current_version'], $upgrade_version, '<') )
- {
- $this->view['upgrade_notice'] = $upgrade_text;
- break;
- }
-
- }
}
-
}
diff --git a/pro/admin/views/settings-updates.php b/pro/admin/views/settings-updates.php
index 41e6011..90ecab3 100644
--- a/pro/admin/views/settings-updates.php
+++ b/pro/admin/views/settings-updates.php
@@ -16,7 +16,7 @@ $readonly = $active ? 1 : 0;
-
+
@@ -60,7 +60,7 @@ $readonly = $active ? 1 : 0;
-
+
@@ -139,4 +139,8 @@ $readonly = $active ? 1 : 0;
#acf_pro_licence {
width: 75%;
}
+
+ #acf-update-information td h4 {
+ display: none;
+ }
diff --git a/pro/api/api-pro.php b/pro/api/api-pro.php
index e1ad128..985b205 100644
--- a/pro/api/api-pro.php
+++ b/pro/api/api-pro.php
@@ -114,16 +114,12 @@ function acf_pro_get_remote_response( $action = '', $post = array() ) {
function acf_pro_is_update_available() {
// vars
- $info = acf_pro_get_remote_info();
+ $info = acf_get_remote_plugin_info();
$version = acf_get_setting('version');
// return false if no info
- if( empty($info['version']) ) {
-
- return false;
-
- }
+ if( empty($info['version']) ) return false;
// return false if the external version is '<=' the current version
diff --git a/pro/assets/css/acf-pro-input.css b/pro/assets/css/acf-pro-input.css
index ea2bb6f..e1f5de3 100644
--- a/pro/assets/css/acf-pro-input.css
+++ b/pro/assets/css/acf-pro-input.css
@@ -3,68 +3,89 @@
* Repeater
*
*---------------------------------------------------------------------------------------------*/
-.acf-repeater .acf-row.acf-clone {
- display: none !important;
+.acf-repeater {
+ /* table */
+ /* row handle (add/remove) */
+ /* add in spacer to th (force correct width) */
+ /* row */
+ /* sortable */
+ /* layouts */
+ /*
+ &.-row > table > tbody > tr:before,
+ &.-block > table > tbody > tr:before {
+ content: "";
+ display: table-row;
+ height: 2px;
+ background: #f00;
+ }
+*/
+ /* empty */
+ /* collapsed */
+ /* collapsed (block layout) */
+ /* collapsed (table layout) */
}
.acf-repeater > table {
margin: 0 0 8px;
background: #F9F9F9;
}
-/* handle */
-.acf-row-handle {
+.acf-repeater .acf-row-handle {
width: 16px;
text-align: center !important;
vertical-align: middle !important;
position: relative;
+ /* icons */
+ /* .order */
+ /* remove */
}
-th.acf-row-handle span {
- width: 16px;
- display: block;
- height: 1px;
-}
-/* handle icons */
-.acf-row-handle .acf-icon {
- display: block;
+.acf-repeater .acf-row-handle .acf-icon {
+ display: none;
position: absolute;
- -webkit-transition: opacity 0.25s 0s ease-in-out, visibility 0s linear 0.25s;
- -moz-transition: opacity 0.25s 0s ease-in-out, visibility 0s linear 0.25s;
- -o-transition: opacity 0.25s 0s ease-in-out, visibility 0s linear 0.25s;
- transition: opacity 0.25s 0s ease-in-out, visibility 0s linear 0.25s;
- visibility: hidden;
- opacity: 0;
top: 0;
margin: -8px 0 0 -2px;
+ /* minus icon */
}
-.acf-row-handle .acf-icon.-minus {
+.acf-repeater .acf-row-handle .acf-icon.-minus {
top: 50%;
+ /* ie fix */
}
-.acf-row:hover > .acf-row-handle .acf-icon {
- -webkit-transition-delay: 0s;
- -moz-transition-delay: 0s;
- -o-transition-delay: 0s;
- transition-delay: 0s;
- visibility: visible;
- opacity: 1;
+body.browser-msie .acf-repeater .acf-row-handle .acf-icon.-minus {
+ top: 25px;
}
-/* order */
-.acf-row-handle.order {
+.acf-repeater .acf-row-handle.order {
background: #f4f4f4;
cursor: move;
color: #aaa;
text-shadow: #fff 0 1px 0;
}
-.acf-row-handle.order:hover {
+.acf-repeater .acf-row-handle.order:hover {
color: #666;
}
-.acf-row-handle.order + td {
+.acf-repeater .acf-row-handle.order + td {
border-left-color: #DFDFDF;
}
-/* remove */
-.acf-row-handle.remove {
+.acf-repeater .acf-row-handle.remove {
background: #F9F9F9;
border-left-color: #DFDFDF;
}
-/* sortable */
+.acf-repeater th.acf-row-handle:before {
+ content: "";
+ width: 16px;
+ display: block;
+ height: 1px;
+}
+.acf-repeater .acf-row {
+ /* hide clone */
+ /* hover */
+}
+.acf-repeater .acf-row.acf-clone {
+ display: none !important;
+}
+.acf-repeater .acf-row:hover {
+ /* icons */
+}
+.acf-repeater .acf-row:hover > .acf-row-handle .acf-icon {
+ display: block;
+}
.acf-repeater > table > tbody > tr.ui-sortable-helper {
box-shadow: 0 1px 5px rgba(0, 0, 0, 0.2);
}
@@ -74,12 +95,10 @@ th.acf-row-handle span {
.acf-repeater > table > tbody > tr.ui-sortable-placeholder td {
background: #F9F9F9;
}
-/* layouts */
.acf-repeater.-row > table > tbody > tr > td,
.acf-repeater.-block > table > tbody > tr > td {
border-top-color: #E1E1E1;
}
-/* empty */
.acf-repeater.-empty > table {
border-bottom: 0 none;
}
@@ -87,21 +106,18 @@ th.acf-row-handle span {
.acf-repeater.-empty.-block > table {
display: none;
}
-/* collapsed */
.acf-repeater .acf-row.-collapsed > .acf-field {
display: none !important;
}
.acf-repeater .acf-row.-collapsed > td.acf-field.-collapsed-target {
display: table-cell !important;
}
-/* collapsed (block layout) */
.acf-repeater .acf-row.-collapsed > .acf-fields > * {
display: none !important;
}
.acf-repeater .acf-row.-collapsed > .acf-fields > .acf-field.-collapsed-target {
display: block !important;
}
-/* collapsed (table layout) */
.acf-repeater.-table .acf-row.-collapsed .acf-field.-collapsed-target {
border-left-color: #dfdfdf;
}
diff --git a/pro/assets/js/acf-pro-input.js b/pro/assets/js/acf-pro-input.js
index b14e965..c530b47 100644
--- a/pro/assets/js/acf-pro-input.js
+++ b/pro/assets/js/acf-pro-input.js
@@ -489,6 +489,10 @@
var $tr = e.$el.closest('.acf-row');
+ // reference
+ var $field = this.$field;
+
+
// open row
if( $tr.hasClass('-collapsed') ) {
@@ -506,7 +510,7 @@
// sync
- this.sync();
+ this.set('$field', $field).sync();
// refersh field (hide/show columns)
diff --git a/pro/assets/js/acf-pro-input.min.js b/pro/assets/js/acf-pro-input.min.js
index 760dbf7..b9e916d 100644
--- a/pro/assets/js/acf-pro-input.min.js
+++ b/pro/assets/js/acf-pro-input.min.js
@@ -1 +1 @@
-!function($){acf.pro=acf.model.extend({actions:{refresh:"refresh"},filters:{get_fields:"get_fields"},get_fields:function(t){return t=t.not(".acf-clone .acf-field")},refresh:function(t){var e=this;return t=t||!1,t&&t.is("tr")?void e.render_table(t.closest("table")):void $(".acf-table",t).each(function(){e.render_table($(this))})},render_table:function(t){var e=t.find("> thead th.acf-th"),a=1,i=100;e.exists()&&(e.each(function(){var e=$(this),a=e.attr("data-key"),i=t.find('td[data-key="'+a+'"]');i.removeClass("appear-empty"),e.removeClass("hidden-by-conditional-logic"),i.exists()&&(0==i.not(".hidden-by-conditional-logic").length?e.addClass("hidden-by-conditional-logic"):i.filter(".hidden-by-conditional-logic").addClass("appear-empty"))}),e.css("width","auto"),e=e.not(".hidden-by-conditional-logic"),a=e.length,e.filter("[data-width]").each(function(){var t=parseInt($(this).attr("data-width"));i-=t,$(this).css("width",t+"%")}),e=e.not("[data-width]"),e.each(function(){var t=i/e.length;$(this).css("width",t+"%")}),t.find(".acf-row .acf-field.-collapsed-target").removeAttr("colspan"),t.find(".acf-row.-collapsed .acf-field.-collapsed-target").attr("colspan",a))}})}(jQuery),function($){acf.fields.repeater=acf.field.extend({type:"repeater",$el:null,$input:null,$table:null,$tbody:null,$clone:null,actions:{ready:"initialize",append:"initialize",show:"show"},events:{'click a[data-event="add-row"]':"_add",'click a[data-event="remove-row"]':"_remove",'click a[data-event="collapse-row"]':"_collapse","mouseenter td.order":"_mouseenter"},focus:function(){this.$el=this.$field.find(".acf-repeater:first"),this.$input=this.$field.find("input:first"),this.$table=this.$field.find("table:first"),this.$tbody=this.$table.children("tbody"),this.$clone=this.$tbody.children("tr.acf-clone"),this.o=acf.get_data(this.$el),this.o.min=this.o.min||0,this.o.max=this.o.max||0},initialize:function(){this.$clone.find("input, textarea, select").attr("disabled","disabled"),this.render()},show:function(){this.$tbody.find(".acf-field:visible").each(function(){acf.do_action("show_field",$(this))})},count:function(){return this.$tbody.children().length-1},render:function(){this.$tbody.children().each(function(t){$(this).find("> td.order > span").html(t+1)}),0==this.count()?this.$el.addClass("-empty"):this.$el.removeClass("-empty"),this.o.max>0&&this.count()>=this.o.max?this.$el.find("> .acf-actions .button").addClass("disabled"):this.$el.find("> .acf-actions .button").removeClass("disabled")},add:function(t){if(t=t||this.$clone,this.o.max>0&&this.count()>=this.o.max)return alert(acf._e("repeater","max").replace("{max}",this.o.max)),!1;var e=this.$field;return $el=acf.duplicate(this.$clone),$el.removeClass("acf-clone"),$el.find("input, textarea, select").not(".acf-disabled").removeAttr("disabled"),t.before($el),this.doFocus(e),this.render(),acf.validation.remove_error(this.$field),this.sync(),$el},remove:function(t){var e=this;return this.count()<=this.o.min?(alert(acf._e("repeater","min").replace("{min}",this.o.min)),!1):(acf.do_action("remove",t),void acf.remove_tr(t,function(){e.$input.trigger("change"),e.render(),e.sync(),acf.do_action("refresh",e.$field)}))},sync:function(){var t="collapsed_"+this.$field.data("key"),e=[];this.$tbody.children().each(function(t){$(this).hasClass("-collapsed")&&e.push(t)}),acf.update_user_setting(t,e.join(","))},_mouseenter:function(t){if(!this.$tbody.hasClass("ui-sortable")&&1!=this.o.max){var e=this;this.$tbody.sortable({items:"> tr",handle:"> td.order",forceHelperSize:!0,forcePlaceholderSize:!0,scroll:!0,start:function(t,e){acf.do_action("sortstart",e.item,e.placeholder)},stop:function(t,a){e.render(),acf.do_action("sortstop",a.item,a.placeholder)},update:function(t,a){e.$input.trigger("change")}})}},_add:function(t){$row=!1,t.$el.hasClass("acf-icon")&&($row=t.$el.closest(".acf-row")),this.add($row)},_remove:function(t){this.remove(t.$el.closest(".acf-row"))},_collapse:function(t){var e=t.$el.closest(".acf-row");e.hasClass("-collapsed")?(e.removeClass("-collapsed"),acf.do_action("show",e,"collapse")):(e.addClass("-collapsed"),acf.do_action("hide",e,"collapse")),this.sync(),acf.do_action("refresh",this.$field)}})}(jQuery),function($){acf.fields.flexible_content=acf.field.extend({type:"flexible_content",$el:null,$input:null,$values:null,$clones:null,actions:{ready:"initialize",append:"initialize",show:"show"},events:{'click [data-event="add-layout"]':"_open",'click [data-event="remove-layout"]':"_remove",'click [data-event="collapse-layout"]':"_collapse","click .acf-fc-layout-handle":"_collapse","click .acf-fc-popup a":"_add","blur .acf-fc-popup .focus":"_close","mouseenter .acf-fc-layout-handle":"_mouseenter"},focus:function(){this.$el=this.$field.find(".acf-flexible-content:first"),this.$input=this.$el.siblings("input"),this.$values=this.$el.children(".values"),this.$clones=this.$el.children(".clones"),this.o=acf.get_data(this.$el),this.o.min=this.o.min||0,this.o.max=this.o.max||0},count:function(){return this.$values.children(".layout").length},initialize:function(){this.$clones.find("input, textarea, select").attr("disabled","disabled"),this.render()},show:function(){this.$values.find(".acf-field:visible").each(function(){acf.do_action("show_field",$(this))})},render:function(){var t=this;this.$values.children(".layout").each(function(t){$(this).find("> .acf-fc-layout-handle .acf-fc-layout-order").html(t+1)}),0==this.count()?this.$el.addClass("empty"):this.$el.removeClass("empty"),this.o.max>0&&this.count()>=this.o.max?this.$el.find("> .acf-actions .button").addClass("disabled"):this.$el.find("> .acf-actions .button").removeClass("disabled")},render_layout:function(t){},validate_add:function(t){if(this.o.max>0&&this.count()>=this.o.max){var e=1==this.o.max?"layout":"layouts",a=acf._e("flexible_content","max");return a=a.replace("{max}",this.o.max),a=a.replace("{identifier}",acf._e("flexible_content",e)),alert(a),!1}var i=$(this.$el.children(".tmpl-popup").html()),l=i.find('[data-layout="'+t+'"]'),s=parseInt(l.attr("data-max")),n=this.$values.children('.layout[data-layout="'+t+'"]').length;if(s>0&&n>=s){var e=1==s?"layout":"layouts",a=acf._e("flexible_content","max_layout");return a=a.replace("{max}",n),a=a.replace("{label}",'"'+l.text()+'"'),a=a.replace("{identifier}",acf._e("flexible_content",e)),alert(a),!1}return!0},validate_remove:function(t){if(this.o.min>0&&this.count()<=this.o.min){var e=1==this.o.min?"layout":"layouts",a=acf._e("flexible_content","min")+", "+acf._e("flexible_content","remove");return a=a.replace("{min}",this.o.min),a=a.replace("{identifier}",acf._e("flexible_content",e)),a=a.replace("{layout}",acf._e("flexible_content","layout")),confirm(a)}var i=$(this.$el.children(".tmpl-popup").html()),l=i.find('[data-layout="'+t+'"]'),s=parseInt(l.attr("data-min")),n=this.$values.children('.layout[data-layout="'+t+'"]').length;if(s>0&&s>=n){var e=1==s?"layout":"layouts",a=acf._e("flexible_content","min_layout")+", "+acf._e("flexible_content","remove");return a=a.replace("{min}",n),a=a.replace("{label}",'"'+l.text()+'"'),a=a.replace("{identifier}",acf._e("flexible_content",e)),a=a.replace("{layout}",acf._e("flexible_content","layout")),confirm(a)}return!0},sync:function(){var t="collapsed_"+this.$field.data("key"),e=[];this.$values.children(".layout").each(function(t){$(this).hasClass("-collapsed")&&e.push(t)}),acf.update_user_setting(t,e.join(","))},add:function(t,e){if(e=e||!1,!this.validate_add(t))return!1;var a=this.$field,i=this.$clones.children('.layout[data-layout="'+t+'"]');$el=acf.duplicate(i),$el.find("input, textarea, select").not(".acf-disabled").removeAttr("disabled"),this.$el.children(".no-value-message").hide(),e?e.before($el):this.$values.append($el),this.doFocus(a),this.render(),acf.validation.remove_error(this.$field),this.sync()},_mouseenter:function(t){if(!this.$values.hasClass("ui-sortable")&&1!=this.o.max){var e=this;this.$values.sortable({items:"> .layout",handle:"> .acf-fc-layout-handle",forceHelperSize:!0,forcePlaceholderSize:!0,scroll:!0,start:function(t,e){acf.do_action("sortstart",e.item,e.placeholder)},stop:function(t,a){e.render(),acf.do_action("sortstop",a.item,a.placeholder)},update:function(t,a){e.$input.trigger("change")}})}},_open:function(t){var e=this.$values,a=$(this.$el.children(".tmpl-popup").html());a.find("a").each(function(){var t=parseInt($(this).attr("data-min")),a=parseInt($(this).attr("data-max")),i=$(this).attr("data-layout"),l=$(this).text(),s=e.children('.layout[data-layout="'+i+'"]').length,n=$(this).children(".status");if(a>0){var c=a-s,o=acf._e("flexible_content","available"),r=1==c?"layout":"layouts",o=o.replace("{available}",c);o=o.replace("{max}",a),o=o.replace("{label}",'"'+l+'"'),o=o.replace("{identifier}",acf._e("flexible_content",r)),n.show().text(c).attr("title",o),0==c&&n.addClass("warning")}if(t>0){var d=t-s,o=acf._e("flexible_content","required"),r=1==d?"layout":"layouts",o=o.replace("{required}",d);o=o.replace("{min}",t),o=o.replace("{label}",'"'+l+'"'),o=o.replace("{identifier}",acf._e("flexible_content",r)),d>0&&n.addClass("warning").show().text(d).attr("title",o)}}),t.$el.after(a),t.$el.closest(".acf-fc-layout-controlls").exists()&&a.closest(".layout").addClass("-open"),a.css({"margin-top":0-a.height()-t.$el.outerHeight()-14,"margin-left":(t.$el.outerWidth()-a.width())/2});var i=a.offset().top;30>i&&(a.css({"margin-top":15}),a.find(".bit").addClass("top")),a.children(".focus").trigger("focus")},_close:function(t){var e=t.$el.parent(),a=e.closest(".layout");a.removeClass("-open"),setTimeout(function(){e.remove()},200)},_add:function(t){var e=t.$el.closest(".acf-fc-popup"),a=t.$el.attr("data-layout"),i=!1;e.closest(".acf-fc-layout-controlls").exists()&&(i=e.closest(".layout")),this.add(a,i)},_remove:function(t){var e=this,a=t.$el.closest(".layout");if(this.validate_remove(a.attr("data-layout"))){var i=0,l=this.$el.children(".no-value-message");0==a.siblings(".layout").length&&(i=l.outerHeight()),acf.do_action("remove",a),acf.remove_el(a,function(){e.render(),e.$input.trigger("change"),i>0&&l.show(),e.sync()},i)}},_collapse:function(t){var e=t.$el.closest(".layout");e.hasClass("-collapsed")?(e.removeClass("-collapsed"),acf.do_action("refresh",e)):e.addClass("-collapsed"),this.sync();var a=acf.serialize(e);$.extend(a,{action:"acf/fields/flexible_content/layout_title",field_key:this.$field.data("key"),post_id:acf.get("post_id"),i:e.index(),layout:e.data("layout")}),$.ajax({url:acf.get("ajaxurl"),dataType:"html",type:"post",data:a,success:function(t){t&&e.find("> .acf-fc-layout-handle").html(t)}})}})}(jQuery),function($){acf.fields.gallery=acf.field.extend({type:"gallery",$el:null,$main:null,$side:null,$attachments:null,actions:{ready:"initialize",append:"initialize",submit:"close_sidebar",show:"resize"},events:{"click .acf-gallery-attachment":"_select","click .acf-gallery-add":"_add","click .acf-gallery-remove":"_remove","click .acf-gallery-close":"_close","change .acf-gallery-sort":"_sort","click .acf-gallery-edit":"_edit","click .acf-gallery-update":"_update","change .acf-gallery-side input":"_update","change .acf-gallery-side textarea":"_update","change .acf-gallery-side select":"_update"},focus:function(){this.$el=this.$field.find(".acf-gallery:first"),this.$main=this.$el.children(".acf-gallery-main"),this.$side=this.$el.children(".acf-gallery-side"),this.$attachments=this.$main.children(".acf-gallery-attachments"),this.o=acf.get_data(this.$el),this.o.min=this.o.min||0,this.o.max=this.o.max||0},initialize:function(){var t=this,e=this.$field;this.$attachments.unbind("sortable").sortable({items:".acf-gallery-attachment",forceHelperSize:!0,forcePlaceholderSize:!0,scroll:!0,start:function(t,e){e.placeholder.html(e.item.html()),e.placeholder.removeAttr("style"),acf.do_action("sortstart",e.item,e.placeholder)},stop:function(t,e){acf.do_action("sortstop",e.item,e.placeholder)}}),this.$el.unbind("resizable").resizable({handles:"s",minHeight:200,stop:function(t,e){acf.update_user_setting("gallery_height",e.size.height)}}),$(window).on("resize",function(){t.set("$field",e).resize()}),this.render(),this.resize()},resize:function(){for(var t=100,e=175,a=4,i=this.$el.width(),l=4;20>l;l++){var s=i/l;if(s>t&&e>s){a=l;break}}a=Math.min(a,8),this.$el.attr("data-columns",a)},render:function(){var t=this.$main.find(".acf-gallery-sort"),e=this.$main.find(".acf-gallery-add");this.o.max>0&&this.count()>=this.o.max?e.addClass("disabled"):e.removeClass("disabled"),this.count()?t.removeClass("disabled"):t.addClass("disabled")},open_sidebar:function(){this.$el.addClass("sidebar-open"),this.$main.find(".acf-gallery-sort").hide();var t=this.$el.width()/3;t=parseInt(t),t=Math.max(t,350),this.$side.children(".acf-gallery-side-inner").css({width:t-1}),this.$side.animate({width:t-1},250),this.$main.animate({right:t},250)},_close:function(t){this.close_sidebar()},close_sidebar:function(){this.$el.removeClass("sidebar-open");var t=this.$el.find(".acf-gallery-sort");this.get_attachment("active").removeClass("active"),this.$side.find("input, textarea, select").attr("disabled","disabled"),this.$main.animate({right:0},250),this.$side.animate({width:0},250,function(){t.show(),$(this).find(".acf-gallery-side-data").html("")})},count:function(){return this.get_attachments().length},get_attachments:function(){return this.$attachments.children(".acf-gallery-attachment")},get_attachment:function(t){return t=t||0,t="active"===t?".active":'[data-id="'+t+'"]',this.$attachments.children(".acf-gallery-attachment"+t)},render_attachment:function(t,e){e=this.prepare(e);var a=this.get_attachment(t),i=a.find(".margin"),l=a.find("img"),s=a.find(".filename"),n=a.find('input[type="hidden"]'),c=e.url;"image"!==e.type&&(c=acf._e("media","default_icon"),a.addClass("-icon")),l.attr({src:c,alt:e.alt,title:e.title}),s.text(e.filename);var o="";e.id&&(o=e.id),acf.val(n,o)},_add:function(t){if(this.o.max>0&&this.count()>=this.o.max)return void acf.validation.add_warning(this.$field,acf._e("gallery","max"));var e=this,a=this.$field,i=acf.media.popup({title:acf._e("gallery","select"),mode:"select",type:"",field:this.$field.data("key"),multiple:"add",library:this.o.library,mime_types:this.o.mime_types,select:function(t,i){e.set("$field",a).add_attachment(t,i)}});i.on("content:activate:browse",function(){e.render_collection(i),i.content.get().collection.on("reset add",function(){e.render_collection(i)})})},add_attachment:function(t,e){if(e=e||0,t=this.prepare(t),!(this.o.max>0&&this.count()>=this.o.max||this.get_attachment(t.id).exists())){var a=this.$el.find('input[type="hidden"]:first').attr("name"),i=['"].join(""),l=$(i);if(this.$attachments.append(l),"prepend"===this.o.insert){var s=this.$attachments.children(":eq("+e+")");s.exists()&&s.before(l)}this.render_attachment(t.id,t),this.render()}},_select:function(t){var e=t.$el.data("id");this.select_attachment(e)},select_attachment:function(t){var e=this.get_attachment(t);e.hasClass("active")||(this.get_attachment("active").removeClass("active"),e.addClass("active"),this.fetch(t),this.open_sidebar())},prepare:function(t){if(t=t||{},t._valid)return t;var e={id:"",url:"",alt:"",title:"",filename:""};return t.id&&(e=t.attributes,e.url=acf.maybe_get(e,"sizes."+this.o.preview_size+".url",e.url)),e._valid=!0,e},fetch:function(t){var e=acf.prepare_for_ajax({action:"acf/fields/gallery/get_attachment",field_key:this.$field.data("key"),nonce:acf.get("nonce"),post_id:acf.get("post_id"),id:t});if(this.$el.data("xhr")&&this.$el.data("xhr").abort(),"string"==typeof t&&0===t.indexOf("_")){var a=this.get_attachment(t).find('input[type="hidden"]').val();a=$.parseJSON(a),e.attachment=a}var i=$.ajax({url:acf.get("ajaxurl"),dataType:"html",type:"post",cache:!1,data:e,context:this,success:this.fetch_success});this.$el.data("xhr",i)},fetch_success:function(t){if(t){var e=this.$side.find(".acf-gallery-side-data");e.html(t),e.find(".compat-field-acf-form-data").remove();var a=e.find("> .compat-attachment-fields > tbody > tr").detach();e.find("> table.form-table > tbody").append(a),e.find("> .compat-attachment-fields").remove(),acf.do_action("append",e)}},_sort:function(t){var e=t.$el.val();if(e){var a=acf.prepare_for_ajax({action:"acf/fields/gallery/get_sort_order",field_key:this.$field.data("key"),post_id:acf.get("post_id"),ids:[],sort:e});this.get_attachments().each(function(){var t=$(this).attr("data-id");t&&a.ids.push(t)});var i=$.ajax({url:acf.get("ajaxurl"),dataType:"json",type:"post",cache:!1,data:a,context:this,success:this._sort_success})}},_sort_success:function(t){if(acf.is_ajax_success(t)){t.data.reverse();for(i in t.data){var e=t.data[i],a=this.get_attachment(e);this.$attachments.prepend(a)}}},_update:function(){var t=this.$side.find(".acf-gallery-update"),e=this.$side.find(".acf-gallery-edit"),a=this.$side.find(".acf-gallery-side-data"),i=e.data("id"),l=acf.serialize_form(a);return t.attr("disabled")?!1:(t.attr("disabled","disabled"),t.before(''),l.action="acf/fields/gallery/update_attachment",acf.prepare_for_ajax(l),void $.ajax({url:acf.get("ajaxurl"),data:l,type:"post",dataType:"json",complete:function(e){t.removeAttr("disabled"),t.prev(".acf-loading").remove()}}))},_remove:function(t){t.stopPropagation();var e=t.$el.data("id");this.remove_attachment(e)},remove_attachment:function(t){this.close_sidebar(),this.get_attachment(t).remove(),this.render()},_edit:function(t){var e=t.$el.data("id");this.edit_attachment(e)},edit_attachment:function(t){var e=this,a=this.$field,i=t,l=this.get_attachment(t),s=acf.media.popup({mode:"edit",title:acf._e("image","edit"),button:acf._e("image","update"),attachment:i,select:function(i){e.set("$field",a).render_attachment(t,i),e.fetch(t)}})},render_collection:function(t){var e=this;setTimeout(function(){var a=t.content.get().$el;if(collection=t.content.get().collection||null,collection){var i=-1;collection.each(function(t){i++;var l=a.find(".attachments > .attachment:eq("+i+")");e.get_attachment(t.id).exists()&&(t.off("selection:single"),l.addClass("acf-selected"))})}},10)}})}(jQuery);
+!function($){acf.pro=acf.model.extend({actions:{refresh:"refresh"},filters:{get_fields:"get_fields"},get_fields:function(t){return t=t.not(".acf-clone .acf-field")},refresh:function(t){var e=this;return t=t||!1,t&&t.is("tr")?void e.render_table(t.closest("table")):void $(".acf-table",t).each(function(){e.render_table($(this))})},render_table:function(t){var e=t.find("> thead th.acf-th"),a=1,i=100;e.exists()&&(e.each(function(){var e=$(this),a=e.attr("data-key"),i=t.find('td[data-key="'+a+'"]');i.removeClass("appear-empty"),e.removeClass("hidden-by-conditional-logic"),i.exists()&&(0==i.not(".hidden-by-conditional-logic").length?e.addClass("hidden-by-conditional-logic"):i.filter(".hidden-by-conditional-logic").addClass("appear-empty"))}),e.css("width","auto"),e=e.not(".hidden-by-conditional-logic"),a=e.length,e.filter("[data-width]").each(function(){var t=parseInt($(this).attr("data-width"));i-=t,$(this).css("width",t+"%")}),e=e.not("[data-width]"),e.each(function(){var t=i/e.length;$(this).css("width",t+"%")}),t.find(".acf-row .acf-field.-collapsed-target").removeAttr("colspan"),t.find(".acf-row.-collapsed .acf-field.-collapsed-target").attr("colspan",a))}})}(jQuery),function($){acf.fields.repeater=acf.field.extend({type:"repeater",$el:null,$input:null,$table:null,$tbody:null,$clone:null,actions:{ready:"initialize",append:"initialize",show:"show"},events:{'click a[data-event="add-row"]':"_add",'click a[data-event="remove-row"]':"_remove",'click a[data-event="collapse-row"]':"_collapse","mouseenter td.order":"_mouseenter"},focus:function(){this.$el=this.$field.find(".acf-repeater:first"),this.$input=this.$field.find("input:first"),this.$table=this.$field.find("table:first"),this.$tbody=this.$table.children("tbody"),this.$clone=this.$tbody.children("tr.acf-clone"),this.o=acf.get_data(this.$el),this.o.min=this.o.min||0,this.o.max=this.o.max||0},initialize:function(){this.$clone.find("input, textarea, select").attr("disabled","disabled"),this.render()},show:function(){this.$tbody.find(".acf-field:visible").each(function(){acf.do_action("show_field",$(this))})},count:function(){return this.$tbody.children().length-1},render:function(){this.$tbody.children().each(function(t){$(this).find("> td.order > span").html(t+1)}),0==this.count()?this.$el.addClass("-empty"):this.$el.removeClass("-empty"),this.o.max>0&&this.count()>=this.o.max?this.$el.find("> .acf-actions .button").addClass("disabled"):this.$el.find("> .acf-actions .button").removeClass("disabled")},add:function(t){if(t=t||this.$clone,this.o.max>0&&this.count()>=this.o.max)return alert(acf._e("repeater","max").replace("{max}",this.o.max)),!1;var e=this.$field;return $el=acf.duplicate(this.$clone),$el.removeClass("acf-clone"),$el.find("input, textarea, select").not(".acf-disabled").removeAttr("disabled"),t.before($el),this.doFocus(e),this.render(),acf.validation.remove_error(this.$field),this.sync(),$el},remove:function(t){var e=this;return this.count()<=this.o.min?(alert(acf._e("repeater","min").replace("{min}",this.o.min)),!1):(acf.do_action("remove",t),void acf.remove_tr(t,function(){e.$input.trigger("change"),e.render(),e.sync(),acf.do_action("refresh",e.$field)}))},sync:function(){var t="collapsed_"+this.$field.data("key"),e=[];this.$tbody.children().each(function(t){$(this).hasClass("-collapsed")&&e.push(t)}),acf.update_user_setting(t,e.join(","))},_mouseenter:function(t){if(!this.$tbody.hasClass("ui-sortable")&&1!=this.o.max){var e=this;this.$tbody.sortable({items:"> tr",handle:"> td.order",forceHelperSize:!0,forcePlaceholderSize:!0,scroll:!0,start:function(t,e){acf.do_action("sortstart",e.item,e.placeholder)},stop:function(t,a){e.render(),acf.do_action("sortstop",a.item,a.placeholder)},update:function(t,a){e.$input.trigger("change")}})}},_add:function(t){$row=!1,t.$el.hasClass("acf-icon")&&($row=t.$el.closest(".acf-row")),this.add($row)},_remove:function(t){this.remove(t.$el.closest(".acf-row"))},_collapse:function(t){var e=t.$el.closest(".acf-row"),a=this.$field;e.hasClass("-collapsed")?(e.removeClass("-collapsed"),acf.do_action("show",e,"collapse")):(e.addClass("-collapsed"),acf.do_action("hide",e,"collapse")),this.set("$field",a).sync(),acf.do_action("refresh",this.$field)}})}(jQuery),function($){acf.fields.flexible_content=acf.field.extend({type:"flexible_content",$el:null,$input:null,$values:null,$clones:null,actions:{ready:"initialize",append:"initialize",show:"show"},events:{'click [data-event="add-layout"]':"_open",'click [data-event="remove-layout"]':"_remove",'click [data-event="collapse-layout"]':"_collapse","click .acf-fc-layout-handle":"_collapse","click .acf-fc-popup a":"_add","blur .acf-fc-popup .focus":"_close","mouseenter .acf-fc-layout-handle":"_mouseenter"},focus:function(){this.$el=this.$field.find(".acf-flexible-content:first"),this.$input=this.$el.siblings("input"),this.$values=this.$el.children(".values"),this.$clones=this.$el.children(".clones"),this.o=acf.get_data(this.$el),this.o.min=this.o.min||0,this.o.max=this.o.max||0},count:function(){return this.$values.children(".layout").length},initialize:function(){this.$clones.find("input, textarea, select").attr("disabled","disabled"),this.render()},show:function(){this.$values.find(".acf-field:visible").each(function(){acf.do_action("show_field",$(this))})},render:function(){var t=this;this.$values.children(".layout").each(function(t){$(this).find("> .acf-fc-layout-handle .acf-fc-layout-order").html(t+1)}),0==this.count()?this.$el.addClass("empty"):this.$el.removeClass("empty"),this.o.max>0&&this.count()>=this.o.max?this.$el.find("> .acf-actions .button").addClass("disabled"):this.$el.find("> .acf-actions .button").removeClass("disabled")},render_layout:function(t){},validate_add:function(t){if(this.o.max>0&&this.count()>=this.o.max){var e=1==this.o.max?"layout":"layouts",a=acf._e("flexible_content","max");return a=a.replace("{max}",this.o.max),a=a.replace("{identifier}",acf._e("flexible_content",e)),alert(a),!1}var i=$(this.$el.children(".tmpl-popup").html()),l=i.find('[data-layout="'+t+'"]'),s=parseInt(l.attr("data-max")),n=this.$values.children('.layout[data-layout="'+t+'"]').length;if(s>0&&n>=s){var e=1==s?"layout":"layouts",a=acf._e("flexible_content","max_layout");return a=a.replace("{max}",n),a=a.replace("{label}",'"'+l.text()+'"'),a=a.replace("{identifier}",acf._e("flexible_content",e)),alert(a),!1}return!0},validate_remove:function(t){if(this.o.min>0&&this.count()<=this.o.min){var e=1==this.o.min?"layout":"layouts",a=acf._e("flexible_content","min")+", "+acf._e("flexible_content","remove");return a=a.replace("{min}",this.o.min),a=a.replace("{identifier}",acf._e("flexible_content",e)),a=a.replace("{layout}",acf._e("flexible_content","layout")),confirm(a)}var i=$(this.$el.children(".tmpl-popup").html()),l=i.find('[data-layout="'+t+'"]'),s=parseInt(l.attr("data-min")),n=this.$values.children('.layout[data-layout="'+t+'"]').length;if(s>0&&s>=n){var e=1==s?"layout":"layouts",a=acf._e("flexible_content","min_layout")+", "+acf._e("flexible_content","remove");return a=a.replace("{min}",n),a=a.replace("{label}",'"'+l.text()+'"'),a=a.replace("{identifier}",acf._e("flexible_content",e)),a=a.replace("{layout}",acf._e("flexible_content","layout")),confirm(a)}return!0},sync:function(){var t="collapsed_"+this.$field.data("key"),e=[];this.$values.children(".layout").each(function(t){$(this).hasClass("-collapsed")&&e.push(t)}),acf.update_user_setting(t,e.join(","))},add:function(t,e){if(e=e||!1,!this.validate_add(t))return!1;var a=this.$field,i=this.$clones.children('.layout[data-layout="'+t+'"]');$el=acf.duplicate(i),$el.find("input, textarea, select").not(".acf-disabled").removeAttr("disabled"),this.$el.children(".no-value-message").hide(),e?e.before($el):this.$values.append($el),this.doFocus(a),this.render(),acf.validation.remove_error(this.$field),this.sync()},_mouseenter:function(t){if(!this.$values.hasClass("ui-sortable")&&1!=this.o.max){var e=this;this.$values.sortable({items:"> .layout",handle:"> .acf-fc-layout-handle",forceHelperSize:!0,forcePlaceholderSize:!0,scroll:!0,start:function(t,e){acf.do_action("sortstart",e.item,e.placeholder)},stop:function(t,a){e.render(),acf.do_action("sortstop",a.item,a.placeholder)},update:function(t,a){e.$input.trigger("change")}})}},_open:function(t){var e=this.$values,a=$(this.$el.children(".tmpl-popup").html());a.find("a").each(function(){var t=parseInt($(this).attr("data-min")),a=parseInt($(this).attr("data-max")),i=$(this).attr("data-layout"),l=$(this).text(),s=e.children('.layout[data-layout="'+i+'"]').length,n=$(this).children(".status");if(a>0){var c=a-s,o=acf._e("flexible_content","available"),d=1==c?"layout":"layouts",o=o.replace("{available}",c);o=o.replace("{max}",a),o=o.replace("{label}",'"'+l+'"'),o=o.replace("{identifier}",acf._e("flexible_content",d)),n.show().text(c).attr("title",o),0==c&&n.addClass("warning")}if(t>0){var r=t-s,o=acf._e("flexible_content","required"),d=1==r?"layout":"layouts",o=o.replace("{required}",r);o=o.replace("{min}",t),o=o.replace("{label}",'"'+l+'"'),o=o.replace("{identifier}",acf._e("flexible_content",d)),r>0&&n.addClass("warning").show().text(r).attr("title",o)}}),t.$el.after(a),t.$el.closest(".acf-fc-layout-controlls").exists()&&a.closest(".layout").addClass("-open"),a.css({"margin-top":0-a.height()-t.$el.outerHeight()-14,"margin-left":(t.$el.outerWidth()-a.width())/2});var i=a.offset().top;30>i&&(a.css({"margin-top":15}),a.find(".bit").addClass("top")),a.children(".focus").trigger("focus")},_close:function(t){var e=t.$el.parent(),a=e.closest(".layout");a.removeClass("-open"),setTimeout(function(){e.remove()},200)},_add:function(t){var e=t.$el.closest(".acf-fc-popup"),a=t.$el.attr("data-layout"),i=!1;e.closest(".acf-fc-layout-controlls").exists()&&(i=e.closest(".layout")),this.add(a,i)},_remove:function(t){var e=this,a=t.$el.closest(".layout");if(this.validate_remove(a.attr("data-layout"))){var i=0,l=this.$el.children(".no-value-message");0==a.siblings(".layout").length&&(i=l.outerHeight()),acf.do_action("remove",a),acf.remove_el(a,function(){e.render(),e.$input.trigger("change"),i>0&&l.show(),e.sync()},i)}},_collapse:function(t){var e=t.$el.closest(".layout");e.hasClass("-collapsed")?(e.removeClass("-collapsed"),acf.do_action("refresh",e)):e.addClass("-collapsed"),this.sync();var a=acf.serialize(e);$.extend(a,{action:"acf/fields/flexible_content/layout_title",field_key:this.$field.data("key"),post_id:acf.get("post_id"),i:e.index(),layout:e.data("layout")}),$.ajax({url:acf.get("ajaxurl"),dataType:"html",type:"post",data:a,success:function(t){t&&e.find("> .acf-fc-layout-handle").html(t)}})}})}(jQuery),function($){acf.fields.gallery=acf.field.extend({type:"gallery",$el:null,$main:null,$side:null,$attachments:null,actions:{ready:"initialize",append:"initialize",submit:"close_sidebar",show:"resize"},events:{"click .acf-gallery-attachment":"_select","click .acf-gallery-add":"_add","click .acf-gallery-remove":"_remove","click .acf-gallery-close":"_close","change .acf-gallery-sort":"_sort","click .acf-gallery-edit":"_edit","click .acf-gallery-update":"_update","change .acf-gallery-side input":"_update","change .acf-gallery-side textarea":"_update","change .acf-gallery-side select":"_update"},focus:function(){this.$el=this.$field.find(".acf-gallery:first"),this.$main=this.$el.children(".acf-gallery-main"),this.$side=this.$el.children(".acf-gallery-side"),this.$attachments=this.$main.children(".acf-gallery-attachments"),this.o=acf.get_data(this.$el),this.o.min=this.o.min||0,this.o.max=this.o.max||0},initialize:function(){var t=this,e=this.$field;this.$attachments.unbind("sortable").sortable({items:".acf-gallery-attachment",forceHelperSize:!0,forcePlaceholderSize:!0,scroll:!0,start:function(t,e){e.placeholder.html(e.item.html()),e.placeholder.removeAttr("style"),acf.do_action("sortstart",e.item,e.placeholder)},stop:function(t,e){acf.do_action("sortstop",e.item,e.placeholder)}}),this.$el.unbind("resizable").resizable({handles:"s",minHeight:200,stop:function(t,e){acf.update_user_setting("gallery_height",e.size.height)}}),$(window).on("resize",function(){t.set("$field",e).resize()}),this.render(),this.resize()},resize:function(){for(var t=100,e=175,a=4,i=this.$el.width(),l=4;20>l;l++){var s=i/l;if(s>t&&e>s){a=l;break}}a=Math.min(a,8),this.$el.attr("data-columns",a)},render:function(){var t=this.$main.find(".acf-gallery-sort"),e=this.$main.find(".acf-gallery-add");this.o.max>0&&this.count()>=this.o.max?e.addClass("disabled"):e.removeClass("disabled"),this.count()?t.removeClass("disabled"):t.addClass("disabled")},open_sidebar:function(){this.$el.addClass("sidebar-open"),this.$main.find(".acf-gallery-sort").hide();var t=this.$el.width()/3;t=parseInt(t),t=Math.max(t,350),this.$side.children(".acf-gallery-side-inner").css({width:t-1}),this.$side.animate({width:t-1},250),this.$main.animate({right:t},250)},_close:function(t){this.close_sidebar()},close_sidebar:function(){this.$el.removeClass("sidebar-open");var t=this.$el.find(".acf-gallery-sort");this.get_attachment("active").removeClass("active"),this.$side.find("input, textarea, select").attr("disabled","disabled"),this.$main.animate({right:0},250),this.$side.animate({width:0},250,function(){t.show(),$(this).find(".acf-gallery-side-data").html("")})},count:function(){return this.get_attachments().length},get_attachments:function(){return this.$attachments.children(".acf-gallery-attachment")},get_attachment:function(t){return t=t||0,t="active"===t?".active":'[data-id="'+t+'"]',this.$attachments.children(".acf-gallery-attachment"+t)},render_attachment:function(t,e){e=this.prepare(e);var a=this.get_attachment(t),i=a.find(".margin"),l=a.find("img"),s=a.find(".filename"),n=a.find('input[type="hidden"]'),c=e.url;"image"!==e.type&&(c=acf._e("media","default_icon"),a.addClass("-icon")),l.attr({src:c,alt:e.alt,title:e.title}),s.text(e.filename);var o="";e.id&&(o=e.id),acf.val(n,o)},_add:function(t){if(this.o.max>0&&this.count()>=this.o.max)return void acf.validation.add_warning(this.$field,acf._e("gallery","max"));var e=this,a=this.$field,i=acf.media.popup({title:acf._e("gallery","select"),mode:"select",type:"",field:this.$field.data("key"),multiple:"add",library:this.o.library,mime_types:this.o.mime_types,select:function(t,i){e.set("$field",a).add_attachment(t,i)}});i.on("content:activate:browse",function(){e.render_collection(i),i.content.get().collection.on("reset add",function(){e.render_collection(i)})})},add_attachment:function(t,e){if(e=e||0,t=this.prepare(t),!(this.o.max>0&&this.count()>=this.o.max||this.get_attachment(t.id).exists())){var a=this.$el.find('input[type="hidden"]:first').attr("name"),i=['"].join(""),l=$(i);if(this.$attachments.append(l),"prepend"===this.o.insert){var s=this.$attachments.children(":eq("+e+")");s.exists()&&s.before(l)}this.render_attachment(t.id,t),this.render()}},_select:function(t){var e=t.$el.data("id");this.select_attachment(e)},select_attachment:function(t){var e=this.get_attachment(t);e.hasClass("active")||(this.get_attachment("active").removeClass("active"),e.addClass("active"),this.fetch(t),this.open_sidebar())},prepare:function(t){if(t=t||{},t._valid)return t;var e={id:"",url:"",alt:"",title:"",filename:""};return t.id&&(e=t.attributes,e.url=acf.maybe_get(e,"sizes."+this.o.preview_size+".url",e.url)),e._valid=!0,e},fetch:function(t){var e=acf.prepare_for_ajax({action:"acf/fields/gallery/get_attachment",field_key:this.$field.data("key"),nonce:acf.get("nonce"),post_id:acf.get("post_id"),id:t});if(this.$el.data("xhr")&&this.$el.data("xhr").abort(),"string"==typeof t&&0===t.indexOf("_")){var a=this.get_attachment(t).find('input[type="hidden"]').val();a=$.parseJSON(a),e.attachment=a}var i=$.ajax({url:acf.get("ajaxurl"),dataType:"html",type:"post",cache:!1,data:e,context:this,success:this.fetch_success});this.$el.data("xhr",i)},fetch_success:function(t){if(t){var e=this.$side.find(".acf-gallery-side-data");e.html(t),e.find(".compat-field-acf-form-data").remove();var a=e.find("> .compat-attachment-fields > tbody > tr").detach();e.find("> table.form-table > tbody").append(a),e.find("> .compat-attachment-fields").remove(),acf.do_action("append",e)}},_sort:function(t){var e=t.$el.val();if(e){var a=acf.prepare_for_ajax({action:"acf/fields/gallery/get_sort_order",field_key:this.$field.data("key"),post_id:acf.get("post_id"),ids:[],sort:e});this.get_attachments().each(function(){var t=$(this).attr("data-id");t&&a.ids.push(t)});var i=$.ajax({url:acf.get("ajaxurl"),dataType:"json",type:"post",cache:!1,data:a,context:this,success:this._sort_success})}},_sort_success:function(t){if(acf.is_ajax_success(t)){t.data.reverse();for(i in t.data){var e=t.data[i],a=this.get_attachment(e);this.$attachments.prepend(a)}}},_update:function(){var t=this.$side.find(".acf-gallery-update"),e=this.$side.find(".acf-gallery-edit"),a=this.$side.find(".acf-gallery-side-data"),i=e.data("id"),l=acf.serialize_form(a);return t.attr("disabled")?!1:(t.attr("disabled","disabled"),t.before(''),l.action="acf/fields/gallery/update_attachment",acf.prepare_for_ajax(l),void $.ajax({url:acf.get("ajaxurl"),data:l,type:"post",dataType:"json",complete:function(e){t.removeAttr("disabled"),t.prev(".acf-loading").remove()}}))},_remove:function(t){t.stopPropagation();var e=t.$el.data("id");this.remove_attachment(e)},remove_attachment:function(t){this.close_sidebar(),this.get_attachment(t).remove(),this.render()},_edit:function(t){var e=t.$el.data("id");this.edit_attachment(e)},edit_attachment:function(t){var e=this,a=this.$field,i=t,l=this.get_attachment(t),s=acf.media.popup({mode:"edit",title:acf._e("image","edit"),button:acf._e("image","update"),attachment:i,select:function(i){e.set("$field",a).render_attachment(t,i),e.fetch(t)}})},render_collection:function(t){var e=this;setTimeout(function(){var a=t.content.get().$el;if(collection=t.content.get().collection||null,collection){var i=-1;collection.each(function(t){i++;var l=a.find(".attachments > .attachment:eq("+i+")");e.get_attachment(t.id).exists()&&(t.off("selection:single"),l.addClass("acf-selected"))})}},10)}})}(jQuery);
diff --git a/pro/core/updates.php b/pro/core/updates.php
index fcd257e..a327273 100644
--- a/pro/core/updates.php
+++ b/pro/core/updates.php
@@ -22,29 +22,63 @@ class acf_pro_updates {
function __construct() {
- // append plugin information
- // Note: is_admin() was used previously, however this prevents jetpack manage & ManageWP from working
- add_filter('plugins_api', array($this, 'inject_info'), 20, 3);
-
-
- // append update information
- add_filter('pre_set_site_transient_update_plugins', array($this, 'inject_update'));
-
-
- // add custom message when PRO not activated but update available
- add_action('in_plugin_update_message-' . acf_get_setting('basename'), array($this, 'in_plugin_update_message'), 10, 2 );
+ // filters
+ add_filter('acf/get_remote_plugin_info', array($this, 'get_remote_plugin_info'), 10, 1);
+ add_filter('acf/updates/plugin_details', array($this, 'plugin_details'), 10, 3);
+ add_filter('acf/updates/plugin_update', array($this, 'plugin_update'), 10, 2);
+ add_filter('acf/updates/plugin_update_message', array($this, 'plugin_update_message'), 10, 3);
}
/*
- * inject_info
+ * get_remote_plugin_info
+ *
+ * This function will return an array of data from the plugin's readme.txt file (remote)
+ * The data returned will be stored in a transient and used to display plugin update info
+ *
+ * @type function
+ * @date 8/06/2016
+ * @since 5.3.8
+ *
+ * @param $info (array)
+ * @return $info
+ */
+
+ function get_remote_plugin_info( $info ) {
+
+ // vars
+ $info = acf_pro_get_remote_response('get-info');
+
+
+ // bail ealry if no info
+ if( empty($info) ) return 0;
+
+
+ // json decode
+ $info = json_decode($info, true);
+
+
+ // remove unused data to save DB transient space
+ unset( $info['description'] );
+ unset( $info['installation'] );
+ unset( $info['tags'] );
+
+
+ // return
+ return $info;
+
+ }
+
+
+ /*
+ * plugin_details
*
* This function will populate the plugin data visible in the 'View details' popup
*
* @type function
- * @date 17/01/2014
- * @since 5.0.0
+ * @date 8/06/2016
+ * @since 5.3.8
*
* @param $result (bool|object)
* @param $action (string)
@@ -52,85 +86,68 @@ class acf_pro_updates {
* @return $result
*/
- function inject_info( $result, $action = null, $args = null ) {
+ function plugin_details( $result = false, $action = null, $args = null ) {
// vars
$slug = acf_get_setting('slug');
+ $info = acf_pro_get_remote_response('get-info');
+
+
+ // bail ealry if no info
+ if( empty($info) ) return false;
+
+
+ // json decode
+ $info = json_decode($info);
+
+
+ // sections
+ $sections = array(
+ 'description' => '',
+ 'installation' => '',
+ 'changelog' => '',
+ 'upgrade_notice' => ''
+ );
+
+ foreach( $sections as $k => $v ) {
+
+ $sections[ $k ] = $info->$k;
+
+ unset( $info->$k );
+
+ }
+
+ $info->sections = $sections;
- // validate
- if( isset($args->slug) && $args->slug == $slug ) {
-
- $info = acf_pro_get_remote_info();
- $sections = acf_extract_vars($info, array(
- 'description',
- 'installation',
- 'changelog',
- 'upgrade_notice',
- ));
-
- $obj = new stdClass();
-
- foreach( $info as $k => $v ) {
-
- $obj->$k = $v;
-
- }
-
- $obj->sections = $sections;
-
- return $obj;
-
- }
-
-
// return
- return $result;
-
+ return $info;
+
}
/*
- * inject_update
+ * plugin_update
*
- * This function will connect to the ACF website and find release details
+ * This function will return an object of data saved in transient and used by WP do perform an update
*
* @type function
* @date 16/01/2014
* @since 5.0.0
*
+ * @param $update (object)
* @param $transient (object)
- * @return $transient
+ * @return $update
*/
- function inject_update( $transient ) {
+ function plugin_update( $update, $transient ) {
+
+ // bail early if no update available
+ if( !acf_pro_is_update_available() ) return false;
+
// vars
- $basename = acf_get_setting('basename');
-
-
- // bail early if no show_updates
- if( !acf_get_setting('show_updates') ) return $transient;
-
-
- // ensure is_plugin_active() exists (not on frontend)
- if( !function_exists('is_plugin_active') ) {
-
- include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
-
- }
-
-
- // bail early if not a plugin (included in theme)
- if( !is_plugin_active($basename) ) return $transient;
-
-
- // bail early if no update available
- if( !acf_pro_is_update_available() ) return $transient;
-
-
- // vars
- $info = acf_pro_get_remote_info();
+ $info = acf_get_remote_plugin_info();
$basename = acf_get_setting('basename');
$slug = acf_get_setting('slug');
@@ -156,47 +173,46 @@ class acf_pro_updates {
}
-
- // add to transient
- $transient->response[ $basename ] = $obj;
-
// return
- return $transient;
+ return $obj;
}
/*
- * in_plugin_update_message
+ * plugin_update_message
*
* Displays an update message for plugin list screens.
- * Shows only the version updates from the current until the newest version
*
* @type function
- * @date 5/06/13
+ * @date 14/06/2016
+ * @since 5.3.8
*
- * @param {array} $plugin_data
- * @param {object} $r
+ * @param $message (string)
+ * @param $plugin_data (array)
+ * @param $r (object)
+ * @return $message
*/
-
- function in_plugin_update_message( $plugin_data, $r ) {
+
+ function plugin_update_message( $message, $plugin_data, $r ) {
// validate
- if( acf_pro_is_license_active() ) {
-
- return;
-
- }
+ if( acf_pro_is_license_active() ) return $message;
// vars
- $m = __('To enable updates, please enter your license key on the Updates page. If you don\'t have a licence key, please see details & pricing.', 'acf');
+ $activate_message = sprintf(
+ __('To enable updates, please enter your license key on the Updates page. If you don\'t have a licence key, please see details & pricing.', 'acf'),
+ admin_url('edit.php?post_type=acf-field-group&page=acf-settings-updates'),
+ 'https://www.advancedcustomfields.com/pro'
+ );
- // show message
- echo '
' . sprintf( $m, admin_url('edit.php?post_type=acf-field-group&page=acf-settings-updates'), 'https://www.advancedcustomfields.com/pro'); - + // return + // override $message (if plugin is not active, there is no need to see upgrade_notice) + return '
' . $activate_message; + } } diff --git a/pro/fields/repeater.php b/pro/fields/repeater.php index 683bb5c..2e5e702 100644 --- a/pro/fields/repeater.php +++ b/pro/fields/repeater.php @@ -241,7 +241,7 @@ class acf_field_repeater extends acf_field {
-
diff --git a/readme.txt b/readme.txt
index 7b9365c..3570f8a 100644
--- a/readme.txt
+++ b/readme.txt
@@ -106,6 +106,35 @@ http://support.advancedcustomfields.com/
== Changelog ==
+= 5.3.9.2 =
+* Time Picker field: Added compatibility with previous 3rd party field settings
+* Core: Fixed JS error setting l10n for Select2 with 3rd party libraries
+
+= 5.3.9.1 =
+* Time Picker field: Fixed bug causing value to appear as current time
+* API: Fixed bug causing `have_rows()` to fail when using an object as $post_id parameter
+
+= 5.3.9 =
+* Date Time Picker field: Added new field
+* Time Picker field: Added new field
+* Taxonomy field: Fixed bug preventing saved terms from being loaded during save/update actions
+* API: Added new function `the_row_index()` to output the current row number (1,2,3)
+* Core: Improved import tool to update existing field groups
+* Core: Added upgrade_notice message to plugins page for future announcements
+* Core: Fixed bug where updating value did not clear persistent cache
+* Core: Added Select2 JS strings to .pot for translation
+* Core: Added Date and Time picker JS strings to .pot for translation
+* Core: Improved compatibility with WPML during AJAX calls
+* Core: Fixed bug preventing access to network database upgrade page
+* Core: Minor fixes and improvements
+* Language: Updated Swedish translation - thanks to Jonathan de Jong
+* Language: Updated Russian translation - thanks to Andy Toniyevych
+* Language: Updated Portuguese translation - thanks to Pedro Mendonca
+* Language: Updated Polish translation - thanks to Michal Lepiarz
+* Language: Updated Italian translation - thanks to Davide Pantè
+* Language: Updated German translation - thanks to Ralf Koller
+* Language: Added Arabic translation - thanks to Adil el hallaoui
+
= 5.3.8.1 =
* Image field: Fixed JS bug causing errors when 'Uploaded to post' library setting is checked
* File field: Same as above
' . sprintf( $m, admin_url('edit.php?post_type=acf-field-group&page=acf-settings-updates'), 'https://www.advancedcustomfields.com/pro'); - + // return + // override $message (if plugin is not active, there is no need to see upgrade_notice) + return '
' . $activate_message; + } } diff --git a/pro/fields/repeater.php b/pro/fields/repeater.php index 683bb5c..2e5e702 100644 --- a/pro/fields/repeater.php +++ b/pro/fields/repeater.php @@ -241,7 +241,7 @@ class acf_field_repeater extends acf_field {