Skip to content

Commit b8cbb42

Browse files
GuySartorelliGuySartorelli
committed
Merge branch '5.4' into 6.0
2 parents 394f57b + 55a10fd commit b8cbb42

File tree

4 files changed

+34
-37
lines changed

4 files changed

+34
-37
lines changed

‎src/Fields/KeyValueField.php

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ public function Field($properties = [])
8383
Requirements::javascript('symbiote/silverstripe-multivaluefield: client/dist/js/multivaluefield.js');
8484
Requirements::css('symbiote/silverstripe-multivaluefield: client/dist/styles/multivaluefield.css');
8585

86-
$nameKey = $this->name.'[key][]';
87-
$nameVal = $this->name.'[val][]';
86+
$nameKey = $this->name . '[key][]';
87+
$nameVal = $this->name . '[val][]';
8888
$fields = [];
8989
$keyFieldPlaceholder = $this->getKeyFieldPlaceholder();
9090
$valueFieldPlaceholder = $this->getValueFieldPlaceholder();
@@ -93,20 +93,20 @@ public function Field($properties = [])
9393
foreach ($this->value as $i => $v) {
9494
if ($this->readonly) {
9595
$fieldAttr = [
96-
'class' => 'mventryfield mvkeyvalReadonly '.($this->extraClass() ? $this->extraClass() : ''),
97-
'id' => $this->id().MultiValueTextField::KEY_SEP.$i,
96+
'class' => 'mventryfield mvkeyvalReadonly ' . ($this->extraClass() ? $this->extraClass() : ''),
97+
'id' => $this->id() . MultiValueTextField::KEY_SEP . $i,
9898
'name' => $nameKey,
9999
'tabindex' => $this->getAttribute('tabindex')
100100
];
101101

102102
$keyField = HTML::createTag('span', $fieldAttr, Convert::raw2xml($i));
103-
$fieldAttr['id'] = $this->id().MultiValueTextField::KEY_SEP.$v;
103+
$fieldAttr['id'] = $this->id() . MultiValueTextField::KEY_SEP . $v;
104104
$valField = HTML::createTag('span', $fieldAttr, Convert::raw2xml($v));
105-
$fields[] = $keyField.$valField;
105+
$fields[] = $keyField . $valField;
106106
} else {
107107
$keyField = $this->createSelectList($i, $nameKey, $this->sourceKeys, $i, $keyFieldPlaceholder);
108108
$valField = $this->createSelectList($i, $nameVal, $this->sourceValues, $v, $valueFieldPlaceholder);
109-
$fields[] = $keyField.' '.$valField;
109+
$fields[] = $keyField . ' ' . $valField;
110110
}
111111
}
112112
} else {
@@ -116,14 +116,12 @@ public function Field($properties = [])
116116
if (!$this->readonly) {
117117
$keyField = $this->createSelectList('new', $nameKey, $this->sourceKeys, '', $keyFieldPlaceholder);
118118
$valField = $this->createSelectList('new', $nameVal, $this->sourceValues, '', $valueFieldPlaceholder);
119-
$fields[] = $keyField.' '.$valField;
120-
// $fields[] = $this->createSelectList('new', $name, $this->source);
119+
$fields[] = $keyField . ' ' . $valField;
120+
// $fields[] = $this->createSelectList('new', $name, $this->source);
121121
}
122122

123-
return '<ul id="'.$this->id().'" class="multivaluefieldlist mvkeyvallist '.$this->extraClass().'"><li>'.implode(
124-
'</li><li>',
125-
$fields
126-
).'</li></ul>';
123+
return '<ul id="' . $this->id() . '" class="multivaluefieldlist mvkeyvallist ' . $this->extraClass() . '"><li>'
124+
. implode('</li><li>', $fields) . '</li></ul>';
127125
}
128126

