Skip to content

Commit 3d7ff4b

Browse files
committed
chore(release): hotfix the v2.0.2 release
1 parent f5cd4f3 commit 3d7ff4b

File tree

11 files changed

+676
-672
lines changed

11 files changed

+676
-672
lines changed

dist/angular-strap.js

Lines changed: 658 additions & 658 deletions
Large diffs are not rendered by default.

dist/angular-strap.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.

dist/angular-strap.min.js.map

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/modules/parse-options.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@ angular.module('mgcrea.ngStrap.helpers.parseOptions', []).provider('$parseOption
2525
};
2626
$parseOptions.valuesFn = function (scope, controller) {
2727
return $q.when(valuesFn(scope, controller)).then(function (values) {
28-
$parseOptions.$values = values ? parseValues(values) : {};
28+
$parseOptions.$values = values ? parseValues(values, scope) : {};
2929
return $parseOptions.$values;
3030
});
3131
};
3232
// Private functions
33-
function parseValues(values) {
33+
function parseValues(values, scope) {
3434
return values.map(function (match, index) {
3535
var locals = {}, label, value;
3636
locals[valueName] = match;
37-
label = displayFn(locals);
38-
value = valueFn(locals) || index;
37+
label = displayFn(scope, locals);
38+
value = valueFn(scope, locals) || index;
3939
return {
4040
label: label,
4141
value: value

dist/modules/parse-options.min.js

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/modules/parse-options.min.js.map

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/modules/select.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ angular.module('mgcrea.ngStrap.select', [
153153
evt.preventDefault();
154154
evt.stopPropagation();
155155
// Select with enter
156-
if (evt.keyCode === 13 || evt.keyCode === 9) {
156+
if (!options.multiple && (evt.keyCode === 13 || evt.keyCode === 9)) {
157157
return $select.select(scope.$activeIndex);
158158
}
159159
// Navigate with keyboard
@@ -185,7 +185,7 @@ angular.module('mgcrea.ngStrap.select', [
185185
if (options.keyboard) {
186186
element.off('keydown', $select.$onKeyDown);
187187
}
188-
_hide();
188+
_hide(true);
189189
};
190190
return $select;
191191
}

dist/modules/select.min.js

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

0 commit comments

Comments
 (0)