Skip to content

Commit

Permalink
Merge pull request #122 from int-ua/develop
Browse files Browse the repository at this point in the history
Adding event.preventDefault in merging JS to avoid jumping to page top on actions
  • Loading branch information
saxix committed Mar 31, 2017
2 parents 3912cdc + a55e92d commit 429c5aa
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/adminactions/static/adminactions/js/merge.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
(function ($) {
$(function () {
var select = function (from) {
return function () {
return function ( event ) {
event.preventDefault();
var $row = $(this).parent().parent();
var $sel = $row.find(from);
$('.result input', $row).val($('input.raw-value', $sel).val());
Expand Down Expand Up @@ -37,7 +38,8 @@
$('a.origin').click(select("td.origin"));
$('a.other').click(select("td.other"));

$('a.swap').click(function () {
$('a.swap').click(function ( event ) {
event.preventDefault();
var left = [];
var right = [];
var $master = $('input[name="master_pk"]');
Expand Down

0 comments on commit 429c5aa

Please sign in to comment.