From dd598e997c7bd32f241bbe2e7cd7c69d2acb70a9 Mon Sep 17 00:00:00 2001 From: Luis Godinho Date: Mon, 23 Feb 2015 17:09:05 +0000 Subject: [PATCH 01/10] attempt to fix Save Views issue. --- assets/js/admin-views.js | 37 +++++++++++++++++++++++++----------- assets/js/admin-views.min.js | 2 +- 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/assets/js/admin-views.js b/assets/js/admin-views.js index 6bc9f5dd00..2231eaedb7 100644 --- a/assets/js/admin-views.js +++ b/assets/js/admin-views.js @@ -35,7 +35,7 @@ // Start by showing/hiding on load vcfg.toggleInitialVisibility(vcfg); - // Start bind to $('body') + // Start bind to $('body') $('body') // select form @@ -474,7 +474,7 @@ var data = { action: 'gv_sortable_fields_form', - nonce: gvGlobals.nonce, + nonce: gvGlobals.nonce }; if (context !== undefined && 'preset' === context) { @@ -637,7 +637,7 @@ var data = { action: 'gv_get_active_areas', template_id: template, - nonce: gvGlobals.nonce, + nonce: gvGlobals.nonce }; $.post(ajaxurl, data, function (response) { @@ -661,7 +661,7 @@ var data = { action: 'gv_get_preset_fields', template_id: template, - nonce: gvGlobals.nonce, + nonce: gvGlobals.nonce }; $.post(ajaxurl, data, function (response) { @@ -735,9 +735,9 @@ disabled: true, // Don't open on hover position: { my: "center bottom", - at: "center top-12", + at: "center top-12" }, - tooltipClass: 'top', + tooltipClass: 'top' }) // add title attribute so the tooltip can continue to work (jquery ui bug?) .attr("title", "") @@ -1181,10 +1181,11 @@ // If the View isn't a Start Fresh view, we just return true // so that the click on the Publish button can process. - if (!vcfg.startFreshStatus || templateId === '') { + if ( !vcfg.startFreshStatus || templateId === '' ) { // Serialize the inputs so that `max_input_vars` - return vcfg.serializeForm( e ); + return vcfg.serializeForm(); + } return false; @@ -1199,9 +1200,15 @@ * @param {[type]} e [description] * @return {[type]} [description] */ - serializeForm: function (e) { + serializeForm: function( e ) { - e.stopPropagation(); + if( $( e.target ).data('gv-valid') ) { + return true; + } + + e.stopImmediatePropagation(); + + $( e.target ).data('gv-valid', false ); /** * Add slashes to date fields so stripslashes doesn't strip all of them @@ -1227,7 +1234,15 @@ 'type': 'hidden' })); - return true; + + // make sure the "slow" browsers did append all the serialized data to the form + setTimeout( function() { + + $( e.target ).data( 'gv-valid', true ).submit(); + + }, 101 ); + + return false; }, diff --git a/assets/js/admin-views.min.js b/assets/js/admin-views.min.js index 91377ebc47..e09d5b3857 100644 --- a/assets/js/admin-views.min.js +++ b/assets/js/admin-views.min.js @@ -1 +1 @@ -!function($){var viewConfiguration;viewConfiguration={startFreshStatus:!1,init:function(){var vcfg=viewConfiguration;vcfg.gvSelectForm=$("#gravityview_form_id"),vcfg.currentFormId=vcfg.gvSelectForm.val(),vcfg.toggleInitialVisibility(vcfg),$("body").on("change","#gravityview_form_id",vcfg.formChange).on("click",'a[href="#gv_start_fresh"]',vcfg.startFresh).on("submit","#post",vcfg.processFormSubmit).on("click",".gv-view-types-hover",vcfg.selectTemplateHover).on("click","a[rel*=external]",vcfg.openExternalLinks).on("click mouseup keyup",vcfg.closeTooltips).on("click",'a[href="#gv_switch_view"]',vcfg.switchView).on("click",'a[href="#gv_select_template"]',vcfg.selectTemplate).on("click",".ui-tooltip-content .gv-fields",vcfg.startAddField).on("click",".gv-shortcode input",vcfg.selectText).on("gravityview_form_change",vcfg.updateFormLinks).on("change",".gv-dialog-options input[name*=show_as_link]",vcfg.toggleShowAsEntry).on("click",".gv-field-controls a[href='#remove']",vcfg.removeField).on("click",".gv-field-controls a[href='#settings']",vcfg.openFieldSettings).on("dblclick",".gv-fields",vcfg.openFieldSettings)},closeTooltips:function(e){var activeTooltips=$("[data-tooltip='active']"),close=!1,return_false=!1;switch(e.type){case"keyup":27===e.keyCode&&(close=!0);break;case"mouseup":$(e.target).parents(".ui-dialog,.ui-tooltip").length||$(e.target).is(".ui-dialog,.ui-tooltip")?close=!1:activeTooltips.length>0&&(close=!0),$(e.target).parents(".close").length&&(close=!0);break;case"click":$(e.target).is(".gv-overlay")&&(close=!0,return_false=!0,$(e.target).remove())}return close&&(activeTooltips.tooltip("close"),$(".ui-dialog:visible").find(".ui-dialog-content").dialog("close"),return_false)?!1:void 0},toggleShowAsEntry:function(e){var parent=$(e.target).parents(".gv-fields"),icon=parent.find(".gv-field-controls .dashicons-admin-links");icon.toggleClass("hide-if-js",$(e.target).not(":checked"))},selectText:function(e){return e.preventDefault(),$(this).focus().select(),!1},toggleInitialVisibility:function(vcfg){0!==vcfg.gvSelectForm.length&&(""===vcfg.currentFormId?vcfg.hideView():$("#gravityview_directory_template").val().length>0?($("#gravityview_select_template").slideUp(150),vcfg.showViewConfig()):(vcfg.templateFilter("custom"),vcfg.showViewTypeMetabox()))},hideView:function(){var vcfg=viewConfiguration;vcfg.currentFormId="",$("#gravityview_view_config, #gravityview_select_template, #gravityview_sort_filter, .gv-form-links").hide()},updateFormLinks:function(){var vcfg=viewConfiguration;$(".gv-form-links a").each(function(){var new_url=$(this).attr("href").replace(/id=([0-9]+)/gm,"id="+vcfg.gvSelectForm.val());$(this).attr("href",new_url)})},toggleViewTypeMetabox:function(){var $templates=$("#gravityview_select_template");$templates.is(":visible")?($("a[href=#gv_switch_view]").text(function(){return $(this).attr("data-text-backup")}),$templates.slideUp(150)):($("a[href=#gv_switch_view]").attr("data-text-backup",function(){return $(this).text()}).text(gvGlobals.label_cancel),$templates.slideDown(150))},showViewTypeMetabox:function(){$("#gravityview_select_template").slideDown(150)},startFresh:function(e){e.preventDefault();var vcfg=viewConfiguration;vcfg.startFreshStatus=!0,""!==vcfg.currentFormId&&vcfg.gvSelectForm.length>0?vcfg.showDialog("#gravityview_form_id_dialog"):vcfg.startFreshContinue()},startFreshContinue:function(){var vcfg=viewConfiguration;$("#gravityview_form_id_start_fresh").val("1"),$("#gravityview_form_id").val(""),$("a[href=#gv_switch_view]").hide(),vcfg.templateFilter("preset"),vcfg.showViewTypeMetabox(),vcfg.hideViewConfig()},formChange:function(e){e.preventDefault();var vcfg=viewConfiguration;vcfg.startFreshStatus=!1,""!==vcfg.currentFormId&&vcfg.currentFormId!==$(this).val()?vcfg.showDialog("#gravityview_form_id_dialog"):vcfg.formChangeContinue()},formChangeContinue:function(){var vcfg=viewConfiguration;""===vcfg.gvSelectForm.val()?vcfg.hideView():($("body").trigger("gravityview_form_change").addClass("gv-form-changed"),vcfg.templateFilter("custom"),vcfg.showViewTypeMetabox(),vcfg.getAvailableFields(),vcfg.getSortableFields(),$("a[href=#gv_switch_view]").fadeOut(150))},showDialog:function(dialogSelector,buttons){var vcfg=viewConfiguration,thisDialog=$(dialogSelector),cancel_button={text:gvGlobals.label_cancel,click:function(){thisDialog.is("#gravityview_form_id_dialog")?(vcfg.startFreshStatus=!1,vcfg.gvSelectForm.val(vcfg.currentFormId)):thisDialog.is("#gravityview_switch_template_dialog")&&(vcfg.toggleViewTypeMetabox(),vcfg.showViewConfig()),thisDialog.dialog("close")}},continue_button={text:gvGlobals.label_continue,click:function(){thisDialog.is("#gravityview_form_id_dialog")?vcfg.startFreshStatus?vcfg.startFreshContinue():vcfg.formChangeContinue():thisDialog.is("#gravityview_switch_template_dialog")&&(vcfg.selectTemplateContinue(),vcfg.toggleViewTypeMetabox()),thisDialog.dialog("close")}},default_buttons=[cancel_button,continue_button];buttons=buttons||default_buttons,thisDialog.dialog({dialogClass:"wp-dialog gv-dialog",appendTo:thisDialog.parent(),draggable:!1,resizable:!1,width:function(){return $(window).width()>550?550:$(window).width()-10},open:function(){return $('
').prependTo("#wpwrap"),!0},close:function(e){e.preventDefault(),vcfg.setCustomLabel(thisDialog),$("#wpwrap > .gv-overlay").fadeOut("fast",function(){$(this).remove()})},closeOnEscape:!0,buttons:buttons})},setCustomLabel:function(dialog){var $custom_label=$("[name*=custom_label]",dialog),show_label=$("[name*=show_label]",dialog).is(":checked"),$label=dialog.parents(".gv-fields").find(".gv-field-label");$custom_label.length&&$custom_label.val().trim().length&&show_label?$label.text($custom_label.val().trim()):$label.html($label.attr("data-original-title"))},getSortableFields:function(context,id){var vcfg=viewConfiguration;$("#gravityview_sort_field").prop("disabled","disabled").empty().append("");var data={action:"gv_sortable_fields_form",nonce:gvGlobals.nonce};void 0!==context&&"preset"===context?data.template_id=id:data.form_id=vcfg.gvSelectForm.val(),$.post(ajaxurl,data,function(response){"false"!==response&&"0"!==response&&$("#gravityview_sort_field").empty().append(response).prop("disabled",null)})},switchView:function(e){e.preventDefault(),e.stopImmediatePropagation();var vcfg=viewConfiguration;vcfg.templateFilter("custom"),vcfg.toggleViewTypeMetabox()},templateFilter:function(templateType){$(".gv-view-types-module").each(function(){$(this).attr("data-filter")===templateType?$(this).parent().show():$(this).parent().hide()})},selectTemplate:function(e){var vcfg=viewConfiguration;e.preventDefault(),e.stopImmediatePropagation(),vcfg.wantedTemplate=$(this);var currTemplateId=$("#gravityview_directory_template").val(),selectedTemplateId=vcfg.wantedTemplate.attr("data-templateid");""===currTemplateId?($("#gravityview_select_template").slideUp(150),vcfg.selectTemplateContinue()):currTemplateId!==selectedTemplateId?vcfg.showDialog("#gravityview_switch_template_dialog"):(vcfg.toggleViewTypeMetabox(),vcfg.showViewConfig())},selectTemplateContinue:function(){var vcfg=viewConfiguration,selectedTemplateId=vcfg.wantedTemplate.attr("data-templateid");$("#gravityview_directory_template").val(selectedTemplateId).change();var $parent=vcfg.wantedTemplate.parents(".gv-view-types-module");$parent.parents(".gv-grid").find(".gv-view-types-module").removeClass("gv-selected"),$parent.addClass("gv-selected"),vcfg.startFreshStatus?(vcfg.getAvailableFields("preset",selectedTemplateId),vcfg.getPresetFields(selectedTemplateId),vcfg.getSortableFields("preset",selectedTemplateId)):(vcfg.updateActiveAreas(selectedTemplateId),$("a[href=#gv_switch_view]").fadeIn(150),vcfg.toggleViewTypeMetabox())},selectTemplateHover:function(e){e.preventDefault(),e.stopImmediatePropagation(),$(this).find('a[href="#gv_select_template"]').trigger("click")},openExternalLinks:function(){return window.open(this.href),!1},previewTemplate:function(e){e.preventDefault(),e.stopImmediatePropagation();var parent=$(event.currentTarget).parents(".gv-view-types-module");parent.find(".gv-template-preview").dialog({dialogClass:"wp-dialog gv-dialog",appendTo:$("#gravityview_select_template"),width:550,open:function(){$('
').prependTo("#wpwrap")},close:function(){$(this).dialog("option","appendTo",parent),$("#wpwrap > .gv-overlay").fadeOut("fast",function(){$(this).remove()})},closeOnEscape:!0,buttons:[{text:gvGlobals.label_close,click:function(){$(this).dialog("close")}}]})},updateActiveAreas:function(template){var vcfg=viewConfiguration;$("#directory-active-fields, #single-active-fields").children().remove();var data={action:"gv_get_active_areas",template_id:template,nonce:gvGlobals.nonce};$.post(ajaxurl,data,function(response){if(response){var content=$.parseJSON(response);$("#directory-header-widgets").html(content.header),$("#directory-footer-widgets").html(content.footer),$("#directory-active-fields").append(content.directory),$("#single-active-fields").append(content.single),vcfg.showViewConfig()}})},getPresetFields:function(template){var vcfg=viewConfiguration;$("#directory-active-fields, #single-active-fields").children().remove();var data={action:"gv_get_preset_fields",template_id:template,nonce:gvGlobals.nonce};$.post(ajaxurl,data,function(response){if(response){var content=$.parseJSON(response);$("#directory-header-widgets").html(content.header),$("#directory-footer-widgets").html(content.footer),$("#directory-active-fields").append(content.directory),$("#single-active-fields").append(content.single),vcfg.showViewConfig()}})},hideViewConfig:function(){$("#gravityview_view_config,#gravityview_sort_filter").slideUp(150),$(document).trigger("gv_admin_views_hideViewConfig")},showViewConfig:function(){$("#gravityview_view_config, #gravityview_sort_filter").slideDown(150),viewConfiguration.toggleDropMessage(),viewConfiguration.init_droppables(),viewConfiguration.init_tooltips(),$(document).trigger("gv_admin_views_showViewConfig")},init_tooltips:function(){$(".gv-add-field").tooltip({content:function(){var context=$(this).attr("data-context");switch($(this).attr("data-objecttype")){case"field":return $("#"+context+"-available-fields").html();case"widget":return $("#directory-available-widgets").html()}},close:function(){$(this).attr("data-tooltip",null)},open:function(){$(this).attr("data-tooltip","active").attr("data-tooltip-id",$(this).attr("aria-describedby"))},closeOnEscape:!0,disabled:!0,position:{my:"center bottom",at:"center top-12"},tooltipClass:"top"}).attr("title","").on("mouseout focusout",function(e){e.stopImmediatePropagation()}).click(function(e){$(this).attr("title",""),e.preventDefault(),$(this).tooltip("open")})},refreshGFtooltips:function(){$(".gf_tooltip").tooltip({show:500,hide:1e3,content:function(){return $(this).prop("title")}})},getAvailableFields:function(preset,templateid){var vcfg=viewConfiguration;$("#directory-available-fields, #single-available-fields, #edit-available-fields").find(".gv-fields").remove(),$("#directory-active-fields, #single-active-fields, #edit-active-fields").find(".gv-fields").remove(),vcfg.toggleDropMessage();var data={action:"gv_available_fields",nonce:gvGlobals.nonce,context:"directory"};void 0!==preset&&"preset"===preset?data.template_id=templateid:data.form_id=vcfg.gvSelectForm.val(),$.post(ajaxurl,data,function(response){response&&$("#directory-available-fields").append(response)}),data.context="single",$.post(ajaxurl,data,function(response){response&&$("#single-available-fields").append(response)}),data.context="edit",$.post(ajaxurl,data,function(response){response&&$("#edit-available-fields").append(response)})},startAddField:function(e){$(this).has(".field-id-all-fields").length?viewConfiguration.addAllFields($(this)):viewConfiguration.addField($(this),e)},addAllFields:function(clicked){clicked.siblings(".gv-fields").each(function(){$(this).trigger("click")}),$("a.gv-add-field[data-tooltip='active']").tooltip("close")},addField:function(clicked,e){e.preventDefault();var vcfg=viewConfiguration,newField=clicked.clone().hide(),areaId=clicked.parents(".ui-tooltip").attr("id"),templateId=$("#gravityview_directory_template").val(),tooltipId=clicked.parents(".ui-tooltip").attr("id"),addButton=$('a.gv-add-field[data-tooltip-id="'+tooltipId+'"]'),data={action:"gv_field_options",template:templateId,area:addButton.attr("data-areaid"),context:addButton.attr("data-context"),field_id:newField.attr("data-fieldid"),field_label:newField.find(".gv-field-label").attr("data-original-title"),field_type:addButton.attr("data-objecttype"),input_type:newField.attr("data-inputtype"),nonce:gvGlobals.nonce};$.ajax({type:"POST",url:ajaxurl,data:data,async:!0,beforeSend:function(){vcfg.disable_publish()},complete:function(){vcfg.enable_publish()}}).done(function(response){newField.append(response),$(".gv-dialog-options",newField).length>0&&$(".dashicons-admin-generic",newField).removeClass("hide-if-js"),$('a[data-tooltip-id="'+areaId+'"]').parents(".gv-droppable-area").find(".active-drop").append(newField).end().attr("data-tooltip-id",""),newField.fadeIn(100,function(){$(".all-merge-tags").remove(),"undefined"!=typeof form&&$("body").not(".gv-form-changed")&&(window.gfMergeTags=new gfMergeTagsObj(form))}),vcfg.refreshGFtooltips()}).fail(function(jqXHR){vcfg.enable_publish(),alert(gvGlobals.field_loaderror),console.log(jqXHR)}).always(function(){vcfg.toggleDropMessage()})},enable_publish:function(){$("#publishing-action #publish").prop("disabled",null).removeClass("button-primary-disabled")},disable_publish:function(){$("#publishing-action #publish").prop("disabled","disabled").addClass("button-primary-disabled")},init_droppables:function(){var vcfg=viewConfiguration;$("#directory-fields, #single-fields").find(".active-drop-widget").sortable({placeholder:"fields-placeholder",items:"> .gv-fields",distance:2,revert:75,connectWith:".active-drop-widget",receive:function(event,ui){var sender_area=ui.sender.attr("data-areaid"),receiver_area=$(this).attr("data-areaid");ui.item.find('[name^="widgets['+sender_area+']"]').each(function(){var name=$(this).attr("name");$(this).attr("name",name.replace(sender_area,receiver_area))}),vcfg.toggleDropMessage()}}),$("#directory-fields, #single-fields, #edit-fields").find(".active-drop-field").sortable({placeholder:"fields-placeholder",items:"> .gv-fields",distance:2,revert:75,connectWith:".active-drop-field",receive:function(event,ui){if(ui.item.find(".gv-dialog-options").length>0){var sender_area=ui.sender.attr("data-areaid"),receiver_area=$(this).attr("data-areaid");ui.item.find('[name^="fields['+sender_area+']"]').each(function(){var name=$(this).attr("name");$(this).attr("name",name.replace(sender_area,receiver_area))})}vcfg.toggleDropMessage()}})},toggleDropMessage:function(){$(".active-drop").each(function(){$(this).find(".gv-fields").length>0?$(this).find(".drop-message").hide():$(this).find(".drop-message").fadeIn(100)})},removeField:function(e){e.preventDefault();var vcfg=viewConfiguration,area=$(e.currentTarget).parents(".active-drop");if(e.altKey&&$(area).find(".gv-fields").length>1){var remove_all=window.confirm(gvGlobals.remove_all_fields);return void(remove_all&&($(area).find(".gv-fields").remove(),vcfg.toggleDropMessage()))}$(e.currentTarget).parents(".gv-fields").fadeOut("normal",function(){$(this).remove(),vcfg.toggleDropMessage()})},openFieldSettings:function(e){e.preventDefault();var parent,vcfg=viewConfiguration;parent=$(e.currentTarget).is(".gv-fields")?$(e.currentTarget):$(e.currentTarget).parents(".gv-fields"),vcfg.updateVisibilitySettings(e,!0),$("body").on("change",".gv-fields input:checkbox",vcfg.updateVisibilitySettings);var buttons=[{text:gvGlobals.label_close,click:function(){$(this).dialog("close")}}];vcfg.showDialog(parent.find(".gv-dialog-options"),buttons)},updateVisibilitySettings:function(e,first_run){var vcfg=viewConfiguration;first_run=first_run||!1;var $parent=$(e.currentTarget).is(".gv-fields")?$(e.currentTarget):$(e.currentTarget).parents(".gv-fields");vcfg.toggleVisibility($("input:checkbox[name*=show_label]",$parent),$("[name*=custom_label]",$parent),first_run),vcfg.toggleVisibility($("input:checkbox[name*=emailmailto]",$parent),$("[name*=emailsubject],[name*=emailbody]",$parent),first_run),vcfg.toggleVisibility($("input:checkbox[name*=link_to_source]",$parent),$("[name*=source_link_text]",$parent),first_run),$("input:checkbox",$parent).attr("disabled",null),$("input:checkbox[name*=show_as_link]",$parent).is(":checked")&&$("input:checkbox[name*=link_to_]",$parent).attr("disabled",!0),$("input:checkbox[name*=link_to_]:checked",$parent).length>0&&$("input:checkbox[name*=show_as_link]",$parent).attr("disabled",!0),vcfg.toggleVisibility($("input:checkbox[name*=only_loggedin]",$parent),$("[name*=only_loggedin_cap]",$parent),first_run)},toggleVisibility:function($checkbox,$toggled,first_run){var speed=first_run?0:"fast";$checkbox.is(":checked")?$toggled.parents(".gv-setting-container").fadeIn(speed):$toggled.parents(".gv-setting-container").fadeOut(speed)},processFormSubmit:function(e){var vcfg=viewConfiguration,templateId=$("#gravityview_directory_template").val();return vcfg.startFreshStatus?(vcfg.createPresetForm(e,templateId),!1):vcfg.startFreshStatus&&""!==templateId?!1:vcfg.serializeForm(e)},serializeForm:function(e){e.stopPropagation(),$("#post input[name*=date_display]").val(function(){return $(this).val().replace(/[\\"']/g,"\\$&").replace(/\u0000/g,"\\0")});var $fields=$("#post :input[name^=fields]"),serialized_data=$fields.serialize();return $fields.remove(),$("#post").append($("",{name:"fields",value:serialized_data,type:"hidden"})),!0},createPresetForm:function(e,templateId){var vcfg=viewConfiguration;e.stopPropagation();var data={action:"gv_set_preset_form",template_id:templateId,nonce:gvGlobals.nonce};return $.ajax({type:"POST",url:ajaxurl,data:data,async:!1,success:function(response){"false"!==response&&"0"!==response?(vcfg.startFreshStatus=!1,vcfg.gvSelectForm.find("option:selected").removeAttr("selected").end().append(response),$(e.target).submit()):$("#post").before('

'+gvGlobals.label_publisherror+"

")}}),!1}},jQuery(document).ready(function($){$("#title-prompt-text").text(gvGlobals.label_viewname),viewConfiguration.init(),$(".gv-datepicker").datepicker({dateFormat:"yy-mm-dd",constrainInput:!1});var cookie_key="gv-active-tab-"+$("#post_ID").val(),activate_tab=$.cookie(cookie_key);"undefined"===activate_tab&&(activate_tab=0),$("#gv-view-configuration-tabs").tabs({active:activate_tab,activate:function(event,ui){$.cookie(cookie_key,ui.newTab.index(),{path:gvGlobals.cookiepath})}}),$("#gravityview_template_settings .form-table tr:even").addClass("alternate"),$("#gravityview_sort_filter").insertAfter($("#gravityview_view_config"))})}(jQuery); \ No newline at end of file +!function($){var viewConfiguration;viewConfiguration={startFreshStatus:!1,init:function(){var vcfg=viewConfiguration;vcfg.gvSelectForm=$("#gravityview_form_id"),vcfg.currentFormId=vcfg.gvSelectForm.val(),vcfg.toggleInitialVisibility(vcfg),$("body").on("change","#gravityview_form_id",vcfg.formChange).on("click",'a[href="#gv_start_fresh"]',vcfg.startFresh).on("submit","#post",vcfg.processFormSubmit).on("click",".gv-view-types-hover",vcfg.selectTemplateHover).on("click","a[rel*=external]",vcfg.openExternalLinks).on("click mouseup keyup",vcfg.closeTooltips).on("click",'a[href="#gv_switch_view"]',vcfg.switchView).on("click",'a[href="#gv_select_template"]',vcfg.selectTemplate).on("click",".ui-tooltip-content .gv-fields",vcfg.startAddField).on("click",".gv-shortcode input",vcfg.selectText).on("gravityview_form_change",vcfg.updateFormLinks).on("change",".gv-dialog-options input[name*=show_as_link]",vcfg.toggleShowAsEntry).on("click",".gv-field-controls a[href='#remove']",vcfg.removeField).on("click",".gv-field-controls a[href='#settings']",vcfg.openFieldSettings).on("dblclick",".gv-fields",vcfg.openFieldSettings)},closeTooltips:function(e){var activeTooltips=$("[data-tooltip='active']"),close=!1,return_false=!1;switch(e.type){case"keyup":27===e.keyCode&&(close=!0);break;case"mouseup":$(e.target).parents(".ui-dialog,.ui-tooltip").length||$(e.target).is(".ui-dialog,.ui-tooltip")?close=!1:activeTooltips.length>0&&(close=!0),$(e.target).parents(".close").length&&(close=!0);break;case"click":$(e.target).is(".gv-overlay")&&(close=!0,return_false=!0,$(e.target).remove())}return close&&(activeTooltips.tooltip("close"),$(".ui-dialog:visible").find(".ui-dialog-content").dialog("close"),return_false)?!1:void 0},toggleShowAsEntry:function(e){var parent=$(e.target).parents(".gv-fields"),icon=parent.find(".gv-field-controls .dashicons-admin-links");icon.toggleClass("hide-if-js",$(e.target).not(":checked"))},selectText:function(e){return e.preventDefault(),$(this).focus().select(),!1},toggleInitialVisibility:function(vcfg){0!==vcfg.gvSelectForm.length&&(""===vcfg.currentFormId?vcfg.hideView():$("#gravityview_directory_template").val().length>0?($("#gravityview_select_template").slideUp(150),vcfg.showViewConfig()):(vcfg.templateFilter("custom"),vcfg.showViewTypeMetabox()))},hideView:function(){var vcfg=viewConfiguration;vcfg.currentFormId="",$("#gravityview_view_config, #gravityview_select_template, #gravityview_sort_filter, .gv-form-links").hide()},updateFormLinks:function(){var vcfg=viewConfiguration;$(".gv-form-links a").each(function(){var new_url=$(this).attr("href").replace(/id=([0-9]+)/gm,"id="+vcfg.gvSelectForm.val());$(this).attr("href",new_url)})},toggleViewTypeMetabox:function(){var $templates=$("#gravityview_select_template");$templates.is(":visible")?($("a[href=#gv_switch_view]").text(function(){return $(this).attr("data-text-backup")}),$templates.slideUp(150)):($("a[href=#gv_switch_view]").attr("data-text-backup",function(){return $(this).text()}).text(gvGlobals.label_cancel),$templates.slideDown(150))},showViewTypeMetabox:function(){$("#gravityview_select_template").slideDown(150)},startFresh:function(e){e.preventDefault();var vcfg=viewConfiguration;vcfg.startFreshStatus=!0,""!==vcfg.currentFormId&&vcfg.gvSelectForm.length>0?vcfg.showDialog("#gravityview_form_id_dialog"):vcfg.startFreshContinue()},startFreshContinue:function(){var vcfg=viewConfiguration;$("#gravityview_form_id_start_fresh").val("1"),$("#gravityview_form_id").val(""),$("a[href=#gv_switch_view]").hide(),vcfg.templateFilter("preset"),vcfg.showViewTypeMetabox(),vcfg.hideViewConfig()},formChange:function(e){e.preventDefault();var vcfg=viewConfiguration;vcfg.startFreshStatus=!1,""!==vcfg.currentFormId&&vcfg.currentFormId!==$(this).val()?vcfg.showDialog("#gravityview_form_id_dialog"):vcfg.formChangeContinue()},formChangeContinue:function(){var vcfg=viewConfiguration;""===vcfg.gvSelectForm.val()?vcfg.hideView():($("body").trigger("gravityview_form_change").addClass("gv-form-changed"),vcfg.templateFilter("custom"),vcfg.showViewTypeMetabox(),vcfg.getAvailableFields(),vcfg.getSortableFields(),$("a[href=#gv_switch_view]").fadeOut(150))},showDialog:function(dialogSelector,buttons){var vcfg=viewConfiguration,thisDialog=$(dialogSelector),cancel_button={text:gvGlobals.label_cancel,click:function(){thisDialog.is("#gravityview_form_id_dialog")?(vcfg.startFreshStatus=!1,vcfg.gvSelectForm.val(vcfg.currentFormId)):thisDialog.is("#gravityview_switch_template_dialog")&&(vcfg.toggleViewTypeMetabox(),vcfg.showViewConfig()),thisDialog.dialog("close")}},continue_button={text:gvGlobals.label_continue,click:function(){thisDialog.is("#gravityview_form_id_dialog")?vcfg.startFreshStatus?vcfg.startFreshContinue():vcfg.formChangeContinue():thisDialog.is("#gravityview_switch_template_dialog")&&(vcfg.selectTemplateContinue(),vcfg.toggleViewTypeMetabox()),thisDialog.dialog("close")}},default_buttons=[cancel_button,continue_button];buttons=buttons||default_buttons,thisDialog.dialog({dialogClass:"wp-dialog gv-dialog",appendTo:thisDialog.parent(),draggable:!1,resizable:!1,width:function(){return $(window).width()>550?550:$(window).width()-10},open:function(){return $('
').prependTo("#wpwrap"),!0},close:function(e){e.preventDefault(),vcfg.setCustomLabel(thisDialog),$("#wpwrap > .gv-overlay").fadeOut("fast",function(){$(this).remove()})},closeOnEscape:!0,buttons:buttons})},setCustomLabel:function(dialog){var $custom_label=$("[name*=custom_label]",dialog),show_label=$("[name*=show_label]",dialog).is(":checked"),$label=dialog.parents(".gv-fields").find(".gv-field-label");$custom_label.length&&$custom_label.val().trim().length&&show_label?$label.text($custom_label.val().trim()):$label.html($label.attr("data-original-title"))},getSortableFields:function(context,id){var vcfg=viewConfiguration;$("#gravityview_sort_field").prop("disabled","disabled").empty().append("");var data={action:"gv_sortable_fields_form",nonce:gvGlobals.nonce};void 0!==context&&"preset"===context?data.template_id=id:data.form_id=vcfg.gvSelectForm.val(),$.post(ajaxurl,data,function(response){"false"!==response&&"0"!==response&&$("#gravityview_sort_field").empty().append(response).prop("disabled",null)})},switchView:function(e){e.preventDefault(),e.stopImmediatePropagation();var vcfg=viewConfiguration;vcfg.templateFilter("custom"),vcfg.toggleViewTypeMetabox()},templateFilter:function(templateType){$(".gv-view-types-module").each(function(){$(this).attr("data-filter")===templateType?$(this).parent().show():$(this).parent().hide()})},selectTemplate:function(e){var vcfg=viewConfiguration;e.preventDefault(),e.stopImmediatePropagation(),vcfg.wantedTemplate=$(this);var currTemplateId=$("#gravityview_directory_template").val(),selectedTemplateId=vcfg.wantedTemplate.attr("data-templateid");""===currTemplateId?($("#gravityview_select_template").slideUp(150),vcfg.selectTemplateContinue()):currTemplateId!==selectedTemplateId?vcfg.showDialog("#gravityview_switch_template_dialog"):(vcfg.toggleViewTypeMetabox(),vcfg.showViewConfig())},selectTemplateContinue:function(){var vcfg=viewConfiguration,selectedTemplateId=vcfg.wantedTemplate.attr("data-templateid");$("#gravityview_directory_template").val(selectedTemplateId).change();var $parent=vcfg.wantedTemplate.parents(".gv-view-types-module");$parent.parents(".gv-grid").find(".gv-view-types-module").removeClass("gv-selected"),$parent.addClass("gv-selected"),vcfg.startFreshStatus?(vcfg.getAvailableFields("preset",selectedTemplateId),vcfg.getPresetFields(selectedTemplateId),vcfg.getSortableFields("preset",selectedTemplateId)):(vcfg.updateActiveAreas(selectedTemplateId),$("a[href=#gv_switch_view]").fadeIn(150),vcfg.toggleViewTypeMetabox())},selectTemplateHover:function(e){e.preventDefault(),e.stopImmediatePropagation(),$(this).find('a[href="#gv_select_template"]').trigger("click")},openExternalLinks:function(){return window.open(this.href),!1},previewTemplate:function(e){e.preventDefault(),e.stopImmediatePropagation();var parent=$(event.currentTarget).parents(".gv-view-types-module");parent.find(".gv-template-preview").dialog({dialogClass:"wp-dialog gv-dialog",appendTo:$("#gravityview_select_template"),width:550,open:function(){$('
').prependTo("#wpwrap")},close:function(){$(this).dialog("option","appendTo",parent),$("#wpwrap > .gv-overlay").fadeOut("fast",function(){$(this).remove()})},closeOnEscape:!0,buttons:[{text:gvGlobals.label_close,click:function(){$(this).dialog("close")}}]})},updateActiveAreas:function(template){var vcfg=viewConfiguration;$("#directory-active-fields, #single-active-fields").children().remove();var data={action:"gv_get_active_areas",template_id:template,nonce:gvGlobals.nonce};$.post(ajaxurl,data,function(response){if(response){var content=$.parseJSON(response);$("#directory-header-widgets").html(content.header),$("#directory-footer-widgets").html(content.footer),$("#directory-active-fields").append(content.directory),$("#single-active-fields").append(content.single),vcfg.showViewConfig()}})},getPresetFields:function(template){var vcfg=viewConfiguration;$("#directory-active-fields, #single-active-fields").children().remove();var data={action:"gv_get_preset_fields",template_id:template,nonce:gvGlobals.nonce};$.post(ajaxurl,data,function(response){if(response){var content=$.parseJSON(response);$("#directory-header-widgets").html(content.header),$("#directory-footer-widgets").html(content.footer),$("#directory-active-fields").append(content.directory),$("#single-active-fields").append(content.single),vcfg.showViewConfig()}})},hideViewConfig:function(){$("#gravityview_view_config,#gravityview_sort_filter").slideUp(150),$(document).trigger("gv_admin_views_hideViewConfig")},showViewConfig:function(){$("#gravityview_view_config, #gravityview_sort_filter").slideDown(150),viewConfiguration.toggleDropMessage(),viewConfiguration.init_droppables(),viewConfiguration.init_tooltips(),$(document).trigger("gv_admin_views_showViewConfig")},init_tooltips:function(){$(".gv-add-field").tooltip({content:function(){var context=$(this).attr("data-context");switch($(this).attr("data-objecttype")){case"field":return $("#"+context+"-available-fields").html();case"widget":return $("#directory-available-widgets").html()}},close:function(){$(this).attr("data-tooltip",null)},open:function(){$(this).attr("data-tooltip","active").attr("data-tooltip-id",$(this).attr("aria-describedby"))},closeOnEscape:!0,disabled:!0,position:{my:"center bottom",at:"center top-12"},tooltipClass:"top"}).attr("title","").on("mouseout focusout",function(e){e.stopImmediatePropagation()}).click(function(e){$(this).attr("title",""),e.preventDefault(),$(this).tooltip("open")})},refreshGFtooltips:function(){$(".gf_tooltip").tooltip({show:500,hide:1e3,content:function(){return $(this).prop("title")}})},getAvailableFields:function(preset,templateid){var vcfg=viewConfiguration;$("#directory-available-fields, #single-available-fields, #edit-available-fields").find(".gv-fields").remove(),$("#directory-active-fields, #single-active-fields, #edit-active-fields").find(".gv-fields").remove(),vcfg.toggleDropMessage();var data={action:"gv_available_fields",nonce:gvGlobals.nonce,context:"directory"};void 0!==preset&&"preset"===preset?data.template_id=templateid:data.form_id=vcfg.gvSelectForm.val(),$.post(ajaxurl,data,function(response){response&&$("#directory-available-fields").append(response)}),data.context="single",$.post(ajaxurl,data,function(response){response&&$("#single-available-fields").append(response)}),data.context="edit",$.post(ajaxurl,data,function(response){response&&$("#edit-available-fields").append(response)})},startAddField:function(e){$(this).has(".field-id-all-fields").length?viewConfiguration.addAllFields($(this)):viewConfiguration.addField($(this),e)},addAllFields:function(clicked){clicked.siblings(".gv-fields").each(function(){$(this).trigger("click")}),$("a.gv-add-field[data-tooltip='active']").tooltip("close")},addField:function(clicked,e){e.preventDefault();var vcfg=viewConfiguration,newField=clicked.clone().hide(),areaId=clicked.parents(".ui-tooltip").attr("id"),templateId=$("#gravityview_directory_template").val(),tooltipId=clicked.parents(".ui-tooltip").attr("id"),addButton=$('a.gv-add-field[data-tooltip-id="'+tooltipId+'"]'),data={action:"gv_field_options",template:templateId,area:addButton.attr("data-areaid"),context:addButton.attr("data-context"),field_id:newField.attr("data-fieldid"),field_label:newField.find(".gv-field-label").attr("data-original-title"),field_type:addButton.attr("data-objecttype"),input_type:newField.attr("data-inputtype"),nonce:gvGlobals.nonce};$.ajax({type:"POST",url:ajaxurl,data:data,async:!0,beforeSend:function(){vcfg.disable_publish()},complete:function(){vcfg.enable_publish()}}).done(function(response){newField.append(response),$(".gv-dialog-options",newField).length>0&&$(".dashicons-admin-generic",newField).removeClass("hide-if-js"),$('a[data-tooltip-id="'+areaId+'"]').parents(".gv-droppable-area").find(".active-drop").append(newField).end().attr("data-tooltip-id",""),newField.fadeIn(100,function(){$(".all-merge-tags").remove(),"undefined"!=typeof form&&$("body").not(".gv-form-changed")&&(window.gfMergeTags=new gfMergeTagsObj(form))}),vcfg.refreshGFtooltips()}).fail(function(jqXHR){vcfg.enable_publish(),alert(gvGlobals.field_loaderror),console.log(jqXHR)}).always(function(){vcfg.toggleDropMessage()})},enable_publish:function(){$("#publishing-action #publish").prop("disabled",null).removeClass("button-primary-disabled")},disable_publish:function(){$("#publishing-action #publish").prop("disabled","disabled").addClass("button-primary-disabled")},init_droppables:function(){var vcfg=viewConfiguration;$("#directory-fields, #single-fields").find(".active-drop-widget").sortable({placeholder:"fields-placeholder",items:"> .gv-fields",distance:2,revert:75,connectWith:".active-drop-widget",receive:function(event,ui){var sender_area=ui.sender.attr("data-areaid"),receiver_area=$(this).attr("data-areaid");ui.item.find('[name^="widgets['+sender_area+']"]').each(function(){var name=$(this).attr("name");$(this).attr("name",name.replace(sender_area,receiver_area))}),vcfg.toggleDropMessage()}}),$("#directory-fields, #single-fields, #edit-fields").find(".active-drop-field").sortable({placeholder:"fields-placeholder",items:"> .gv-fields",distance:2,revert:75,connectWith:".active-drop-field",receive:function(event,ui){if(ui.item.find(".gv-dialog-options").length>0){var sender_area=ui.sender.attr("data-areaid"),receiver_area=$(this).attr("data-areaid");ui.item.find('[name^="fields['+sender_area+']"]').each(function(){var name=$(this).attr("name");$(this).attr("name",name.replace(sender_area,receiver_area))})}vcfg.toggleDropMessage()}})},toggleDropMessage:function(){$(".active-drop").each(function(){$(this).find(".gv-fields").length>0?$(this).find(".drop-message").hide():$(this).find(".drop-message").fadeIn(100)})},removeField:function(e){e.preventDefault();var vcfg=viewConfiguration,area=$(e.currentTarget).parents(".active-drop");if(e.altKey&&$(area).find(".gv-fields").length>1){var remove_all=window.confirm(gvGlobals.remove_all_fields);return void(remove_all&&($(area).find(".gv-fields").remove(),vcfg.toggleDropMessage()))}$(e.currentTarget).parents(".gv-fields").fadeOut("normal",function(){$(this).remove(),vcfg.toggleDropMessage()})},openFieldSettings:function(e){e.preventDefault();var parent,vcfg=viewConfiguration;parent=$(e.currentTarget).is(".gv-fields")?$(e.currentTarget):$(e.currentTarget).parents(".gv-fields"),vcfg.updateVisibilitySettings(e,!0),$("body").on("change",".gv-fields input:checkbox",vcfg.updateVisibilitySettings);var buttons=[{text:gvGlobals.label_close,click:function(){$(this).dialog("close")}}];vcfg.showDialog(parent.find(".gv-dialog-options"),buttons)},updateVisibilitySettings:function(e,first_run){var vcfg=viewConfiguration;first_run=first_run||!1;var $parent=$(e.currentTarget).is(".gv-fields")?$(e.currentTarget):$(e.currentTarget).parents(".gv-fields");vcfg.toggleVisibility($("input:checkbox[name*=show_label]",$parent),$("[name*=custom_label]",$parent),first_run),vcfg.toggleVisibility($("input:checkbox[name*=emailmailto]",$parent),$("[name*=emailsubject],[name*=emailbody]",$parent),first_run),vcfg.toggleVisibility($("input:checkbox[name*=link_to_source]",$parent),$("[name*=source_link_text]",$parent),first_run),$("input:checkbox",$parent).attr("disabled",null),$("input:checkbox[name*=show_as_link]",$parent).is(":checked")&&$("input:checkbox[name*=link_to_]",$parent).attr("disabled",!0),$("input:checkbox[name*=link_to_]:checked",$parent).length>0&&$("input:checkbox[name*=show_as_link]",$parent).attr("disabled",!0),vcfg.toggleVisibility($("input:checkbox[name*=only_loggedin]",$parent),$("[name*=only_loggedin_cap]",$parent),first_run)},toggleVisibility:function($checkbox,$toggled,first_run){var speed=first_run?0:"fast";$checkbox.is(":checked")?$toggled.parents(".gv-setting-container").fadeIn(speed):$toggled.parents(".gv-setting-container").fadeOut(speed)},processFormSubmit:function(e){var vcfg=viewConfiguration,templateId=$("#gravityview_directory_template").val();return vcfg.startFreshStatus?(vcfg.createPresetForm(e,templateId),!1):vcfg.startFreshStatus&&""!==templateId?!1:vcfg.serializeForm()},serializeForm:function(e){if($(e.target).data("gv-valid"))return!0;e.stopImmediatePropagation(),$(e.target).data("gv-valid",!1),$("#post input[name*=date_display]").val(function(){return $(this).val().replace(/[\\"']/g,"\\$&").replace(/\u0000/g,"\\0")});var $fields=$("#post :input[name^=fields]"),serialized_data=$fields.serialize();return $fields.remove(),$("#post").append($("",{name:"fields",value:serialized_data,type:"hidden"})),setTimeout(function(){$(e.target).data("gv-valid",!0).submit()},101),!1},createPresetForm:function(e,templateId){var vcfg=viewConfiguration;e.stopPropagation();var data={action:"gv_set_preset_form",template_id:templateId,nonce:gvGlobals.nonce};return $.ajax({type:"POST",url:ajaxurl,data:data,async:!1,success:function(response){"false"!==response&&"0"!==response?(vcfg.startFreshStatus=!1,vcfg.gvSelectForm.find("option:selected").removeAttr("selected").end().append(response),$(e.target).submit()):$("#post").before('

'+gvGlobals.label_publisherror+"

")}}),!1}},jQuery(document).ready(function($){$("#title-prompt-text").text(gvGlobals.label_viewname),viewConfiguration.init(),$(".gv-datepicker").datepicker({dateFormat:"yy-mm-dd",constrainInput:!1});var cookie_key="gv-active-tab-"+$("#post_ID").val(),activate_tab=$.cookie(cookie_key);"undefined"===activate_tab&&(activate_tab=0),$("#gv-view-configuration-tabs").tabs({active:activate_tab,activate:function(event,ui){$.cookie(cookie_key,ui.newTab.index(),{path:gvGlobals.cookiepath})}}),$("#gravityview_template_settings .form-table tr:even").addClass("alternate"),$("#gravityview_sort_filter").insertAfter($("#gravityview_view_config"))})}(jQuery); \ No newline at end of file From a9c614f0b00bd2a9a20460513e833d274ba50179 Mon Sep 17 00:00:00 2001 From: Luis Godinho Date: Mon, 23 Feb 2015 17:16:10 +0000 Subject: [PATCH 02/10] readme --- readme.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/readme.txt b/readme.txt index aa09c2c2e3..28f183f155 100644 --- a/readme.txt +++ b/readme.txt @@ -20,6 +20,9 @@ Beautifully display your Gravity Forms entries. Learn more on [GravityView.co](h == Changelog == += 1.6.2 on February 23 = +* Tweak: A more robust save View procedure to prevent losing fields configuration. + = 1.6.1 on February 17 = * Added: Allow Recent Entries to have an Embed Page ID * Fixed: # of Recent Entries not saving From b911e3c8e00d4c519fc291bdb1fa09c6be1e5584 Mon Sep 17 00:00:00 2001 From: Luis Godinho Date: Mon, 23 Feb 2015 17:22:44 +0000 Subject: [PATCH 03/10] Fixed multiple DataTables views in the same page --- includes/class-data.php | 5 ++++- readme.txt | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/includes/class-data.php b/includes/class-data.php index 8d13aa275a..981006e1a2 100644 --- a/includes/class-data.php +++ b/includes/class-data.php @@ -167,8 +167,11 @@ function add_view( $view_id, $atts = NULL ) { // Handle array of IDs if( is_array( $view_id ) ) { foreach( $view_id as $id ) { - return $this->add_view( $id, $atts ); + + $this->add_view( $id, $atts ); } + + return $this->views; } // The view has been set already; returning stored view. diff --git a/readme.txt b/readme.txt index 28f183f155..6093d744cf 100644 --- a/readme.txt +++ b/readme.txt @@ -22,6 +22,7 @@ Beautifully display your Gravity Forms entries. Learn more on [GravityView.co](h = 1.6.2 on February 23 = * Tweak: A more robust save View procedure to prevent losing fields configuration. +* Fixed: Issue when embedding multiple DataTables views in the same page = 1.6.1 on February 17 = * Added: Allow Recent Entries to have an Embed Page ID From 32a982356bcd3d8595e770cb794482d8e9ac806e Mon Sep 17 00:00:00 2001 From: Luis Godinho Date: Mon, 23 Feb 2015 17:53:26 +0000 Subject: [PATCH 04/10] new hook in the Custom Content field MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit “gravityview/fields/custom/content”. It will be useful to do: ``` add_filter( 'gravityview/fields/custom/content', 'my_gv_custom_content', 10, 2 ); function my_gv_custom_content( $content, $field_data ) { return apply_filters( 'the_content', $content ); } ``` --- readme.txt | 1 + templates/fields/custom.php | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/readme.txt b/readme.txt index 6093d744cf..ddb06e0587 100644 --- a/readme.txt +++ b/readme.txt @@ -21,6 +21,7 @@ Beautifully display your Gravity Forms entries. Learn more on [GravityView.co](h == Changelog == = 1.6.2 on February 23 = +* Added: A new hook in the Custom Content field to enable conditional logic or enable "the_content" WordPress filter which will trigger the Video embed * Tweak: A more robust save View procedure to prevent losing fields configuration. * Fixed: Issue when embedding multiple DataTables views in the same page diff --git a/templates/fields/custom.php b/templates/fields/custom.php index 8681085e3f..823f9383de 100644 --- a/templates/fields/custom.php +++ b/templates/fields/custom.php @@ -18,7 +18,11 @@ // Tell the renderer not to wrap this field in an anchor tag. $gravityview_view->field_data['field_settings']['show_as_link'] = false; -$field_settings['content'] = trim(rtrim($field_settings['content'])); +$field_settings['content'] = trim( rtrim( $field_settings['content'] ) ); + +// allow for custom content behavior +$field_settings['content'] = apply_filters( 'gravityview/fields/custom/content', $field_settings['content'], compact( 'field_settings', 'form', 'field_id', 'entry' ) ); + // No custom content if( empty( $field_settings['content'] ) ) { From 2b5d5d5e6ad5b441adb79efd9b13c0b21d0cff4b Mon Sep 17 00:00:00 2001 From: Luis Godinho Date: Mon, 23 Feb 2015 18:20:46 +0000 Subject: [PATCH 05/10] Split the custom content hook into two MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 'gravityview/fields/custom/content_before’ 'gravityview/fields/custom/content_after' --- readme.txt | 2 +- templates/fields/custom.php | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/readme.txt b/readme.txt index ddb06e0587..4350e7f8f4 100644 --- a/readme.txt +++ b/readme.txt @@ -21,7 +21,7 @@ Beautifully display your Gravity Forms entries. Learn more on [GravityView.co](h == Changelog == = 1.6.2 on February 23 = -* Added: A new hook in the Custom Content field to enable conditional logic or enable "the_content" WordPress filter which will trigger the Video embed +* Added: Two new hooks in the Custom Content field to enable conditional logic or enable "the_content" WordPress filter which will trigger the Video embed * Tweak: A more robust save View procedure to prevent losing fields configuration. * Fixed: Issue when embedding multiple DataTables views in the same page diff --git a/templates/fields/custom.php b/templates/fields/custom.php index 823f9383de..eaea34df57 100644 --- a/templates/fields/custom.php +++ b/templates/fields/custom.php @@ -18,11 +18,10 @@ // Tell the renderer not to wrap this field in an anchor tag. $gravityview_view->field_data['field_settings']['show_as_link'] = false; -$field_settings['content'] = trim( rtrim( $field_settings['content'] ) ); - -// allow for custom content behavior -$field_settings['content'] = apply_filters( 'gravityview/fields/custom/content', $field_settings['content'], compact( 'field_settings', 'form', 'field_id', 'entry' ) ); +// allow for custom content behavior before merge tags replacement +$field_settings['content'] = apply_filters( 'gravityview/fields/custom/content_before', $field_settings['content'], compact( 'field_settings', 'form', 'field_id', 'entry' ) ); +$field_settings['content'] = trim( rtrim( $field_settings['content'] ) ); // No custom content if( empty( $field_settings['content'] ) ) { @@ -39,6 +38,8 @@ } +$content = apply_filters( 'gravityview/fields/custom/content_after', $content, compact( 'field_settings', 'form', 'field_id', 'entry' ) ); + // Enqueue scripts needed for Gravity Form display, if form shortcode exists. // Also runs `do_shortcode()` echo GFCommon::gform_do_shortcode( $content ); From 93dc0a8316826fe7538f600d56f27106685e4d72 Mon Sep 17 00:00:00 2001 From: Luis Godinho Date: Mon, 23 Feb 2015 18:56:25 +0000 Subject: [PATCH 06/10] Remove the second arg. Get vars only if needed! --- templates/fields/custom.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/fields/custom.php b/templates/fields/custom.php index eaea34df57..b471aa913f 100644 --- a/templates/fields/custom.php +++ b/templates/fields/custom.php @@ -19,7 +19,7 @@ $gravityview_view->field_data['field_settings']['show_as_link'] = false; // allow for custom content behavior before merge tags replacement -$field_settings['content'] = apply_filters( 'gravityview/fields/custom/content_before', $field_settings['content'], compact( 'field_settings', 'form', 'field_id', 'entry' ) ); +$field_settings['content'] = apply_filters( 'gravityview/fields/custom/content_before', $field_settings['content'] ); $field_settings['content'] = trim( rtrim( $field_settings['content'] ) ); @@ -38,7 +38,7 @@ } -$content = apply_filters( 'gravityview/fields/custom/content_after', $content, compact( 'field_settings', 'form', 'field_id', 'entry' ) ); +$content = apply_filters( 'gravityview/fields/custom/content_after', $content ); // Enqueue scripts needed for Gravity Form display, if form shortcode exists. // Also runs `do_shortcode()` From 3b68b6352147e7f4832f232c436a46d14f3654ca Mon Sep 17 00:00:00 2001 From: Zack Katz Date: Mon, 23 Feb 2015 12:10:46 -0700 Subject: [PATCH 07/10] Update readme --- includes/class-admin-welcome.php | 7 +++++++ readme.txt | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/includes/class-admin-welcome.php b/includes/class-admin-welcome.php index 03549cb63e..1088b7f8d5 100644 --- a/includes/class-admin-welcome.php +++ b/includes/class-admin-welcome.php @@ -298,6 +298,13 @@ public function changelog_screen() {
+

Changes in 1.6.2 (Full List)

+
    +
  • Added: Two new hooks in the Custom Content field to enable conditional logic or enable the_content WordPress filter which will trigger the Video embed (read how)
    • +
  • Fixed: Issue when embedding multiple DataTables views in the same page
    • +
  • Tweak: A more robust "Save View" procedure to prevent losing field configuration on certain browsers
    • +
+

Changes in 1.6.1 (Full List)