Skip to content

Commit a37fb4d

Browse files
maxdmaxd
committed
Assets for Semantic UI 2.2.3
1 parent f9b5272 commit a37fb4d

File tree

30 files changed

+3458
-86
lines changed

30 files changed

+3458
-86
lines changed

‎assets/fonts/semantic_ui/themes/material/assets/fonts/icons.eot‎

140 KB
Binary file not shown.

‎assets/fonts/semantic_ui/themes/material/assets/fonts/icons.svg‎

Lines changed: 2373 additions & 0 deletions
Loading

‎assets/fonts/semantic_ui/themes/material/assets/fonts/icons.ttf‎

125 KB
Binary file not shown.

‎assets/fonts/semantic_ui/themes/material/assets/fonts/icons.woff‎

56.3 KB
Binary file not shown.

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,10 +352,13 @@ $.fn.form = function(parameters) {
352352

353353
get: {
354354
ancillaryValue: function(rule) {
355-
if(!rule.type || !module.is.bracketedRule(rule)) {
355+
if(!rule.type || (!rule.value && !module.is.bracketedRule(rule))) {
356356
return false;
357357
}
358-
return rule.type.match(settings.regExp.bracket)[1] + '';
358+
return (rule.value !== undefined)
359+
? rule.value
360+
: rule.type.match(settings.regExp.bracket)[1] + ''
361+
;
359362
},
360363
ruleName: function(rule) {
361364
if( module.is.bracketedRule(rule) ) {
@@ -1207,6 +1210,9 @@ $.fn.form.settings = {
12071210

12081211
// matches specified regExp
12091212
regExp: function(value, regExp) {
1213+
if(regExp instanceof RegExp) {
1214+
return value.match(regExp);
1215+
}
12101216
var
12111217
regExpParts = regExp.match($.fn.form.settings.regExp.flags),
12121218
flags

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

Lines changed: 35 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@ $.fn.dropdown = function(parameters) {
154154
}
155155
},
156156
selectObserver: function() {
157-
if(menuObserver) {
158-
menuObserver.disconnect();
157+
if(selectObserver) {
158+
selectObserver.disconnect();
159159
}
160160
}
161161
},
@@ -958,7 +958,7 @@ $.fn.dropdown = function(parameters) {
958958
pageLostFocus = (document.activeElement === this);
959959
if(!willRefocus) {
960960
if(!itemActivated && !pageLostFocus) {
961-
if(settings.forceSelection && module.has.query()) {
961+
if(settings.forceSelection) {
962962
module.forceSelection();
963963
}
964964
module.hide();
@@ -970,7 +970,6 @@ $.fn.dropdown = function(parameters) {
970970
icon: {
971971
click: function(event) {
972972
module.toggle();
973-
event.stopPropagation();
974973
}
975974
},
976975
text: {
@@ -1034,7 +1033,7 @@ $.fn.dropdown = function(parameters) {
10341033
? module.show
10351034
: module.toggle
10361035
;
1037-
if(module.is.bubbledLabelClick(event)) {
1036+
if(module.is.bubbledLabelClick(event) || module.is.bubbledIconClick(event)) {
10381037
return;
10391038
}
10401039
if( module.determine.eventOnElement(event, toggleBehavior) ) {
@@ -1415,8 +1414,7 @@ $.fn.dropdown = function(parameters) {
14151414
;
14161415
module.set.scrollPosition($nextItem);
14171416
if(settings.selectOnKeydown && module.is.single()) {
1418-
module.set.activeItem($nextItem);
1419-
module.set.selected(module.get.choiceValue($nextItem), $nextItem);
1417+
module.set.selectedItem($nextItem);
14201418
}
14211419
}
14221420
event.preventDefault();
@@ -1555,8 +1553,19 @@ $.fn.dropdown = function(parameters) {
15551553
},
15561554

15571555
select: function(text, value, element) {
1558-
// mimics action.activate but does not select text
1559-
module.action.activate.call(element);
1556+
value = (value !== undefined)
1557+
? value
1558+
: text
1559+
;
1560+
if( module.can.activate( $(element) ) ) {
1561+
module.set.value(value, $(element));
1562+
if(module.is.multiple() && !module.is.allFiltered()) {
1563+
return;
1564+
}
1565+
else {
1566+
module.hideAndClear();
1567+
}
1568+
}
15601569
},
15611570

15621571
combo: function(text, value, element) {
@@ -2072,7 +2081,7 @@ $.fn.dropdown = function(parameters) {
20722081
},
20732082

20742083
clear: function() {
2075-
if(module.is.multiple()) {
2084+
if(module.is.multiple() && settings.useLabels) {
20762085
module.remove.labels();
20772086
}
20782087
else {
@@ -2208,6 +2217,12 @@ $.fn.dropdown = function(parameters) {
22082217
$item.addClass(className.active);
22092218
}
22102219
},
2220+
partialSearch: function(text) {
2221+
var
2222+
length = module.get.query().length
2223+
;
2224+
$search.val( text.substr(0 , length));
2225+
},
22112226
scrollPosition: function($item, forceScroll) {
22122227
var
22132228
edgeTolerance = 5,
@@ -2279,10 +2294,16 @@ $.fn.dropdown = function(parameters) {
22792294
}
22802295
},
22812296
selectedItem: function($item) {
2297+
var
2298+
value = module.get.choiceValue($item),
2299+
text = module.get.choiceText($item, false)
2300+
;
22822301
module.debug('Setting user selection to item', $item);
22832302
module.remove.activeItem();
2303+
module.set.partialSearch(text);
22842304
module.set.activeItem($item);
2285-
module.set.selected(module.get.choiceValue($item), $item);
2305+
module.set.selected(value, $item);
2306+
module.set.text(text);
22862307
},
22872308
selectedLetter: function(letter) {
22882309
var
@@ -2980,6 +3001,9 @@ $.fn.dropdown = function(parameters) {
29803001
bubbledLabelClick: function(event) {
29813002
return $(event.target).is('select, input') && $module.closest('label').length > 0;
29823003
},
3004+
bubbledIconClick: function(event) {
3005+
return $(event.target).closest($icon).length > 0;
3006+
},
29833007
alreadySetup: function() {
29843008
return ($module.is('select') && $module.parent(selector.dropdown).length > 0 && $module.prev().length === 0);
29853009
},

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,9 @@ $.fn.modal = function(parameters) {
345345
useFailSafe : true,
346346
onComplete : function() {
347347
settings.onVisible.apply(element);
348-
module.add.keyboardShortcuts();
348+
if(settings.keyboardShortcuts) {
349+
module.add.keyboardShortcuts();
350+
}
349351
module.save.focus();
350352
module.set.active();
351353
if(settings.autofocus) {
@@ -391,7 +393,9 @@ $.fn.modal = function(parameters) {
391393
if(!module.others.active() && !keepDimmed) {
392394
module.hideDimmer();
393395
}
394-
module.remove.keyboardShortcuts();
396+
if(settings.keyboardShortcuts) {
397+
module.remove.keyboardShortcuts();
398+
}
395399
},
396400
onComplete : function() {
397401
settings.onHidden.call(element);
@@ -575,7 +579,7 @@ $.fn.modal = function(parameters) {
575579
set: {
576580
autofocus: function() {
577581
var
578-
$inputs = $module.find(':input').filter(':visible'),
582+
$inputs = $module.find('[tabindex], :input').filter(':visible'),
579583
$autofocus = $inputs.filter('[autofocus]'),
580584
$input = ($autofocus.length > 0)
581585
? $autofocus.first()
@@ -854,6 +858,8 @@ $.fn.modal.settings = {
854858
useCSS : true
855859
},
856860

861+
// whether to use keyboard shortcuts
862+
keyboardShortcuts: true,
857863

858864
context : 'body',
859865

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,9 @@ $.fn.popup = function(parameters) {
8888
if(!module.exists() && settings.preserve) {
8989
module.create();
9090
}
91-
module.observeChanges();
91+
if(settings.observeChanges) {
92+
module.observeChanges();
93+
}
9294
module.instantiate();
9395
},
9496

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -394,10 +394,10 @@ $.fn.search = function(parameters) {
394394
get: {
395395
inputEvent: function() {
396396
var
397-
prompt = $prompt[0],
398-
inputEvent = (prompt !== undefined && prompt.oninput !== undefined)
397+
prompt = $prompt[0],
398+
inputEvent = (prompt != undefined && prompt.oninput != undefined)
399399
? 'input'
400-
: (prompt !== undefined && prompt.onpropertychange !== undefined)
400+
: (prompt != undefined && prompt.onpropertychange != undefined)
401401
? 'propertychange'
402402
: 'keyup'
403403
;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,6 @@ $.fn.transition = function() {
545545
animation : animation
546546
});
547547
}
548-
return $.fn.transition.settings;
549548
},
550549
animationClass: function(animation) {
551550
var

0 commit comments

Comments
 (0)