Skip to content

Commit 373f47b

Browse files
authored
Merge pull request #270 from bscheshirwork/js-events-current-index
Pass currentIndex in js events
2 parents f30a9b3 + 2189acc commit 373f47b

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -255,9 +255,10 @@
255255

256256
template = template.replaceAll('{' + settings.indexPlaceholder + '}', data.currentIndex);
257257
var $addedInput = $(template);
258+
var currentIndex = data.currentIndex;
258259

259260
var beforeAddEvent = $.Event(events.beforeAddRow);
260-
$wrapper.trigger(beforeAddEvent, [$addedInput]);
261+
$wrapper.trigger(beforeAddEvent, [$addedInput, currentIndex]);
261262

262263
if (beforeAddEvent.result === false) {
263264
return;
@@ -274,20 +275,20 @@
274275
}
275276

276277
values = tmp;
277-
}
278+
}
278279

279280
var jsTemplate;
280281

281282
for (var i in settings.jsTemplates) {
282283
jsTemplate = settings.jsTemplates[i]
283284
.replaceAll('{' + settings.indexPlaceholder + '}', data.currentIndex)
284285
.replaceAll('%7B' + settings.indexPlaceholder + '%7D', data.currentIndex);
285-
286+
286287
window.eval(jsTemplate);
287288
}
288289

289290
var index = 0;
290-
291+
291292
$(template).find('input, select, textarea').each(function (k, v) {
292293
var ele = $(v),
293294
tag = v.tagName,
@@ -321,7 +322,7 @@
321322
$wrapper.data('multipleInput').currentIndex++;
322323

323324
var afterAddEvent = $.Event(events.afterAddRow);
324-
$wrapper.trigger(afterAddEvent, [$addedInput]);
325+
$wrapper.trigger(afterAddEvent, [$addedInput, currentIndex]);
325326
};
326327

327328
var removeInput = function ($btn) {
@@ -330,9 +331,10 @@
330331
data = $wrapper.data('multipleInput'),
331332
settings = data.settings;
332333

333-
if (getCurrentIndex($wrapper) > settings.min) {
334+
var currentIndex = getCurrentIndex($wrapper);
335+
if (currentIndex > settings.min) {
334336
var event = $.Event(events.beforeDeleteRow);
335-
$wrapper.trigger(event, [$toDelete]);
337+
$wrapper.trigger(event, [$toDelete, currentIndex]);
336338

337339
if (event.result === false) {
338340
return;
@@ -348,7 +350,7 @@
348350
$(this).remove();
349351

350352
event = $.Event(events.afterDeleteRow);
351-
$wrapper.trigger(event, [$toDelete]);
353+
$wrapper.trigger(event, [$toDelete, currentIndex]);
352354
});
353355
}
354356
};

0 commit comments

Comments
 (0)