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

Merge pull request #1232 from ZmagoD/zd_safari_bug_fix

Browse source 
fixes bug with bootstrap-select
This commit is contained in:
Luka Murn 2018-07-04 20:49:02 +02:00 • committed by GitHub
commit 339fe1cc81
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/assets/javascripts/repositories/forms/repository_item_edit.js
View file

@ -82,10 +82,11 @@
/** /**
* Handles select picker default value * Handles select picker default value
* *
* @param {Object} node
* @returns {undefinded} * @returns {undefinded}
*/ */
RepositoryItemEditForm.prototype.initializeSelectpickerValues = function() { RepositoryItemEditForm.prototype.initializeSelectpickerValues = function(node) {
$('.bootstrap-select').each(function(_, dropdown) { $($(node).find('.bootstrap-select')).each(function(_, dropdown) {
var selectedValue = $($(dropdown).find('select')[0]).data('selected-value'); var selectedValue = $($(dropdown).find('select')[0]).data('selected-value');
var selectPicker = $($(dropdown).find('select')[0]); var selectPicker = $($(dropdown).find('select')[0]);
var value = '-1' var value = '-1'

2
app/assets/javascripts/repositories/repository_datatable.js.erb
View file

@ -668,7 +668,7 @@ var RepositoryDatatable = (function(global) {
var editForm = new RepositoryItemEditForm(data, node); var editForm = new RepositoryItemEditForm(data, node);
editForm.renderForm(TABLE); editForm.renderForm(TABLE);
_initSelectPicker(); _initSelectPicker();
editForm.initializeSelectpickerValues(); editForm.initializeSelectpickerValues(node);
// initialize smart annotation // initialize smart annotation
_.each($('[data-object="repository_cell"]'), function(el) { _.each($('[data-object="repository_cell"]'), function(el) {