129127
protected function createSelectList($number, $name, $values, $selected = '', $placeholder = '')
@@ -133,7 +131,7 @@ protected function createSelectList($number, $name, $values, $selected = '', $pl
133131
[
134132
'selected' => $selected == '' ? 'selected' : '',
135133
'value' => ''
136-
],
134+
],
137135
''
138136
);
139137

@@ -147,8 +145,8 @@ protected function createSelectList($number, $name, $values, $selected = '', $pl
147145

148146
if (count($values ?? [])) {
149147
$attrs = [
150-
'class' => 'text mventryfield mvdropdown '.($this->extraClass() ? $this->extraClass() : ''),
151-
'id' => $this->id().MultiValueTextField::KEY_SEP.$number,
148+
'class' => 'text mventryfield mvdropdown ' . ($this->extraClass() ? $this->extraClass() : ''),
149+
'id' => $this->id() . MultiValueTextField::KEY_SEP . $number,
152150
'name' => $name,
153151
'tabindex' => $this->getAttribute('tabindex')
154152
];
@@ -160,8 +158,8 @@ protected function createSelectList($number, $name, $values, $selected = '', $pl
160158
return HTML::createTag('select', $attrs, $options);
161159
} else {
162160
$attrs = [
163-
'class' => 'text mventryfield mvtextfield '.($this->extraClass() ? $this->extraClass() : ''),
164-
'id' => $this->id().MultiValueTextField::KEY_SEP.$number,
161+
'class' => 'text mventryfield mvtextfield ' . ($this->extraClass() ? $this->extraClass() : ''),
162+
'id' => $this->id() . MultiValueTextField::KEY_SEP . $number,
165163
'value' => $selected,
166164
'name' => $name,
167165
'tabindex' => $this->getAttribute('tabindex'),

‎src/Fields/MultiValueDropdownField.php

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,17 @@ public function Field($properties = [])
4848
Requirements::javascript('symbiote/silverstripe-multivaluefield: client/dist/js/multivaluefield.js');
4949
Requirements::css('symbiote/silverstripe-multivaluefield: client/dist/styles/multivaluefield.css');
5050

51-
$name = $this->name.'[]';
51+
$name = $this->name . '[]';
5252
$fields = [];
5353

5454

5555
if ($this->value) {
5656
foreach ($this->value as $i => $v) {
5757
if ($this->readonly) {
5858
$fieldAttr = [
59-
'class' => 'mventryfield mvdropdownReadonly '.($this->extraClass() ? $this->extraClass() : ''),
60-
'id' => $this->id().MultiValueTextField::KEY_SEP.$i,
59+
'class' => 'mventryfield mvdropdownReadonly '
60+
. ($this->extraClass() ? $this->extraClass() : ''),
61+
'id' => $this->id() . MultiValueTextField::KEY_SEP . $i,
6162
'name' => $name,
6263
'tabindex' => $this->getAttribute('tabindex')
6364
];
@@ -74,10 +75,10 @@ public function Field($properties = [])
7475
$fields[] = $this->createSelectList($i + 1, $name, $this->source);
7576
}
7677

77-
return '<ul id="'.$this->id().'" class="multivaluefieldlist '.$this->extraClass().'"><li>'.implode(
78+
return '<ul id="' . $this->id() . '" class="multivaluefieldlist ' . $this->extraClass() . '"><li>' . implode(
7879
'</li><li>',
7980
$fields
80-
).'</li></ul>';
81+
) . '</li></ul>';
8182
}
8283

8384
public function Type()
@@ -92,7 +93,7 @@ protected function createSelectList($number, $name, $values, $selected = '')
9293
[
9394
'selected' => $selected == '' ? 'selected' : '',
9495
'value' => ''
95-
],
96+
],
9697
''
9798
);
9899

@@ -105,8 +106,8 @@ protected function createSelectList($number, $name, $values, $selected = '')
105106
}
106107

107108
$attrs = [
108-
'class' => 'mventryfield mvdropdown '.($this->extraClass() ? $this->extraClass() : ''),
109-
'id' => $this->id().MultiValueTextField::KEY_SEP.$number,
109+
'class' => 'mventryfield mvdropdown ' . ($this->extraClass() ? $this->extraClass() : ''),
110+
'id' => $this->id() . MultiValueTextField::KEY_SEP . $number,
110111
'name' => $name,
111112
'tabindex' => $this->getAttribute('tabindex')
112113
];

‎src/Fields/MultiValueListField.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function Field($properties = [])
3030
Requirements::javascript('symbiote/silverstripe-multivaluefield: client/dist/js/multivaluefield.js');
3131
Requirements::css('symbiote/silverstripe-multivaluefield: client/dist/styles/multivaluefield.css');
3232

33-
$name = $this->name.'[]';
33+
$name = $this->name . '[]';
3434

3535
$options = '';
3636
if (!$this->value) {
@@ -46,7 +46,7 @@ public function Field($properties = [])
4646
}
4747

4848
$attrs = [
49-
'class' => 'mventryfield mvlistbox '.($this->extraClass() ? $this->extraClass() : ''),
49+
'class' => 'mventryfield mvlistbox ' . ($this->extraClass() ? $this->extraClass() : ''),
5050
'id' => $this->id(),
5151
'name' => $name,
5252
'tabindex' => $this->getAttribute('tabindex'),

‎src/Fields/MultiValueTextField.php

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ public function Field($properties = [])
2727
Requirements::javascript('symbiote/silverstripe-multivaluefield: client/dist/js/multivaluefield.js');
2828
Requirements::css('symbiote/silverstripe-multivaluefield: client/dist/styles/multivaluefield.css');
2929

30-
$name = $this->name.'[]';
30+
$name = $this->name . '[]';
3131
$fields = [];
3232

3333
$attributes = [
3434
'type' => 'text',
35-
'class' => 'text mvtextfield mventryfield '.($this->extraClass() ? $this->extraClass() : ''),
35+
'class' => 'text mvtextfield mventryfield ' . ($this->extraClass() ? $this->extraClass() : ''),
3636
// 'id' => $this->id(),
3737
'name' => $name,
3838
// 'value' => $this->Value(),
@@ -45,7 +45,7 @@ public function Field($properties = [])
4545
$fieldAttr = $attributes;
4646
if ($this->value) {
4747
foreach ($this->value as $i => $v) {
48-
$fieldAttr['id'] = $this->id().MultiValueTextField::KEY_SEP.$i;
48+
$fieldAttr['id'] = $this->id() . MultiValueTextField::KEY_SEP . $i;
4949
$fieldAttr['value'] = $v;
5050
if ($this->readonly) {
5151
unset($fieldAttr['value']);
@@ -59,17 +59,15 @@ public function Field($properties = [])
5959
// add an empty row
6060
if (!$this->readonly) {
6161
// assume next pos equals to the number of existing fields which gives index+1 in a zero-indexed list
62-
$attributes['id'] = $this->id().MultiValueTextField::KEY_SEP.count($fields ?? []);
62+
$attributes['id'] = $this->id() . MultiValueTextField::KEY_SEP . count($fields ?? []);
6363
$fields[] = $this->createInput($attributes);
6464
}
6565

6666
if (count($fields ?? [])) {
67-
return '<ul id="'.$this->id().'" class="multivaluefieldlist '.$this->extraClass().'"><li>'.implode(
68-
'</li><li>',
69-
$fields
70-
).'</li></ul>';
67+
return '<ul id="' . $this->id() . '" class="multivaluefieldlist ' . $this->extraClass() . '"><li>'
68+
. implode('</li><li>', $fields) . '</li></ul>';
7169
} else {
72-
return '<div id="'.$this->id().'" class="multivaluefieldlist '.$this->extraClass().'"></div>';
70+
return '<div id="' . $this->id() . '" class="multivaluefieldlist ' . $this->extraClass() . '"></div>';
7371
}
7472
}
7573

0 commit comments

Comments
 (0)