chore(release): hotfix the v2.0.2 release

mgcrea · Apr 27, 2014 · 3d7ff4b · 3d7ff4b
1 parent f5cd4f3
commit 3d7ff4b
Show file tree

Hide file tree

Showing 11 changed files with 676 additions and 672 deletions.
diff --git a/dist/angular-strap.js b/dist/angular-strap.js
diff --git a/dist/angular-strap.min.js b/dist/angular-strap.min.js
diff --git a/dist/angular-strap.min.js.map b/dist/angular-strap.min.js.map
diff --git a/dist/modules/parse-options.js b/dist/modules/parse-options.js
@@ -25,17 +25,17 @@ angular.module('mgcrea.ngStrap.helpers.parseOptions', []).provider('$parseOption
         };
         $parseOptions.valuesFn = function (scope, controller) {
           return $q.when(valuesFn(scope, controller)).then(function (values) {
-            $parseOptions.$values = values ? parseValues(values) : {};
+            $parseOptions.$values = values ? parseValues(values, scope) : {};
             return $parseOptions.$values;
           });
         };
         // Private functions
-        function parseValues(values) {
+        function parseValues(values, scope) {
           return values.map(function (match, index) {
             var locals = {}, label, value;
             locals[valueName] = match;
-            label = displayFn(locals);
-            value = valueFn(locals) || index;
+            label = displayFn(scope, locals);
+            value = valueFn(scope, locals) || index;
             return {
               label: label,
               value: value

diff --git a/dist/modules/parse-options.min.js b/dist/modules/parse-options.min.js
diff --git a/dist/modules/parse-options.min.js.map b/dist/modules/parse-options.min.js.map
diff --git a/dist/modules/select.js b/dist/modules/select.js
@@ -153,7 +153,7 @@ angular.module('mgcrea.ngStrap.select', [
           evt.preventDefault();
           evt.stopPropagation();
           // Select with enter
-          if (evt.keyCode === 13 || evt.keyCode === 9) {
+          if (!options.multiple && (evt.keyCode === 13 || evt.keyCode === 9)) {
             return $select.select(scope.$activeIndex);
           }
           // Navigate with keyboard
@@ -185,7 +185,7 @@ angular.module('mgcrea.ngStrap.select', [
           if (options.keyboard) {
             element.off('keydown', $select.$onKeyDown);
           }
-          _hide();
+          _hide(true);
         };
         return $select;
       }

diff --git a/dist/modules/select.min.js b/dist/modules/select.min.js