Skip to content

Commit 12b8de4

Browse files
author
Eugene Tupikov
committed
Renamed placeholder to avoid conflict with other plugins
1 parent 60de9f7 commit 12b8de4

File tree

5 files changed

+6
-10
lines changed

5 files changed

+6
-10
lines changed

src/MultipleInputColumn.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function init()
4747
public function getElementName($index, $withPrefix = true)
4848
{
4949
if (is_null($index)) {
50-
$index = '{multiple-index}';
50+
$index = '{multiple_index}';
5151
}
5252
$elementName = count($this->renderer->columns) > 1
5353
? '[' . $index . '][' . $this->name . ']'

src/TabularColumn.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class TabularColumn extends BaseColumn
2727
public function getElementName($index, $withPrefix = true)
2828
{
2929
if (is_null($index)) {
30-
$index = '{multiple-index}';
30+
$index = '{multiple_index}';
3131
}
3232
$elementName = '[' . $index . '][' . $this->name . ']';
3333
$prefix = $withPrefix ? $this->getModel()->formName() : '';

src/assets/src/js/jquery.multipleInput.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,8 @@
131131
if (settings.limit != null && count >= settings.limit) {
132132
return;
133133
}
134-
var search = ['{multiple-index}', '{multiple-value}'],
135-
replace = [data.currentIndex, ''];
136134

137-
for (var i in search) {
138-
template = template.replaceAll(search[i], replace[i]);
139-
}
135+
template = template.replaceAll('{multiple_index}', data.currentIndex);
140136

141137
$(template).hide().appendTo(inputList).fadeIn(300);
142138

@@ -146,7 +142,7 @@
146142

147143
var jsTemplate;
148144
for (i in settings.jsTemplates) {
149-
jsTemplate = settings.jsTemplates[i].replaceAll('{multiple-index}', data.currentIndex);
145+
jsTemplate = settings.jsTemplates[i].replaceAll('{multiple_index}', data.currentIndex);
150146
window.eval(jsTemplate);
151147
}
152148
$wrapper.data('multipleInput').currentIndex++;

src/assets/src/js/jquery.multipleInput.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/components/BaseRenderer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ protected function collectJsTemplates($except = [])
198198
if (array_key_exists($key, $except)) {
199199
continue;
200200
}
201-
if (preg_match('/^[^{]+{multiple-index}.*$/m', $js) === 1) {
201+
if (preg_match('/^[^{]+{multiple_index}.*$/m', $js) === 1) {
202202
$output[$key] = $js;
203203
unset($view->js[View::POS_READY][$key]);
204204
}

0 commit comments

Comments
 (0)