Skip to content

Commit

Permalink
Rebuild dist #2824
Browse files Browse the repository at this point in the history
  • Loading branch information
jlukic committed Aug 12, 2015
1 parent 3a15983 commit 54d01ad
Show file tree
Hide file tree
Showing 18 changed files with 216 additions and 151 deletions.
18 changes: 17 additions & 1 deletion dist/components/dropdown.css
Original file line number Diff line number Diff line change
Expand Up @@ -1194,7 +1194,7 @@ select.ui.dropdown {
transform: rotate(45deg);
width: 0.5em;
height: 0.5em;
box-shadow: -1px -1px 0px 1px rgba(0, 0, 0, 0.1);
box-shadow: -1px -1px 0px 1px rgba(34, 36, 38, 0.15);
background: #ffffff;
z-index: 2;
}
Expand Down Expand Up @@ -1324,6 +1324,22 @@ select.ui.dropdown {
right: 1em;
}

/* Upward pointing */
.ui.upward.pointing.dropdown > .menu,
.ui.upward.top.pointing.dropdown > .menu {
top: auto;
bottom: 100%;
margin: 0em 0em 0.71428571rem;
border-radius: 0.28571429rem;
}
.ui.upward.pointing.dropdown > .menu:after,
.ui.upward.top.pointing.dropdown > .menu:after {
top: 100%;
bottom: auto;
box-shadow: 1px 1px 0px 1px rgba(34, 36, 38, 0.15);
margin: -0.25em 0em 0em;
}


/*******************************
Theme Overrides
Expand Down
56 changes: 33 additions & 23 deletions dist/components/dropdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -412,14 +412,15 @@ $.fn.dropdown = function(parameters) {
if(module.has.message() && !module.has.maxSelections()) {
module.remove.message();
}
module.animate.show(function() {
if( module.can.click() ) {
module.bind.intent();
}
module.set.visible();
callback.call(element);
});
settings.onShow.call(element);
if(settings.onShow.call(element) !== false) {
module.animate.show(function() {
if( module.can.click() ) {
module.bind.intent();
}
module.set.visible();
callback.call(element);
});
}
}
},

Expand All @@ -430,11 +431,12 @@ $.fn.dropdown = function(parameters) {
;
if( module.is.active() ) {
module.debug('Hiding dropdown');
module.animate.hide(function() {
module.remove.visible();
callback.call(element);
});
settings.onHide.call(element);
if(settings.onHide.call(element) !== false) {
module.animate.hide(function() {
module.remove.visible();
callback.call(element);
});
}
}
},

Expand Down Expand Up @@ -634,7 +636,6 @@ $.fn.dropdown = function(parameters) {
apiSettings = {
errorDuration : false,
throttle : settings.throttle,
cache : 'local',
urlData : {
query: query
},
Expand Down Expand Up @@ -834,6 +835,11 @@ $.fn.dropdown = function(parameters) {
module.hide();
}
}
else if(pageLostFocus) {
if(settings.forceSelection) {
module.forceSelection();
}
}
}
},
icon: {
Expand Down Expand Up @@ -999,7 +1005,7 @@ $.fn.dropdown = function(parameters) {
var
$label = $module.find(selector.label),
$activeLabel = $label.filter('.' + className.active),
activeValue = $activeLabel.data('value'),
activeValue = $activeLabel.data(metadata.value),
labelIndex = $label.index($activeLabel),
labelCount = $label.length,
hasActiveLabel = ($activeLabel.length > 0),
Expand Down Expand Up @@ -1362,7 +1368,8 @@ $.fn.dropdown = function(parameters) {
module.hideAndClear();
},

hide: function() {
hide: function(text, value) {
module.set.value(value);
module.hideAndClear();
}

Expand Down Expand Up @@ -2152,7 +2159,7 @@ $.fn.dropdown = function(parameters) {
else {
module.verbose('Storing value in metadata', value, $input);
if(value !== currentValue) {
$module.data(metadata.value, value);
$module.data(metadata.value, stringValue);
}
}
if(settings.fireOnInit === false && module.is.initialLoad()) {
Expand Down Expand Up @@ -2463,7 +2470,7 @@ $.fn.dropdown = function(parameters) {
if(settings.useLabels && module.has.maxSelections() ) {
return;
}
if(settings.useLabels) {
if(settings.useLabels && module.is.multiple()) {
$item.not('.' + className.active).removeClass(className.filtered);
}
else {
Expand Down Expand Up @@ -2596,16 +2603,19 @@ $.fn.dropdown = function(parameters) {
$labels
.each(function(){
var
value = $(this).data('value'),
isUserValue = module.is.userValue(value)
value = $(this).data(metadata.value),
stringValue = (typeof value == 'number')
? value.toString()
: value,
isUserValue = module.is.userValue(stringValue)
;
if(isUserValue) {
module.remove.value(value);
module.remove.label(value);
module.remove.value(stringValue);
module.remove.label(stringValue);
}
else {
// selected will also remove label
module.remove.selected(value);
module.remove.selected(stringValue);
}
})
;
Expand Down
2 changes: 1 addition & 1 deletion dist/components/dropdown.min.css

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions dist/components/dropdown.min.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dist/components/grid.css
Original file line number Diff line number Diff line change
Expand Up @@ -1189,7 +1189,7 @@


/* Top Aligned */
.ui[class*="top aligned"].grid .column:not(.row),
.ui[class*="top aligned"].grid > .column:not(.row),
.ui.grid > [class*="top aligned"].row > .column,
.ui.grid > [class*="top aligned"].column:not(.row),
.ui.grid > .row > [class*="top aligned"].column {
Expand All @@ -1205,7 +1205,7 @@
}

