From 6ab14308b74e222721da644a8d4561a45a41bb28 Mon Sep 17 00:00:00 2001 From: Philipp Schreiber Date: Fri, 9 Aug 2013 21:05:59 +0200 Subject: [PATCH 01/15] Always create new media frame to allow multiple upload fields. --- js/custom-metadata-manager.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/js/custom-metadata-manager.js b/js/custom-metadata-manager.js index f1b17b3..046d9d9 100644 --- a/js/custom-metadata-manager.js +++ b/js/custom-metadata-manager.js @@ -105,12 +105,6 @@ var $this = $(this), $this_field = $this.parent(); - // if the media frame already exists, reopen it. - if ( custom_metadata_file_frame ) { - custom_metadata_file_frame.open(); - return; - } - custom_metadata_file_frame = wp.media.frames.file_frame = wp.media({ title: $this.data( 'uploader-title' ), button: { From 61164d211ee36d329390d980e8323a12ed62a6a0 Mon Sep 17 00:00:00 2001 From: Philipp Schreiber Date: Mon, 12 Aug 2013 00:15:00 +0200 Subject: [PATCH 02/15] Adds field id to display_callback function call to allow custom fields in multifield --- custom_metadata.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom_metadata.php b/custom_metadata.php index dad4b6a..7b05c73 100644 --- a/custom_metadata.php +++ b/custom_metadata.php @@ -1143,7 +1143,7 @@ function _display_metadata_field( $field_slug, $field, $object_type, $object_id, $callback = $field->display_callback; if ( $callback && is_callable( $callback ) ) { - call_user_func( $callback, $field_slug, $field, $object_type, $object_id, $value ); + call_user_func( $callback, $field_slug, $field, $object_type, $object_id, $field_id, $value ); return; } From 3151ea3a90da0cc8a85cfba2b662b095fd064000 Mon Sep 17 00:00:00 2001 From: Philipp Schreiber Date: Thu, 20 Feb 2014 14:07:08 +0100 Subject: [PATCH 03/15] Improves multifield cloning / add new feature --- css/custom-metadata-manager.css | 63 +++++++++++++++----------- custom_metadata.php | 23 +++++++--- js/custom-metadata-manager.js | 80 +++++++++++++++++++++++---------- 3 files changed, 110 insertions(+), 56 deletions(-) diff --git a/css/custom-metadata-manager.css b/css/custom-metadata-manager.css index 7215e16..571d4f5 100644 --- a/css/custom-metadata-manager.css +++ b/css/custom-metadata-manager.css @@ -173,6 +173,20 @@ .custom-metadata-multifield { padding-top: 5px; } + +.custom-metadata-multifield-label-wrapper { + padding-bottom: 5px; +} + +.custom-metadata-multifield-label-wrapper h2 { + float: left; +} + +.custom-metadata-multifield-label-wrapper a { + float: right; +} + + #poststuff .custom-metadata-multifield h2 { margin: 0; } @@ -197,36 +211,31 @@ width: 150px; } -.custom-metadata-multifield-clone, -.custom-metadata-multifield-delete { - position: absolute; - display: block; - top: 50%; - right: 25px; - padding: 0 3px 4px; - font-size: 35px; - line-height: 20px; - text-decoration: none; - border: 1px solid; - border-radius: 50%; -} -.custom-metadata-multifield-clone { - margin-top: -17px; - color: green; - border-color: green; -} -.custom-metadata-multifield-delete ~ .custom-metadata-multifield-clone { - margin-top: -35px; +.custom-metadata-multifield-grouping .custom-metadata-multifield-fields { + float: left; +} + +.custom-metadata-multifield-grouping .custom-metadata-multifield-actions { + float: right; + width: 100px; + padding-top: 30px; + text-align: right; } + +.custom-metadata-multifield-grouping .custom-metadata-multifield-actions a { + margin-bottom: 5px; +} + .custom-metadata-multifield-delete { - margin-top: 17px; - padding: 1px 6px 4px; - color: red; - border-color: red; + display: inline-block; + color: #f00; + border-bottom-color: #f00; + margin-right: 3px; } -.custom-metadata-multifield-clone:hover, -.custom-metadata-multifield-clone:active, + .custom-metadata-multifield-delete:hover, .custom-metadata-multifield-delete:active { - border-color: #d54e21; + color: #fff; + background-color: #f00; + border-bottom-color: #f00; } \ No newline at end of file diff --git a/custom_metadata.php b/custom_metadata.php index 7b05c73..9af428e 100644 --- a/custom_metadata.php +++ b/custom_metadata.php @@ -1086,14 +1086,22 @@ function _metadata_column_content( $field_slug, $field, $object_type, $object_id function _display_metadata_multifield( $slug, $multifield, $object_type, $object_id ) { echo '
'; + echo '
'; if ( ! empty( $multifield->label ) ) { printf( '

%s

', esc_html( $multifield->label ) ); } + printf( '%s', __( 'Add new' ), __( 'Add new' ) ); + + echo '
'; + if ( ! empty( $multifield->description ) ) { printf( '

%s

