scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-07 13:44:23 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1283 from Ducz0r/lm-sci-2707-fix

Browse source 
Fix bootstrap-select to work with turbolinks 5.x [SCI-2707]
This commit is contained in:
Luka Murn 2018-08-24 17:24:35 +02:00 • committed by GitHub
commit 50f6bd24e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/assets/javascripts/application.js.erb
View file

@ -262,4 +262,9 @@ var HelperModule = (function(){
$('.modal').modal('hide'); $('.modal').modal('hide');
}); });
}); });
})();
/* Fix .selectpicker (bootstrap-select) to work with Turbolinks 5.x */
$(document).on('turbolinks:load', function() {
$(window).trigger('load.bs.select.data-api');
});
})();

9
app/assets/javascripts/users/settings/teams/invite_users_modal.js
View file

@ -173,8 +173,11 @@
}); });
} }
$('[data-role=invite-users-modal]').each(function() { $(document).on('turbolinks:load', function() {
initializeModal($(this)); $('[data-role=invite-users-modal]').each(function() {
initializeModal($(this));
});
initializeModalsToggle();
}); });
initializeModalsToggle();
}()); }());