/* Middle Aligned */
.ui[class*="middle aligned"].grid .column:not(.row),
.ui[class*="middle aligned"].grid > .column:not(.row),
.ui.grid > [class*="middle aligned"].row > .column,
.ui.grid > [class*="middle aligned"].column:not(.row),
.ui.grid > .row > [class*="middle aligned"].column {
Expand All @@ -1221,7 +1221,7 @@
}

/* Bottom Aligned */
.ui[class*="bottom aligned"].grid .column:not(.row),
.ui[class*="bottom aligned"].grid > .column:not(.row),
.ui.grid > [class*="bottom aligned"].row > .column,
.ui.grid > [class*="bottom aligned"].column:not(.row),
.ui.grid > .row > [class*="bottom aligned"].column {
Expand Down
2 changes: 1 addition & 1 deletion dist/components/grid.min.css

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions dist/components/item.css
Original file line number Diff line number Diff line change
Expand Up @@ -393,19 +393,19 @@
--------------------*/

.ui.items > .item > .image + [class*="top aligned"].content {
-webkit-align-self: top;
-ms-flex-item-align: top;
align-self: top;
-webkit-align-self: flex-start;
-ms-flex-item-align: start;
align-self: flex-start;
}
.ui.items > .item > .image + [class*="middle aligned"].content {
-webkit-align-self: center;
-ms-flex-item-align: center;
align-self: center;
}
.ui.items > .item > .image + [class*="bottom aligned"].content {
-webkit-align-self: bottom;
-ms-flex-item-align: bottom;
align-self: bottom;
-webkit-align-self: flex-end;
-ms-flex-item-align: end;
align-self: flex-end;
}

/*--------------
Expand Down
2 changes: 1 addition & 1 deletion dist/components/item.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions dist/components/menu.css
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,11 @@
background: #ffffff;
margin: 0em 0px 0px;
box-shadow: 0px 1px 3px 0px rgba(0, 0, 0, 0.08);
-webkit-box-orient: vertical !important;
-webkit-box-direction: normal !important;
-webkit-flex-direction: column !important;
-ms-flex-direction: column !important;
flex-direction: column !important;
}

/* Menu Items */
Expand Down
2 changes: 1 addition & 1 deletion dist/components/menu.min.css

Large diffs are not rendered by default.

Loading

0 comments on commit 54d01ad

Please sign in to comment.