Browse Source

Fixes for hybrid style initialization

pull/1129/head
jlukic 10 years ago
parent
commit
e8295fdb6f
2 changed files with 24 additions and 18 deletions
  1. 29
      src/definitions/modules/dropdown.js
  2. 13
      src/definitions/modules/dropdown.less

29
src/definitions/modules/dropdown.js

@ -145,15 +145,16 @@ $.fn.dropdown = function(parameters) {
module.debug('Dropdown initialized on a select', selectValues);
// see if select exists inside a dropdown
$input = $module;
if($module.closest(className.dropdown) > 0) {
if($input.parents(selector.dropdown).size() > 0) {
module.debug('Creating dropdown menu only from template');
$module = $module.closest(className.dropdown);
$('<div />')
.addClass(className.menu)
.html( settings.templates.menu( selectValues ))
.appendTo($module)
;
$module = $input.closest(selector.dropdown);
if($module.find('.' + className.dropdown).size() === 0) {
$('<div />')
.addClass(className.menu)
.html( settings.templates.menu( selectValues ))
.appendTo($module)
;
}
}
else {
module.debug('Creating entire dropdown from template');
@ -1330,11 +1331,12 @@ $.fn.dropdown.settings = {
},
selector : {
text : '> .text:not(.icon)',
input : '> input[type="hidden"], > select',
search : '> .search',
menu : '.menu',
item : '.item'
dropdown : '.ui.dropdown',
text : '> .text:not(.icon)',
input : '> input[type="hidden"], > select',
search : '> .search',
menu : '.menu',
item : '.item'
},
className : {
@ -1359,7 +1361,6 @@ $.fn.dropdown.settings.templates = {
values = select.values || {},
html = ''
;
html += '<div class="menu">';
$.each(select.values, function(value, name) {
if(value === name) {
html += '<div class="item">' + name + '</div>';

13
src/definitions/modules/dropdown.less

@ -67,6 +67,15 @@
will-change: transform, opacity;
}
/*--------------
Hidden Input
---------------*/
.ui.dropdown > input[type="hidden"],
.ui.dropdown > select {
display: none !important;
}
/*--------------
Dropdown Icon
---------------*/
@ -264,10 +273,6 @@ select.ui.dropdown {
margin: 0em;
visibility: hidden;
}
.ui.selection.dropdown > input[type="hidden"],
.ui.selection.dropdown > select {
display: none !important;
}
.ui.selection.dropdown > .text {
margin-right: @selectionTextIconDistance;
}

Loading…
Cancel
Save