Skip to content

Commit 5688efc

Browse files
committed
Merge branch 'master' into release
2 parents 901baaa + b14a7d7 commit 5688efc

28 files changed

+976
-141
lines changed

DEVELOPMENT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
Represents a single field value. `Complex_Field` uses a `value_tree` instead which contains a `value_set` for every child field including the `Complex_Field` itself.
3232

33-
_Note: The `Value_Set` class will always return a fully formatted `value_set` with all of it's properties OR `null`_
33+
_Note: The `Value_Set` class will always return a fully formatted `value_set` with all of its properties OR `null`_
3434

3535
### Schema
3636

assets/js/containers/sagas/widget.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,11 @@ export function* workerFormSubmit() {
145145
const widgetId = getWidgetId($(event.target).closest('.widget-inside').get(0));
146146
const containerId = widgetIdToContainerId(widgetId);
147147

148+
// Don't care about other widgets.
149+
if (!startsWith(widgetId, carbonWidgetIdPrefix)) {
150+
continue;
151+
}
152+
148153
yield put(submitForm(event));
149154
yield put(validateContainer(containerId, event));
150155

assets/js/fields/sagas/media-browser.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export function* prepareValueForField(fieldId, attachment) {
4040
}
4141

4242
/**
43-
* Set a field's value depending on it's value_type property
43+
* Set a field's value depending on its value_type property
4444
*
4545
* @param {String} fieldId
4646
* @param {Object} attachment
@@ -134,7 +134,7 @@ export function* workerAddMultipleFiles(action) {
134134
// pause until the complex is updated
135135
yield take(receiveComplexGroup);
136136

137-
// resolve the new field from the new group and assign it's new value
137+
// resolve the new field from the new group and assign its new value
138138
const parentField = yield select(getFieldById, parent.field.id);
139139
const freshGroup = last(parentField.value);
140140
const freshFieldId = first(filter(freshGroup.fields, f => f.base_name === field.base_name)).id;

assets/js/fields/selectors.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ export const getFieldPatternRegex = () => {
102102
};
103103

104104
/**
105-
* Get a field based on it's name hierarchy
105+
* Get a field based on its name hierarchy
106106
* This is a direct translation of Container::get_field_by_name from php
107107
*
108108
* @return {Object}
@@ -164,7 +164,7 @@ export const getFieldByHierarchy = (state, hierarchy) => {
164164
};
165165

166166
/**
167-
* Get a field's hierarchy name based on it's id
167+
* Get a field's hierarchy name based on its id
168168
*
169169
* @return {Object}
170170
*/

assets/js/lib/helpers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export function patchTagBoxAPI(tagBox, method) {
7979
}
8080

8181
/**
82-
* Get select option's level based on it's className
82+
* Get select option's level based on its className
8383
*
8484
* @param {Object} option
8585
* @return {Number}

config.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
# Define version constant
66
if ( ! defined( __NAMESPACE__ . '\VERSION' ) ) {
7-
define( __NAMESPACE__ . '\VERSION', '2.0.5-beta.3' );
7+
define( __NAMESPACE__ . '\VERSION', '2.1.0' );
88
}
99

1010
# Define root directory

core/Container/Nav_Menu_Item_Container.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ public function form( $item ) {
186186
}
187187

188188
/**
189-
* Create a clone of this container with it's own datastore for every menu item
189+
* Create a clone of this container with its own datastore for every menu item
190190
*/
191191
protected function get_clone_for_menu_item( $menu_item_id, $load = true ) {
192192
if ( ! isset( $this->menu_item_instances[ $menu_item_id ] ) ) {

core/Container/Post_Meta_Container.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ public function get_post_type_visibility() {
267267
*/
268268

269269
/**
270-
* Show the container only on particular page referenced by it's path.
270+
* Show the container only on particular page referenced by its path.
271271
*
272272
* @deprecated
273273
* @param int|string $page page ID or page path

core/Field/Association_Field.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ protected function get_value_string_for_legacy_value( $legacy_value ) {
117117
}
118118

119119
/**
120-
* Convert a colo:separated:string into it's expected components
120+
* Convert a colon:separated:string into its expected components
121121
* Used for backwards compatibility to CF 1.5
122122
*
123123
* @param string $value_string
@@ -144,7 +144,7 @@ protected function value_string_to_property_array( $value_string ) {
144144
}
145145

146146
/**
147-
* Convert a colon:separated:string into it's expected components
147+
* Convert a colon:separated:string into its expected components
148148
* Used for backwards compatibility to CF 1.5
149149
*
150150
* @param array $value_string_array

core/Field/Complex_Field.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ protected function get_prefilled_groups( $groups, $value_tree ) {
360360
}
361361

362362
/**
363-
* Load the field value from an input array based on it's name.
363+
* Load the field value from an input array based on its name.
364364
*
365365
* @param array $input Array of field names and values.
366366
* @return Field $this

0 commit comments

Comments
 (0)