Skip to content

Commit 7278caf

Browse files
maxdmaxd
committed
Assets for Semantic UI 2.2.10
1 parent a3d8563 commit 7278caf

7 files changed

Lines changed: 76 additions & 28 deletions

File tree

‎assets/javascripts/semantic_ui/definitions/behaviors/form.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1520,6 +1520,9 @@ $.fn.form.settings = {
15201520
return;
15211521
}
15221522

1523+
// allow dashes in card
1524+
cardNumber = cardNumber.replace(/[\-]/g, '');
1525+
15231526
// verify card types
15241527
if(requiredTypes) {
15251528
$.each(requiredTypes, function(index, type){

‎assets/javascripts/semantic_ui/definitions/behaviors/visibility.js‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,22 @@ $.fn.visibility = function(parameters) {
422422
return !(module.cache.element.width === 0 && module.cache.element.offset.top === 0);
423423
}
424424
return false;
425+
},
426+
verticallyScrollableContext: function() {
427+
var
428+
overflowY = ($context.get(0) !== window)
429+
? $context.css('overflow-y')
430+
: false
431+
;
432+
return (overflowY == 'auto' || overflowY == 'scroll');
433+
},
434+
horizontallyScrollableContext: function() {
435+
var
436+
overflowX = ($context.get(0) !== window)
437+
? $context.css('overflow-x')
438+
: false
439+
;
440+
return (overflowX == 'auto' || overflowX == 'scroll');
425441
}
426442
},
427443

@@ -879,6 +895,13 @@ $.fn.visibility = function(parameters) {
879895
element.offset = $module.offset();
880896
element.width = $module.outerWidth();
881897
element.height = $module.outerHeight();
898+
// compensate for scroll in context
899+
if(module.is.verticallyScrollableContext()) {
900+
element.offset.top += $context.scrollTop() - $context.offset().top;
901+
}
902+
if(module.is.horizontallyScrollableContext()) {
903+
element.offset.left += $context.scrollLeft - $context.offset().left;
904+
}
882905
// store
883906
module.cache.element = element;
884907
return element;
@@ -902,10 +925,10 @@ $.fn.visibility = function(parameters) {
902925
}
903926

904927
// visibility
905-
element.topVisible = (screen.bottom >= element.top);
906928
element.topPassed = (screen.top >= element.top);
907-
element.bottomVisible = (screen.bottom >= element.bottom);
908929
element.bottomPassed = (screen.top >= element.bottom);
930+
element.topVisible = (screen.bottom >= element.top) && !element.bottomPassed;
931+
element.bottomVisible = (screen.bottom >= element.bottom) && !element.topPassed;
909932
element.pixelsPassed = 0;
910933
element.percentagePassed = 0;
911934

‎assets/javascripts/semantic_ui/definitions/modules/dropdown.js‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -975,7 +975,7 @@ $.fn.dropdown = function(parameters) {
975975
},
976976
blur: function(event) {
977977
pageLostFocus = (document.activeElement === this);
978-
if(!willRefocus) {
978+
if(module.is.searchSelection() && !willRefocus) {
979979
if(!itemActivated && !pageLostFocus) {
980980
if(settings.forceSelection) {
981981
module.forceSelection();
@@ -1158,6 +1158,10 @@ $.fn.dropdown = function(parameters) {
11581158
hasSubMenu = ($subMenu.length > 0),
11591159
isBubbledEvent = ($subMenu.find($target).length > 0)
11601160
;
1161+
// prevents IE11 bug where menu receives focus even though `tabindex=-1`
1162+
if(module.has.menuSearch()) {
1163+
$(document.activeElement).blur();
1164+
}
11611165
if(!isBubbledEvent && (!hasSubMenu || settings.allowCategorySelection)) {
11621166
if(module.is.searchSelection()) {
11631167
if(settings.allowAdditions) {
@@ -3069,6 +3073,9 @@ $.fn.dropdown = function(parameters) {
30693073
height: $currentMenu.outerHeight()
30703074
}
30713075
};
3076+
if(module.is.verticallyScrollableContext()) {
3077+
calculations.menu.offset.top += calculations.context.scrollTop;
3078+
}
30723079
onScreen = {
30733080
above : (calculations.context.scrollTop) <= calculations.menu.offset.top - calculations.menu.height,
30743081
below : (calculations.context.scrollTop + calculations.context.height) >= calculations.menu.offset.top + calculations.menu.height
@@ -3142,6 +3149,14 @@ $.fn.dropdown = function(parameters) {
31423149
? $subMenu.hasClass(className.visible)
31433150
: $menu.hasClass(className.visible)
31443151
;
3152+
},
3153+
verticallyScrollableContext: function() {
3154+
var
3155+
overflowY = ($context.get(0) !== window)
3156+
? $context.css('overflow-y')
3157+
: false
3158+
;
3159+
return (overflowY == 'auto' || overflowY == 'scroll');
31453160
}
31463161
},
31473162

‎assets/javascripts/semantic_ui/definitions/modules/modal.js‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ $.fn.modal = function(parameters) {
7272
element = this,
7373
instance = $module.data(moduleNamespace),
7474

75+
ignoreRepeatedEvents = false,
76+
7577
elementEventNamespace,
7678
id,
7779
observer,
@@ -226,18 +228,24 @@ $.fn.modal = function(parameters) {
226228

227229
event: {
228230
approve: function() {
229-
if(settings.onApprove.call(element, $(this)) === false) {
231+
if(ignoreRepeatedEvents || settings.onApprove.call(element, $(this)) === false) {
230232
module.verbose('Approve callback returned false cancelling hide');
231233
return;
232234
}
233-
module.hide();
235+
ignoreRepeatedEvents = true;
236+
module.hide(function() {
237+
ignoreRepeatedEvents = false;
238+
});
234239
},
235240
deny: function() {
236-
if(settings.onDeny.call(element, $(this)) === false) {
241+
if(ignoreRepeatedEvents || settings.onDeny.call(element, $(this)) === false) {
237242
module.verbose('Deny callback returned false cancelling hide');
238243
return;
239244
}
240-
module.hide();
245+
ignoreRepeatedEvents = true;
246+
module.hide(function() {
247+
ignoreRepeatedEvents = false;
248+
});
241249
},
242250
close: function() {
243251
module.hide();

‎assets/stylesheets/semantic_ui/definitions/elements/button.less‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,6 @@
754754
background: @basicActiveBackground !important;
755755
box-shadow: @basicActiveBoxShadow !important;
756756
color: @basicActiveTextColor;
757-
box-shadow: @selectedBorderColor;
758757
}
759758
.ui.basic.buttons .active.button:hover,
760759
.ui.basic.active.button:hover {
@@ -769,7 +768,7 @@
769768
box-shadow: @basicDownBoxShadow inset;
770769
}
771770
.ui.basic.buttons .active.button {
772-
box-shadow: @selectedBorderColor inset;
771+
box-shadow: @basicActiveBoxShadow !important;
773772
}
774773

775774
/* Standard Basic Inverted */

‎assets/stylesheets/semantic_ui/definitions/views/card.less‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -873,7 +873,7 @@ a.ui.card:hover,
873873
margin-left: @oneCardOffset;
874874
margin-right: @oneCardOffset;
875875
}
876-
.ui.two.doubling.cards .card {
876+
.ui.two.doubling.cards > .card {
877877
width: @oneCard;
878878
margin-left: @oneCardSpacing;
879879
margin-right: @oneCardSpacing;
@@ -882,7 +882,7 @@ a.ui.card:hover,
882882
margin-left: @twoCardOffset;
883883
margin-right: @twoCardOffset;
884884
}
885-
.ui.three.doubling.cards .card {
885+
.ui.three.doubling.cards > .card {
886886
width: @twoCard;
887887
margin-left: @twoCardSpacing;
888888
margin-right: @twoCardSpacing;
@@ -891,7 +891,7 @@ a.ui.card:hover,
891891
margin-left: @twoCardOffset;
892892
margin-right: @twoCardOffset;
893893
}
894-
.ui.four.doubling.cards .card {
894+
.ui.four.doubling.cards > .card {
895895
width: @twoCard;
896896
margin-left: @twoCardSpacing;
897897
margin-right: @twoCardSpacing;
@@ -900,7 +900,7 @@ a.ui.card:hover,
900900
margin-left: @twoCardOffset;
901901
margin-right: @twoCardOffset;
902902
}
903-
.ui.five.doubling.cards .card {
903+
.ui.five.doubling.cards > .card {
904904
width: @twoCard;
905905
margin-left: @twoCardSpacing;
906906
margin-right: @twoCardSpacing;
@@ -909,7 +909,7 @@ a.ui.card:hover,
909909
margin-left: @twoCardOffset;
910910
margin-right: @twoCardOffset;
911911
}
912-
.ui.six.doubling.cards .card {
912+
.ui.six.doubling.cards > .card {
913913
width: @twoCard;
914914
margin-left: @twoCardSpacing;
915915
margin-right: @twoCardSpacing;
@@ -918,7 +918,7 @@ a.ui.card:hover,
918918
margin-left: @threeCardOffset;
919919
margin-right: @threeCardOffset;
920920
}
921-
.ui.seven.doubling.cards .card {
921+
.ui.seven.doubling.cards > .card {
922922
width: @threeCard;
923923
margin-left: @threeCardSpacing;
924924
margin-right: @threeCardSpacing;
@@ -927,7 +927,7 @@ a.ui.card:hover,
927927
margin-left: @threeCardOffset;
928928
margin-right: @threeCardOffset;
929929
}
930-
.ui.eight.doubling.cards .card {
930+
.ui.eight.doubling.cards > .card {
931931
width: @threeCard;
932932
margin-left: @threeCardSpacing;
933933
margin-right: @threeCardSpacing;
@@ -936,7 +936,7 @@ a.ui.card:hover,
936936
margin-left: @threeCardOffset;
937937
margin-right: @threeCardOffset;
938938
}
939-
.ui.nine.doubling.cards .card {
939+
.ui.nine.doubling.cards > .card {
940940
width: @threeCard;
941941
margin-left: @threeCardSpacing;
942942
margin-right: @threeCardSpacing;
@@ -945,7 +945,7 @@ a.ui.card:hover,
945945
margin-left: @threeCardOffset;
946946
margin-right: @threeCardOffset;
947947
}
948-
.ui.ten.doubling.cards .card {
948+
.ui.ten.doubling.cards > .card {
949949
width: @threeCard;
950950
margin-left: @threeCardSpacing;
951951
margin-right: @threeCardSpacing;
@@ -958,7 +958,7 @@ a.ui.card:hover,
958958
margin-left: @oneCardOffset;
959959
margin-right: @oneCardOffset;
960960
}
961-
.ui.two.doubling.cards .card {
961+
.ui.two.doubling.cards > .card {
962962
width: @oneCard;
963963
margin-left: @oneCardSpacing;
964964
margin-right: @oneCardSpacing;
@@ -967,7 +967,7 @@ a.ui.card:hover,
967967
margin-left: @twoCardOffset;
968968
margin-right: @twoCardOffset;
969969
}
970-
.ui.three.doubling.cards .card {
970+
.ui.three.doubling.cards > .card {
971971
width: @twoCard;
972972
margin-left: @twoCardSpacing;
973973
margin-right: @twoCardSpacing;
@@ -976,7 +976,7 @@ a.ui.card:hover,
976976
margin-left: @twoCardOffset;
977977
margin-right: @twoCardOffset;
978978
}
979-
.ui.four.doubling.cards .card {
979+
.ui.four.doubling.cards > .card {
980980
width: @twoCard;
981981
margin-left: @twoCardSpacing;
982982
margin-right: @twoCardSpacing;
@@ -985,7 +985,7 @@ a.ui.card:hover,
985985
margin-left: @threeCardOffset;
986986
margin-right: @threeCardOffset;
987987
}
988-
.ui.five.doubling.cards .card {
988+
.ui.five.doubling.cards > .card {
989989
width: @threeCard;
990990
margin-left: @threeCardSpacing;
991991
margin-right: @threeCardSpacing;
@@ -994,7 +994,7 @@ a.ui.card:hover,
994994
margin-left: @threeCardOffset;
995995
margin-right: @threeCardOffset;
996996
}
997-
.ui.six.doubling.cards .card {
997+
.ui.six.doubling.cards > .card {
998998
width: @threeCard;
999999
margin-left: @threeCardSpacing;
10001000
margin-right: @threeCardSpacing;
@@ -1003,7 +1003,7 @@ a.ui.card:hover,
10031003
margin-left: @threeCardOffset;
10041004
margin-right: @threeCardOffset;
10051005
}
1006-
.ui.eight.doubling.cards .card {
1006+
.ui.eight.doubling.cards > .card {
10071007
width: @threeCard;
10081008
margin-left: @threeCardSpacing;
10091009
margin-right: @threeCardSpacing;
@@ -1012,7 +1012,7 @@ a.ui.card:hover,
10121012
margin-left: @fourCardOffset;
10131013
margin-right: @fourCardOffset;
10141014
}
1015-
.ui.eight.doubling.cards .card {
1015+
.ui.eight.doubling.cards > .card {
10161016
width: @fourCard;
10171017
margin-left: @fourCardSpacing;
10181018
margin-right: @fourCardSpacing;
@@ -1021,7 +1021,7 @@ a.ui.card:hover,
10211021
margin-left: @fourCardOffset;
10221022
margin-right: @fourCardOffset;
10231023
}
1024-
.ui.nine.doubling.cards .card {
1024+
.ui.nine.doubling.cards > .card {
10251025
width: @fourCard;
10261026
margin-left: @fourCardSpacing;
10271027
margin-right: @fourCardSpacing;
@@ -1030,7 +1030,7 @@ a.ui.card:hover,
10301030
margin-left: @fiveCardOffset;
10311031
margin-right: @fiveCardOffset;
10321032
}
1033-
.ui.ten.doubling.cards .card {
1033+
.ui.ten.doubling.cards > .card {
10341034
width: @fiveCard;
10351035
margin-left: @fiveCardSpacing;
10361036
margin-right: @fiveCardSpacing;

‎lib/less/rails/semantic_ui/version.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module Less
22
module Rails
33
module SemanticUI
4-
VERSION = '2.2.9.0'
4+
VERSION = '2.2.10.0'
55
end
66
end
77
end

0 commit comments

Comments
 (0)