', esc_html( $multifield->description ) ); } + echo '
'; + + $fields = $this->get_fields_in_multifield( $multifield->group, $slug, $object_type ); // validate/weed out the fields that can't be part of mulitified @@ -1111,19 +1119,22 @@ function _display_metadata_multifield( $slug, $multifield, $object_type, $object $grouping_count++; $grouping_id = $slug . '-' . $grouping_count; printf( '
', esc_attr( $grouping_id ) ); + echo '
'; foreach ( $fields as $field_slug => $field ) { $value = ( isset( $grouping_of_values[$field_slug] ) ) ? $grouping_of_values[$field_slug] : false; $field_id = $slug . '[' . ( $grouping_count - 1 ) . ']' . '[' . $field_slug . ']'; $display_field_slug = $field_slug . '-' . $grouping_count; $this->_display_metadata_field( $display_field_slug, $field, $object_type, $object_id, $field_id, $value ); } - echo '
'; - printf( '+', __( 'duplicate this set of fields' ) ); - - if ( $grouping_count > 1 ) { - printf( '-', __( 'remove this set of fields' ) ); - } + echo '
'; + echo '
'; + + printf( '%s', __( 'duplicate this set of fields' ), __( 'Clone' ) ); + printf( '%s', __( 'remove this set of fields' ), __( 'Delete' ) ); + + echo '
'; + echo '
'; echo '
'; } diff --git a/js/custom-metadata-manager.js b/js/custom-metadata-manager.js index 046d9d9..8379225 100644 --- a/js/custom-metadata-manager.js +++ b/js/custom-metadata-manager.js @@ -34,19 +34,12 @@ }); }); - // cloning multifields - $custom_metadata_multifield.on( 'click.custom_metadata', '.custom-metadata-multifield-clone', function(e){ - e.preventDefault(); - var $this = $( this ), - $parent = $this.parent().parent(), - $slug = $parent.attr( 'data-slug' ), - $last = $this.parent(), - $clone = $last.clone(); + // reset field names, container ids, etc + var multifield_after_change = function( $container ) { + var $slug = $container.attr( 'data-slug' ), + $groupings = $container.find('.custom-metadata-multifield-grouping'); - $clone.find( ':input:not(:button)' ).val(''); - $clone.insertAfter( $last ).hide(); - - $groupings = $parent.find('.custom-metadata-multifield-grouping'); + $groupings = $container.find('.custom-metadata-multifield-grouping'); $.each( $groupings, function( i, grouping ){ @@ -83,6 +76,37 @@ }); }); + }; + + // adding multifields + $custom_metadata_multifield.on( 'click.custom_metadata', '.custom-metadata-multifield-add', function(e){ + e.preventDefault(); + var $this = $( this ), + $container = $this.parents('.custom-metadata-multifield'), + $elements = $container.find('.custom-metadata-multifield-grouping'), + $element_to_clone = $elements.first(), + $clone = $element_to_clone.clone(); + + $clone.find( ':input:not(:button)' ).val(''); + $clone.insertAfter( $elements.last() ).hide(); + + multifield_after_change( $container ); + + $clone.fadeIn(); + + }); + + // cloning multifields + $custom_metadata_multifield.on( 'click.custom_metadata', '.custom-metadata-multifield-clone', function(e){ + e.preventDefault(); + var $this = $( this ), + $parent = $this.parents('.custom-metadata-multifield-grouping'), + $container = $this.parents('.custom-metadata-multifield'), + $clone = $parent.clone(); + + $clone.insertAfter( $parent ).hide(); + + multifield_after_change( $container ); $clone.fadeIn(); @@ -91,9 +115,13 @@ // deleting multifields $custom_metadata_multifield.on( 'click.custom_metadata', '.custom-metadata-multifield-delete', function(e){ e.preventDefault(); - var $this = $( this ); - $this.parent().fadeOut('normal', function(){ + var $this = $( this ), + $parent = $this.parents('.custom-metadata-multifield-grouping'), + $container = $this.parents('.custom-metadata-multifield'); + + $parent.fadeOut('normal', function(){ $(this).remove(); + multifield_after_change( $container ); }); }); @@ -103,15 +131,21 @@ e.preventDefault(); var $this = $(this), - $this_field = $this.parent(); + $this_field = $this.parent(); + + // if the media frame doesn't exist yet, create it + if ( ! custom_metadata_file_frame ) { + custom_metadata_file_frame = wp.media.frames.file_frame = wp.media({ + title: $this.data( 'uploader-title' ), + button: { + text: $this.data( 'uploader-button-text' ) + }, + multiple: false + }); + } - custom_metadata_file_frame = wp.media.frames.file_frame = wp.media({ - title: $this.data( 'uploader-title' ), - button: { - text: $this.data( 'uploader-button-text' ) - }, - multiple: false - }); + // unbind prior events first + custom_metadata_file_frame.off( 'select' ); custom_metadata_file_frame.on( 'select', function() { attachment = custom_metadata_file_frame.state().get( 'selection' ).first().toJSON(); @@ -187,7 +221,7 @@ // select2 $custom_metadata_field.find( '.custom-metadata-select2' ).each(function(index) { - $(this).select2(); + $(this).select2({ placeholder : $(this).attr('data-placeholder'), allowClear : true }); }); }); From 3b0999898faffc86d25798aa000763d5609ec597 Mon Sep 17 00:00:00 2001 From: Philipp Schreiber Date: Thu, 20 Feb 2014 14:14:27 +0100 Subject: [PATCH 04/15] Changes variable names, adds possibility to delete first element Deletion of first element clears values instead if deleting the container --- js/custom-metadata-manager.js | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/js/custom-metadata-manager.js b/js/custom-metadata-manager.js index 8379225..acc238e 100644 --- a/js/custom-metadata-manager.js +++ b/js/custom-metadata-manager.js @@ -100,11 +100,11 @@ $custom_metadata_multifield.on( 'click.custom_metadata', '.custom-metadata-multifield-clone', function(e){ e.preventDefault(); var $this = $( this ), - $parent = $this.parents('.custom-metadata-multifield-grouping'), + $element_to_clone = $this.parents('.custom-metadata-multifield-grouping'), $container = $this.parents('.custom-metadata-multifield'), - $clone = $parent.clone(); + $clone = $element_to_clone.clone(); - $clone.insertAfter( $parent ).hide(); + $clone.insertAfter( $element_to_clone ).hide(); multifield_after_change( $container ); @@ -116,13 +116,17 @@ $custom_metadata_multifield.on( 'click.custom_metadata', '.custom-metadata-multifield-delete', function(e){ e.preventDefault(); var $this = $( this ), - $parent = $this.parents('.custom-metadata-multifield-grouping'), + $element_to_delete = $this.parents('.custom-metadata-multifield-grouping'), $container = $this.parents('.custom-metadata-multifield'); - $parent.fadeOut('normal', function(){ - $(this).remove(); - multifield_after_change( $container ); - }); + if( $container.find('.custom-metadata-multifield-grouping').length === 1 ) { + $element_to_delete.find( ':input:not(:button)' ).val(''); + } else { + $element_to_delete.fadeOut('normal', function(){ + $(this).remove(); + multifield_after_change( $container ); + }); + } }); // init upload fields From 84bff17aa77a23f65fbc04b0b95cdeda21db9319 Mon Sep 17 00:00:00 2001 From: Philipp Schreiber Date: Thu, 20 Feb 2014 15:19:59 +0100 Subject: [PATCH 05/15] Adds sortable functionality --- css/custom-metadata-manager.css | 15 +++++- css/images/move-drag-icon.png | Bin 0 -> 1093 bytes custom_metadata.php | 1 + js/custom-metadata-manager.js | 10 ++++ js/jquery.sortable.js | 85 ++++++++++++++++++++++++++++++++ 5 files changed, 110 insertions(+), 1 deletion(-) create mode 100644 css/images/move-drag-icon.png create mode 100644 js/jquery.sortable.js diff --git a/css/custom-metadata-manager.css b/css/custom-metadata-manager.css index 571d4f5..ea1e676 100644 --- a/css/custom-metadata-manager.css +++ b/css/custom-metadata-manager.css @@ -192,10 +192,12 @@ } .custom-metadata-multifield-grouping { border-top: 1px dashed #ccc; + background: #f5f5f5; padding: 5px 0; margin: 2px; position: relative; } + .custom-metadata-multifield-grouping .custom-metadata-field { float: left; width: auto; @@ -211,6 +213,17 @@ width: 150px; } +.custom-metadata-multifield-grouping .sort-handle { + float: left; + width: 30px; + height: 23px; + background: url(images/move-drag-icon.png) no-repeat; + background-size: 30px 23px; + margin-top: 31px; + margin-right: 10px; + cursor: move; +} + .custom-metadata-multifield-grouping .custom-metadata-multifield-fields { float: left; } @@ -218,7 +231,7 @@ .custom-metadata-multifield-grouping .custom-metadata-multifield-actions { float: right; width: 100px; - padding-top: 30px; + padding-top: 15px; text-align: right; } diff --git a/css/images/move-drag-icon.png b/css/images/move-drag-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..9a90b9afcfc7f8c3db6730efbfda4e58a72792d0 GIT binary patch literal 1093 zcmbVL&1=*^6yGAPwbDO8!7`>jRA@eClWjL)x22nG?LxPf?TQOtoJ}U(uuUc=({6S_ zutg{qQS=WGFMeF~BIrTzE zbaE(>NDLR|jS^ck?BfRq*#GDH-~wAt(0qk16Pq?rfD^M8sbWxY(F!hMWHm3p#SC#I zbjlT4DK2OxaRn6H2$AbEG$Wjed}P)!1y#J_cvB1IMQh@j%Ros$`93ITmRr1=lYY_ldo*TPRjC zF+#ow1xa+>IIp&KNK5!n7zbL1<))9t5)R2)V6ykHM|)sayTcvDhAbNGT;Q-rL8}Ha z*Iew;f|2FejbJ&JmbO!pr9jNvmMQUyl$QDQq>TA0vZ}U?unpm4kLMt~q2zM8{G6gD zQ#lCpa#~fGqUY1HuE^>v>|qODNRemao^OZw?qcObv6>!WL`hI4WVP1?OEp4CSR+2r zbueB;rsKu?Gw~aBQZ{hltYd2~ATDSZS#u5u;NOz(;I02Hp2&g{<4*ajb9zUt9bq_S8Mq8er8acn!QEz?!e0Ml=Luo^#-J27A Y1Bp*x`ge|I_DDR~h5VxNBzI}^H&2UQ2mk;8 literal 0 HcmV?d00001 diff --git a/custom_metadata.php b/custom_metadata.php index 9af428e..52c4573 100644 --- a/custom_metadata.php +++ b/custom_metadata.php @@ -1119,6 +1119,7 @@ function _display_metadata_multifield( $slug, $multifield, $object_type, $object $grouping_count++; $grouping_id = $slug . '-' . $grouping_count; printf( '
', esc_attr( $grouping_id ) ); + echo '
'; echo '
'; foreach ( $fields as $field_slug => $field ) { $value = ( isset( $grouping_of_values[$field_slug] ) ) ? $grouping_of_values[$field_slug] : false; diff --git a/js/custom-metadata-manager.js b/js/custom-metadata-manager.js index acc238e..680179d 100644 --- a/js/custom-metadata-manager.js +++ b/js/custom-metadata-manager.js @@ -78,6 +78,16 @@ }); }; + // Adds sortable functionality to multifields + $('.custom-metadata-multifield').sortable({ + items: '.custom-metadata-multifield-grouping', + handle: '.sort-handle' + }); + + $('.custom-metadata-multifield').sortable().bind('sortupdate', function(e) { + multifield_after_change( $(this) ); + }); + // adding multifields $custom_metadata_multifield.on( 'click.custom_metadata', '.custom-metadata-multifield-add', function(e){ e.preventDefault(); diff --git a/js/jquery.sortable.js b/js/jquery.sortable.js new file mode 100644 index 0000000..350d172 --- /dev/null +++ b/js/jquery.sortable.js @@ -0,0 +1,85 @@ +/* + * HTML5 Sortable jQuery Plugin + * http://farhadi.ir/projects/html5sortable + * + * Copyright 2012, Ali Farhadi + * Released under the MIT license. + */ +(function($) { +var dragging, placeholders = $(); +$.fn.sortable = function(options) { + var method = String(options); + options = $.extend({ + connectWith: false + }, options); + return this.each(function() { + if (/^enable|disable|destroy$/.test(method)) { + var items = $(this).children($(this).data('items')).attr('draggable', method == 'enable'); + if (method == 'destroy') { + items.add(this).removeData('connectWith items') + .off('dragstart.h5s dragend.h5s selectstart.h5s dragover.h5s dragenter.h5s drop.h5s'); + } + return; + } + var isHandle, index, items = $(this).children(options.items); + var placeholder = $('<' + (/^ul|ol$/i.test(this.tagName) ? 'li' : 'div') + ' class="sortable-placeholder">'); + items.find(options.handle).mousedown(function() { + isHandle = true; + }).mouseup(function() { + isHandle = false; + }); + $(this).data('items', options.items) + placeholders = placeholders.add(placeholder); + if (options.connectWith) { + $(options.connectWith).add(this).data('connectWith', options.connectWith); + } + items.attr('draggable', 'true').on('dragstart.h5s', function(e) { + if (options.handle && !isHandle) { + return false; + } + isHandle = false; + var dt = e.originalEvent.dataTransfer; + dt.effectAllowed = 'move'; + dt.setData('Text', 'dummy'); + index = (dragging = $(this)).addClass('sortable-dragging').index(); + }).on('dragend.h5s', function() { + if (!dragging) { + return; + } + dragging.removeClass('sortable-dragging').show(); + placeholders.detach(); + if (index != dragging.index()) { + dragging.parent().trigger('sortupdate', {item: dragging}); + } + dragging = null; + }).not('a[href], img').on('selectstart.h5s', function() { + this.dragDrop && this.dragDrop(); + return false; + }).end().add([this, placeholder]).on('dragover.h5s dragenter.h5s drop.h5s', function(e) { + if (!items.is(dragging) && options.connectWith !== $(dragging).parent().data('connectWith')) { + return true; + } + if (e.type == 'drop') { + e.stopPropagation(); + placeholders.filter(':visible').after(dragging); + dragging.trigger('dragend.h5s'); + return false; + } + e.preventDefault(); + e.originalEvent.dataTransfer.dropEffect = 'move'; + if (items.is(this)) { + if (options.forcePlaceholderSize) { + placeholder.height(dragging.outerHeight()); + } + dragging.hide(); + $(this)[placeholder.index() < $(this).index() ? 'after' : 'before'](placeholder); + placeholders.not(placeholder).detach(); + } else if (!placeholders.is(this) && !$(this).children(options.items).length) { + placeholders.detach(); + $(this).append(placeholder); + } + return false; + }); + }); +}; +})(jQuery); From 6811c629dd111ee22a7bfec74960db3d5be94dd6 Mon Sep 17 00:00:00 2001 From: Philipp Schreiber Date: Thu, 20 Feb 2014 19:09:07 +0100 Subject: [PATCH 06/15] Changes on multifield - Moves multifield handling to the end of the file - Allows more multifield field_types - Removes background colors - upload and link fields are working on multifield - datepickers, datetimepickers and timepickers are working on multifield --- css/custom-metadata-manager.css | 1 - custom_metadata.php | 2 +- js/custom-metadata-manager.js | 260 +++++++++++++++++++------------- 3 files changed, 160 insertions(+), 103 deletions(-) diff --git a/css/custom-metadata-manager.css b/css/custom-metadata-manager.css index ea1e676..ffc6a93 100644 --- a/css/custom-metadata-manager.css +++ b/css/custom-metadata-manager.css @@ -192,7 +192,6 @@ } .custom-metadata-multifield-grouping { border-top: 1px dashed #ccc; - background: #f5f5f5; padding: 5px 0; margin: 2px; position: relative; diff --git a/custom_metadata.php b/custom_metadata.php index 52c4573..2ca525b 100644 --- a/custom_metadata.php +++ b/custom_metadata.php @@ -67,7 +67,7 @@ class custom_metadata_manager { // field types that support being part of a multifield group // @todo: workarounds needed for other field types - var $_field_types_that_support_multifield = array( 'text', 'textarea', 'password', 'number', 'email', 'tel', 'select' ); + var $_field_types_that_support_multifield = array( 'text', 'textarea', 'password', 'number', 'email', 'tel', 'select', 'checkbox', 'datepicker', 'datetimepicker', 'timepicker', 'link', 'upload' ); // taxonomy types var $_taxonomy_fields = array( 'taxonomy_select', 'taxonomy_radio', 'taxonomy_checkbox', 'taxonomy_multi_select' ); diff --git a/js/custom-metadata-manager.js b/js/custom-metadata-manager.js index 680179d..77b9336 100644 --- a/js/custom-metadata-manager.js +++ b/js/custom-metadata-manager.js @@ -10,6 +10,61 @@ }); }; + var destroy_date_pickers = function( ) { + var $datepickers = $( '.custom-metadata-field.datepicker input' ), + $datetimepickers = $( '.custom-metadata-field.datetimepicker input' ), + $timepickers = $( '.custom-metadata-field.timepicker input' ); + + $datepickers.each(function() { + var $this = $(this); + if( $this.hasClass('hasDatepicker') ) { + $this.datepicker( 'destroy' ); + $this.removeClass('hasDatepicker'); + } + }); + + $datetimepickers.each(function() { + var $this = $(this); + if( $this.hasClass('hasDatepicker') ) { + $this.datetimepicker( 'destroy' ); + $this.removeClass('hasDatepicker'); + } + }); + + $timepickers.each(function() { + var $this = $(this); + if( $this.hasClass('hasDatepicker') ) { + $this.timepicker( 'destroy' ); + $this.removeClass('hasDatepicker'); + } + }); + }; + + var bind_date_pickers = function() { + + var $datepickers = $( '.custom-metadata-field.datepicker input' ), + $datetimepickers = $( '.custom-metadata-field.datetimepicker input' ), + $timepickers = $( '.custom-metadata-field.timepicker input' ); + + // init the datepicker fields + $datepickers.datepicker({ + changeMonth: true, + changeYear: true + }); + + // init the datetimepicker fields + $datetimepickers.datetimepicker({ + changeMonth: true, + changeYear: true + }); + + // init the timepicker fields + $timepickers.timepicker({ + changeMonth: true, + changeYear: true + }); + }; + // duplicating fields $custom_metadata_field.on( 'click.custom_metadata', '.add-multiple', function(e){ e.preventDefault(); @@ -34,6 +89,97 @@ }); }); + // init upload fields + var custom_metadata_file_frame; + $custom_metadata_field.on( 'click.custom_metadata', '.custom-metadata-upload-button', function(e) { + e.preventDefault(); + + var $this = $(this), + $this_field = $this.parent(); + + // if the media frame doesn't exist yet, create it + if ( ! custom_metadata_file_frame ) { + custom_metadata_file_frame = wp.media.frames.file_frame = wp.media({ + title: $this.data( 'uploader-title' ), + button: { + text: $this.data( 'uploader-button-text' ) + }, + multiple: false + }); + } + + // unbind prior events first + custom_metadata_file_frame.off( 'select' ); + + custom_metadata_file_frame.on( 'select', function() { + attachment = custom_metadata_file_frame.state().get( 'selection' ).first().toJSON(); + $this_field.find( '.custom-metadata-upload-url' ).val( attachment.url ); + $this_field.find( '.custom-metadata-upload-id' ).val( attachment.id ); + }); + + custom_metadata_file_frame.open(); + }); + + $custom_metadata_field.on( 'click.custom_metadata', '.custom-metadata-clear-button', function(e){ + e.preventDefault(); + var $this = $(this), + $this_field = $this.parent(); + $this_field.find( 'input:not( [type=button] )' ).val( '' ); + }); + + // init link fields + var custom_metadata_link_selector_is_open = false; + var custom_metadata_link_selector_target = null; + + $custom_metadata_field.on( 'click.custom_metadata', '.custom-metadata-link-button', function(e){ + alert('test'); + }); + $custom_metadata_field.on( 'click.custom_metadata', '.custom-metadata-link-button', function(e){ + e.preventDefault(); + custom_metadata_link_selector_is_open = true; + custom_metadata_link_selector_target = $(this).parent().find( 'input[type="text"]' ); + wpActiveEditor = true; + wpLink.open(); + var $wp_link = $( '#wp-link' ); + wpLink.textarea = custom_metadata_link_selector_target; + $wp_link.find( '.link-target' ).remove(); // remove the "new tab" checkbox + $wp_link.find( '#link-title-field' ).parents( '#link-options div' ).remove(); // remove the "title" field + }); + + $(document).on( 'click.custom_metadata', '#wp-link-submit', function(e){ + e.preventDefault(); + if ( null === custom_metadata_link_selector_target) + return; + + var linkAtts = wpLink.getAttrs(); + custom_metadata_link_selector_target.val(linkAtts.href); + wpLink.textarea = custom_metadata_link_selector_target; + wpLink.close(); + custom_metadata_link_selector_target = null; + }); + + $(document).on( 'click.custom_metadata', '#wp-link-cancel, .ui-dialog-titlebar-close', function(e){ + e.preventDefault(); + if ( null === custom_metadata_link_selector_target) + return; + + wpLink.textarea = custom_metadata_link_selector_target; + wpLink.close(); + custom_metadata_link_selector_target = null; + custom_metadata_link_selector_is_open = false; + }); + + // First initialization of datepickers + bind_date_pickers(); + + // select2 + $custom_metadata_field.find( '.custom-metadata-select2' ).each(function(index) { + $(this).select2({ placeholder : $(this).attr('data-placeholder'), allowClear : true }); + }); + + + /* MULTIFIELDS */ + // reset field names, container ids, etc var multifield_after_change = function( $container ) { var $slug = $container.attr( 'data-slug' ), @@ -91,16 +237,20 @@ // adding multifields $custom_metadata_multifield.on( 'click.custom_metadata', '.custom-metadata-multifield-add', function(e){ e.preventDefault(); + + destroy_date_pickers(); + var $this = $( this ), $container = $this.parents('.custom-metadata-multifield'), $elements = $container.find('.custom-metadata-multifield-grouping'), $element_to_clone = $elements.first(), - $clone = $element_to_clone.clone(); + $clone = $element_to_clone.clone(true); $clone.find( ':input:not(:button)' ).val(''); $clone.insertAfter( $elements.last() ).hide(); multifield_after_change( $container ); + bind_date_pickers(); $clone.fadeIn(); @@ -108,15 +258,20 @@ // cloning multifields $custom_metadata_multifield.on( 'click.custom_metadata', '.custom-metadata-multifield-clone', function(e){ + e.preventDefault(); + + destroy_date_pickers(); + var $this = $( this ), $element_to_clone = $this.parents('.custom-metadata-multifield-grouping'), $container = $this.parents('.custom-metadata-multifield'), - $clone = $element_to_clone.clone(); + $clone = $element_to_clone.clone(true); $clone.insertAfter( $element_to_clone ).hide(); multifield_after_change( $container ); + bind_date_pickers(); $clone.fadeIn(); @@ -125,6 +280,7 @@ // deleting multifields $custom_metadata_multifield.on( 'click.custom_metadata', '.custom-metadata-multifield-delete', function(e){ e.preventDefault(); + destroy_date_pickers(); var $this = $( this ), $element_to_delete = $this.parents('.custom-metadata-multifield-grouping'), $container = $this.parents('.custom-metadata-multifield'); @@ -137,105 +293,7 @@ multifield_after_change( $container ); }); } - }); - - // init upload fields - var custom_metadata_file_frame; - $custom_metadata_field.on( 'click.custom_metadata', '.custom-metadata-upload-button', function(e) { - e.preventDefault(); - - var $this = $(this), - $this_field = $this.parent(); - - // if the media frame doesn't exist yet, create it - if ( ! custom_metadata_file_frame ) { - custom_metadata_file_frame = wp.media.frames.file_frame = wp.media({ - title: $this.data( 'uploader-title' ), - button: { - text: $this.data( 'uploader-button-text' ) - }, - multiple: false - }); - } - - // unbind prior events first - custom_metadata_file_frame.off( 'select' ); - - custom_metadata_file_frame.on( 'select', function() { - attachment = custom_metadata_file_frame.state().get( 'selection' ).first().toJSON(); - $this_field.find( '.custom-metadata-upload-url' ).val( attachment.url ); - $this_field.find( '.custom-metadata-upload-id' ).val( attachment.id ); - }); - - custom_metadata_file_frame.open(); - }); - - $custom_metadata_field.on( 'click.custom_metadata', '.custom-metadata-clear-button', function(e){ - e.preventDefault(); - var $this = $(this), - $this_field = $this.parent(); - $this_field.find( 'input:not( [type=button] )' ).val( '' ); - }); - - // init link fields - var custom_metadata_link_selector_is_open = false; - var custom_metadata_link_selector_target = null; - $custom_metadata_field.on( 'click.custom_metadata', '.custom-metadata-link-button', function(e){ - e.preventDefault(); - custom_metadata_link_selector_is_open = true; - custom_metadata_link_selector_target = $(this).parent().find( 'input[type="text"]' ); - wpActiveEditor = true; - wpLink.open(); - var $wp_link = $( '#wp-link' ); - wpLink.textarea = custom_metadata_link_selector_target; - $wp_link.find( '.link-target' ).remove(); // remove the "new tab" checkbox - $wp_link.find( '#link-title-field' ).parents( '#link-options div' ).remove(); // remove the "title" field - }); - - $(document).on( 'click.custom_metadata', '#wp-link-submit', function(e){ - e.preventDefault(); - if ( null === custom_metadata_link_selector_target) - return; - - var linkAtts = wpLink.getAttrs(); - custom_metadata_link_selector_target.val(linkAtts.href); - wpLink.textarea = custom_metadata_link_selector_target; - wpLink.close(); - custom_metadata_link_selector_target = null; - }); - - $(document).on( 'click.custom_metadata', '#wp-link-cancel, .ui-dialog-titlebar-close', function(e){ - e.preventDefault(); - if ( null === custom_metadata_link_selector_target) - return; - - wpLink.textarea = custom_metadata_link_selector_target; - wpLink.close(); - custom_metadata_link_selector_target = null; - custom_metadata_link_selector_is_open = false; - }); - - // init the datepicker fields - $( '.custom-metadata-field.datepicker' ).find( 'input' ).datepicker({ - changeMonth: true, - changeYear: true - }); - - // init the datetimepicker fields - $( '.custom-metadata-field.datetimepicker' ).find( 'input' ).datetimepicker({ - changeMonth: true, - changeYear: true - }); - - // init the timepicker fields - $( '.custom-metadata-field.timepicker' ).find( 'input' ).timepicker({ - changeMonth: true, - changeYear: true - }); - - // select2 - $custom_metadata_field.find( '.custom-metadata-select2' ).each(function(index) { - $(this).select2({ placeholder : $(this).attr('data-placeholder'), allowClear : true }); + bind_date_pickers(); }); }); From 888f4a6194e2e22a0c9e722e701ddd3e31b87fbb Mon Sep 17 00:00:00 2001 From: Philipp Schreiber Date: Thu, 20 Feb 2014 22:43:08 +0100 Subject: [PATCH 07/15] Small style fixes --- css/custom-metadata-manager.css | 15 ++++++++++++--- custom_metadata.php | 8 ++++---- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/css/custom-metadata-manager.css b/css/custom-metadata-manager.css index ffc6a93..e6e3b68 100644 --- a/css/custom-metadata-manager.css +++ b/css/custom-metadata-manager.css @@ -171,7 +171,7 @@ /* multifields */ .custom-metadata-multifield { - padding-top: 5px; + padding-top: 15px; } .custom-metadata-multifield-label-wrapper { @@ -180,10 +180,19 @@ .custom-metadata-multifield-label-wrapper h2 { float: left; + margin-top: 3px; + line-height: 1; } -.custom-metadata-multifield-label-wrapper a { +.custom-metadata-multifield-label-wrapper p.description { + float: left; + margin-left: 10px; + margin-bottom: 0; +} + +.custom-metadata-multifield-label-wrapper a.custom-metadata-multifield-add { float: right; + margin-top: -3px; } @@ -230,7 +239,7 @@ .custom-metadata-multifield-grouping .custom-metadata-multifield-actions { float: right; width: 100px; - padding-top: 15px; + padding-top: 30px; text-align: right; } diff --git a/custom_metadata.php b/custom_metadata.php index 2ca525b..b7679df 100644 --- a/custom_metadata.php +++ b/custom_metadata.php @@ -1091,14 +1091,14 @@ function _display_metadata_multifield( $slug, $multifield, $object_type, $object printf( '

%s

', esc_html( $multifield->label ) ); } - printf( '%s', __( 'Add new' ), __( 'Add new' ) ); - - echo '
'; - if ( ! empty( $multifield->description ) ) { printf( '

%s

', esc_html( $multifield->description ) ); } + printf( '%s', __( 'Add new' ), __( 'Add new' ) ); + + echo '
'; + echo '
'; From 3a787130cecd9e0c229ffc9ede41e1d0d58e99ae Mon Sep 17 00:00:00 2001 From: Philipp Schreiber Date: Thu, 20 Feb 2014 22:59:30 +0100 Subject: [PATCH 08/15] Small style fixes --- css/custom-metadata-manager.css | 9 ++++++--- custom_metadata.php | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/css/custom-metadata-manager.css b/css/custom-metadata-manager.css index e6e3b68..4d5eeec 100644 --- a/css/custom-metadata-manager.css +++ b/css/custom-metadata-manager.css @@ -209,8 +209,9 @@ .custom-metadata-multifield-grouping .custom-metadata-field { float: left; width: auto; - margin-left: 20px; + margin-right: 20px; } + .custom-metadata-multifield-grouping .custom-metadata-field:first-child { margin-left: 0; } @@ -224,21 +225,23 @@ .custom-metadata-multifield-grouping .sort-handle { float: left; width: 30px; + width: 5%; + margin-right: 1%; height: 23px; background: url(images/move-drag-icon.png) no-repeat; background-size: 30px 23px; margin-top: 31px; - margin-right: 10px; cursor: move; } .custom-metadata-multifield-grouping .custom-metadata-multifield-fields { float: left; + width: 84%; } .custom-metadata-multifield-grouping .custom-metadata-multifield-actions { float: right; - width: 100px; + width: 10%; padding-top: 30px; text-align: right; } diff --git a/custom_metadata.php b/custom_metadata.php index b7679df..5e448a8 100644 --- a/custom_metadata.php +++ b/custom_metadata.php @@ -1132,7 +1132,7 @@ function _display_metadata_multifield( $slug, $multifield, $object_type, $object printf( '%s', __( 'duplicate this set of fields' ), __( 'Clone' ) ); - printf( '%s', __( 'remove this set of fields' ), __( 'Delete' ) ); + printf( '
%s', __( 'remove this set of fields' ), __( 'Delete' ) ); echo '
'; echo '
'; From 7b5316473d3f2b753f44ae51111fe61486bc5bdc Mon Sep 17 00:00:00 2001 From: Philipp Schreiber Date: Sat, 22 Feb 2014 11:00:04 +0100 Subject: [PATCH 09/15] Fixes strict standards message in line 1265 Strict Standards: Only variables should be passed by reference in custom_metadata.php on line 1265 --- custom_metadata.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/custom_metadata.php b/custom_metadata.php index 5e448a8..aee2208 100644 --- a/custom_metadata.php +++ b/custom_metadata.php @@ -1262,7 +1262,8 @@ function _display_metadata_field( $field_slug, $field, $object_type, $object_id, break; case 'upload' : $_attachment_id = $this->get_metadata_field_value( $field_slug . '_attachment_id', $field, $object_type, $object_id ); - $attachment_id = array_shift( array_values( $_attachment_id ) ); // get the first value in the array + $_attachment_id_values = array_values( $_attachment_id ); + $attachment_id = array_shift( $_attachment_id_values ); // get the first value in the array printf( '', esc_attr( $field_id ), esc_attr( $v ), $readonly_str, $placeholder_str ); printf( '', esc_attr( $field->upload_modal_title ), esc_attr( $field->upload_modal_button_text ), esc_attr( $field->upload_modal_title ) ); printf( '', $field->upload_clear_button_text ); From 5afce1fe0b7d7a42cc5480cadb482ffe21eee129 Mon Sep 17 00:00:00 2001 From: Philipp Schreiber Date: Wed, 26 Feb 2014 21:42:28 +0100 Subject: [PATCH 10/15] Removes debug alert --- js/custom-metadata-manager.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/js/custom-metadata-manager.js b/js/custom-metadata-manager.js index 77b9336..b7ac6de 100644 --- a/js/custom-metadata-manager.js +++ b/js/custom-metadata-manager.js @@ -131,9 +131,6 @@ var custom_metadata_link_selector_is_open = false; var custom_metadata_link_selector_target = null; - $custom_metadata_field.on( 'click.custom_metadata', '.custom-metadata-link-button', function(e){ - alert('test'); - }); $custom_metadata_field.on( 'click.custom_metadata', '.custom-metadata-link-button', function(e){ e.preventDefault(); custom_metadata_link_selector_is_open = true; From 3a4d2ae5b6e55d7ea6b9c594ee1cd5b40bbae922 Mon Sep 17 00:00:00 2001 From: Philipp Schreiber Date: Sun, 22 Jun 2014 19:02:36 +0200 Subject: [PATCH 11/15] Adds new field type sortable-select --- css/custom-metadata-manager.css | 6 +++++- custom_metadata.php | 6 ++++++ js/custom-metadata-manager.js | 19 +++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/css/custom-metadata-manager.css b/css/custom-metadata-manager.css index 4d5eeec..5071be4 100644 --- a/css/custom-metadata-manager.css +++ b/css/custom-metadata-manager.css @@ -262,4 +262,8 @@ color: #fff; background-color: #f00; border-bottom-color: #f00; -} \ No newline at end of file +} + +.custom-metadata-field.select2-sortable-wrapper .select2-container { + width: 65%; +} diff --git a/custom_metadata.php b/custom_metadata.php index aee2208..01062ba 100644 --- a/custom_metadata.php +++ b/custom_metadata.php @@ -1295,6 +1295,12 @@ function _display_metadata_field( $field_slug, $field, $object_type, $object_id, echo ''; } break; + case 'sortable_select' : + $container_class = sanitize_html_class( $field_slug ); + printf( '
', esc_attr( $container_class ), esc_attr( $field_id ) ); + printf( '', esc_attr( $field_slug ), esc_attr( $field_id ), esc_attr( $v ), esc_attr( json_encode($field->values) ) ); + echo '
'; + break; endswitch; if ( $cloneable && $count > 1 ) diff --git a/js/custom-metadata-manager.js b/js/custom-metadata-manager.js index b7ac6de..3375f89 100644 --- a/js/custom-metadata-manager.js +++ b/js/custom-metadata-manager.js @@ -4,6 +4,25 @@ var $custom_metadata_field = $( '.custom-metadata-field' ), $custom_metadata_multifield = $( '.custom-metadata-multifield' ); + var initMultiselectSortable = function() { + $('.select2-sortable').each(function() { + var select = $(this); + var values = $.makeArray(jQuery.parseJSON($(this).attr('data-possible-values'))); + $(this).select2({ + data: values, + multiple: true + }); + + $(this).select2("container").find("ul.select2-choices").sortable({ + containment: 'parent', + start: function() { select.select2('onSortStart'); }, + update: function() { select.select2('onSortEnd'); } + }); + }); + }; + + initMultiselectSortable(); + var incrementor = function(v) { return v.replace( /[0-9]+(?!.*[0-9])/ , function( match ) { return parseInt(match, 10) + 1; From 48ee8cb34ea86b96ca3602a16d96aa80f96ce86c Mon Sep 17 00:00:00 2001 From: Philipp Schreiber Date: Mon, 23 Jun 2014 09:12:23 +0200 Subject: [PATCH 12/15] adds sortable select to field_types array --- custom_metadata.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom_metadata.php b/custom_metadata.php index 01062ba..a6cfcfc 100644 --- a/custom_metadata.php +++ b/custom_metadata.php @@ -51,7 +51,7 @@ class custom_metadata_manager { var $_column_types = array( 'posts', 'pages', 'users', 'comments' ); // field types - var $_field_types = array( 'text', 'textarea', 'password', 'number', 'email', 'telephone', 'checkbox', 'radio', 'select', 'multi_select', 'upload', 'wysiwyg', 'datepicker', 'datetimepicker', 'timepicker', 'taxonomy_select', 'taxonomy_radio', 'taxonomy_checkbox', 'link' ); + var $_field_types = array( 'text', 'textarea', 'password', 'number', 'email', 'telephone', 'checkbox', 'radio', 'select', 'multi_select', 'upload', 'wysiwyg', 'datepicker', 'datetimepicker', 'timepicker', 'taxonomy_select', 'taxonomy_radio', 'taxonomy_checkbox', 'link', 'sortable_select' ); // field types that are cloneable var $_cloneable_field_types = array( 'text', 'textarea', 'upload', 'password', 'number', 'email', 'tel' ); From 23c9cbd8072cc6afbbc5300bcf9e0be46b8b3e7d Mon Sep 17 00:00:00 2001 From: Philipp Schreiber Date: Mon, 23 Jun 2014 10:33:49 +0200 Subject: [PATCH 13/15] fixes sortable select css --- css/custom-metadata-manager.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/custom-metadata-manager.css b/css/custom-metadata-manager.css index 5071be4..faaa401 100644 --- a/css/custom-metadata-manager.css +++ b/css/custom-metadata-manager.css @@ -264,6 +264,6 @@ border-bottom-color: #f00; } -.custom-metadata-field.select2-sortable-wrapper .select2-container { +.custom-metadata-field.sortable_select .select2-container { width: 65%; } From 942db9cc7680240dc95ee0abdea8e54d370c6a33 Mon Sep 17 00:00:00 2001 From: Philipp Schreiber Date: Tue, 4 Nov 2014 09:53:56 +0100 Subject: [PATCH 14/15] Fixes upload fields on multifield --- custom_metadata.php | 39 ++++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/custom_metadata.php b/custom_metadata.php index a6cfcfc..fa13c2a 100644 --- a/custom_metadata.php +++ b/custom_metadata.php @@ -684,8 +684,14 @@ function save_metadata_multifield( $slug, $multifield, $object_type, $object_id foreach ( $fields as $field_slug => $field ) { if ( ! empty( $grouping[$field_slug] ) ) { $grouping_values[$field_slug] = $this->_sanitize_field_value( $field_slug, $field, $object_type, $object_id, $grouping[$field_slug] ); + if ( $field->field_type == 'upload' ) { + $grouping_values[$field_slug . '_attachment_id'] = $this->_sanitize_field_value( $field_slug . '_attachment_id', $field, $object_type, $object_id, $grouping[$field_slug . '_attachment_id'] ); + } } else { $grouping_values[$field_slug] = ''; + if ( $field->field_type == 'upload' ) { + $grouping_values[$field_slug . '_attachment_id'] = ''; + } } } $multifield_value[] = $grouping_values; @@ -712,15 +718,15 @@ function save_metadata_field( $field_slug, $field, $object_type, $object_id ) { $value = $this->_sanitize_field_value( $field_slug, $field, $object_type, $object_id, $_POST[$field_slug] ); $this->_save_field_value( $field_slug, $field, $object_type, $object_id, $value ); - // save the attachment ID of the upload field as well - if ( $field->field_type == 'upload' && isset( $_POST[$field_slug . '_attachment_id'] ) ) + if ( $field->field_type == 'upload' && isset( $_POST[$field_slug . '_attachment_id'] ) ) { $this->_save_field_value( $field_slug . '_attachment_id', $field, $object_type, $object_id, absint( $_POST[$field_slug . '_attachment_id'] ) ); + } } else { $this->_delete_field_value( $field_slug, $field, $object_type, $object_id ); // delete the attachment ID of the upload field as well - if ( $field->field_type == 'upload' && isset( $_POST[$field_slug . '_attachment_id'] ) ) + if ( $field->field_type == 'upload' ) $this->_delete_field_value( $field_slug . '_attachment_id', $field, $object_type, $object_id ); } } @@ -1122,7 +1128,16 @@ function _display_metadata_multifield( $slug, $multifield, $object_type, $object echo '
'; echo '
'; foreach ( $fields as $field_slug => $field ) { - $value = ( isset( $grouping_of_values[$field_slug] ) ) ? $grouping_of_values[$field_slug] : false; + + if( $field->field_type == 'upload' ) { + $value[] = array( + 'url' => ( isset( $grouping_of_values[$field_slug] ) ) ? $grouping_of_values[$field_slug] : false, + 'id' => ( isset( $grouping_of_values[$field_slug . '_attachment_id'] ) ) ? $grouping_of_values[$field_slug . '_attachment_id'] : false + ); + } else { + $value = ( isset( $grouping_of_values[$field_slug] ) ) ? $grouping_of_values[$field_slug] : false; + } + $field_id = $slug . '[' . ( $grouping_count - 1 ) . ']' . '[' . $field_slug . ']'; $display_field_slug = $field_slug . '-' . $grouping_count; $this->_display_metadata_field( $display_field_slug, $field, $object_type, $object_id, $field_id, $value ); @@ -1194,6 +1209,7 @@ function _display_metadata_field( $field_slug, $field, $object_type, $object_id, $container_class = sanitize_html_class( $field_slug ); $container_class .= ( $cloneable ) ? ' cloneable' : ''; foreach ( $value as $v ) : + $container_id = $field_slug . '-' . $count; printf( '
', esc_attr( $container_class ), esc_attr( $container_id ) ); @@ -1261,13 +1277,18 @@ function _display_metadata_field( $field_slug, $field, $object_type, $object_id, wp_editor( $v, $field_id, $wysiwyg_args ); break; case 'upload' : - $_attachment_id = $this->get_metadata_field_value( $field_slug . '_attachment_id', $field, $object_type, $object_id ); - $_attachment_id_values = array_values( $_attachment_id ); - $attachment_id = array_shift( $_attachment_id_values ); // get the first value in the array - printf( '', esc_attr( $field_id ), esc_attr( $v ), $readonly_str, $placeholder_str ); + if( isset($field->multifield) && $field->multifield != '' ) { + printf( '', esc_attr( $field_id ), esc_attr( $v['url'] ), $readonly_str, $placeholder_str ); + printf( '', esc_attr( str_replace('image]', 'image_attachment_id]', $field_id) ), esc_attr( $v['id'] ) ); + } else { + $_attachment_id = $this->get_metadata_field_value( $field_slug . '_attachment_id', $field, $object_type, $object_id ); + $_attachment_id_values = array_values( $_attachment_id ); + $attachment_id = array_shift( $_attachment_id_values ); // get the first value in the array + printf( '', esc_attr( $field_id ), esc_attr( $v ), $readonly_str, $placeholder_str ); + printf( '', esc_attr( $field_id . '_attachment_id' ), esc_attr( $attachment_id ) ); + } printf( '', esc_attr( $field->upload_modal_title ), esc_attr( $field->upload_modal_button_text ), esc_attr( $field->upload_modal_title ) ); printf( '', $field->upload_clear_button_text ); - printf( '', esc_attr( $field_id . '_attachment_id' ), esc_attr( $attachment_id ) ); break; case 'taxonomy_select' : $terms = get_terms( $field->taxonomy, array( 'hide_empty' => false ) ); From 0d9d8a4c4cedaf3fc8e7cebc162a3473ae6086c7 Mon Sep 17 00:00:00 2001 From: Philipp Schreiber Date: Tue, 4 Nov 2014 11:09:49 +0100 Subject: [PATCH 15/15] Fixed small bug with multified images --- custom_metadata.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/custom_metadata.php b/custom_metadata.php index fa13c2a..85763ed 100644 --- a/custom_metadata.php +++ b/custom_metadata.php @@ -1124,11 +1124,15 @@ function _display_metadata_multifield( $slug, $multifield, $object_type, $object foreach ( $_values as $grouping_of_values ) { $grouping_count++; $grouping_id = $slug . '-' . $grouping_count; + printf( '
', esc_attr( $grouping_id ) ); echo '
'; echo '
'; foreach ( $fields as $field_slug => $field ) { - + if( isset($value) ) { + unset($value); + } + if( $field->field_type == 'upload' ) { $value[] = array( 'url' => ( isset( $grouping_of_values[$field_slug] ) ) ? $grouping_of_values[$field_slug] : false,