Skip to content

Commit d8d5d9c

Browse files
committed
add commonjs support by export angular module name.
add main section in package.json. fix #152 update version to 2.1.10
1 parent ad350ee commit d8d5d9c

File tree

7 files changed

+36
-11
lines changed

7 files changed

+36
-11
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "nya-bootstrap-select",
3-
"version": "2.1.9",
3+
"version": "2.1.10",
44
"main": [
55
"dist/js/nya-bs-select.js",
66
"dist/css/nya-bs-select.css"

dist/css/nya-bs-select.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @lordfriend/nya-bootstrap-select v2.1.9
2+
* @lordfriend/nya-bootstrap-select v2.1.10
33
* Copyright 2014 Nyasoft
44
* Licensed under MIT license
55
*/

dist/css/nya-bs-select.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/js/nya-bs-select.js

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @lordfriend/nya-bootstrap-select v2.1.9
2+
* @lordfriend/nya-bootstrap-select v2.1.10
33
* Copyright 2014 Nyasoft
44
* Licensed under MIT license
55
*/
@@ -1073,6 +1073,19 @@ nyaBsSelect.directive('nyaBsSelect', ['$parse', '$document', '$timeout', '$compi
10731073
}
10741074
}
10751075
}
1076+
1077+
function supportsSelector(selector) {
1078+
var el = document.createElement('div');
1079+
el.innerHTML = ['&shy;', '<style>', selector, '{}', '</style>'].join('');
1080+
el = document.body.appendChild(el);
1081+
var style = el.getElementsByTagName('style')[0];
1082+
if (style && style.sheet && style.sheet.rules && style.sheet.cssRules) {
1083+
var ret = !!(style.sheet.rules || style.sheet.cssRules)[0];
1084+
document.body.removeChild(el);
1085+
return ret;
1086+
}
1087+
return false;
1088+
}
10761089

10771090
function findFocus(fromFirst) {
10781091
var firstLiElement;
@@ -1083,10 +1096,18 @@ nyaBsSelect.directive('nyaBsSelect', ['$parse', '$document', '$timeout', '$compi
10831096
}
10841097

10851098
// focus on selected element
1086-
for(var i = 0; i < dropdownMenu.children().length; i++) {
1087-
var childElement = dropdownMenu.children().eq(i);
1088-
if (!childElement.hasClass('not-match') && childElement.hasClass('selected')) {
1089-
return dropdownMenu.children().eq(i)[0];
1099+
if (supportsSelector(".selected:not(.not-match)")) {
1100+
var match = dropdownMenu[0].querySelector('.selected:not(.not-match)');
1101+
if (match)
1102+
return match;
1103+
}
1104+
else {
1105+
// Fallback for IE8 users
1106+
for(var i = 0; i < dropdownMenu.children().length; i++) {
1107+
var childElement = dropdownMenu.children().eq(i);
1108+
if (!childElement.hasClass('not-match') && childElement.hasClass('selected')) {
1109+
return dropdownMenu.children().eq(i)[0];
1110+
}
10901111
}
10911112
}
10921113

dist/js/nya-bs-select.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

index.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
require('./dist/js/nya-bs-select');
2+
3+
module.exports = 'nya.bootstrap.select';

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"name": "@lordfriend/nya-bootstrap-select",
3-
"version": "2.1.9",
3+
"version": "2.1.10",
44
"description": "An angular directive wraps bootstrap-select",
5+
"main": "index.js",
56
"repository": {
67
"type": "git",
78
"url": "git://github.com/lordfriend/nya-bootstrap-select.git"

0 commit comments

Comments
 (0)