Merge pull request #17 from anatolikurtsevich/master

Made bower.json correct and fixed bug: typo in settings.scrollableHeight option using.

Author: dotansimha

bower.json

@@ -7,7 +7,7 @@
   "description": "AngularJS Dropdown Multiselect directive",
   "keywords": ["angular", "angularjs", "directive", "dropdown", "multiselect", "checklist", "list", "bootstrap", "checkbox"],
   "license": "MIT",
-  "main": "dist/angularjs-dropdown-multiselect.min.js",
+  "main": "src/angularjs-dropdown-multiselect.js",
   "ignore": [
     "**/.*",
     "node_modules",
@@ -16,15 +16,17 @@
     "tests"
   ],
   "dependencies": {
+    "angular": "~1.2.0",
+    "lodash": "~2.4.1"
+  },
+  "devDependencies": {
     "angular": "~1.2.0",
     "angular-animate": "~1.2.0",
     "angular-sanitize": "~1.2.0",
     "angular-touch": "~1.2.0",
     "angular-route": "~1.2.0",
     "lodash": "~2.4.1",
-    "bootstrap": "~3.1.1"
-  },
-  "devDependencies": {
+    "bootstrap": "~3.1.1",
     "angular-highlightjs": "~0.2.7"
   }
 }

dist/angularjs-dropdown-multiselect.min.js

@@ -21,7 +21,7 @@ directiveModule.directive('ngDropdownMultiselect', ['$filter', '$document', '$co
 
                 var template = '<div class="multiselect-parent btn-group dropdown-multiselect">';
                 template += '<button type="button" class="dropdown-toggle" ng-class="settings.buttonClasses" ng-click="toggleDropdown()">{{getButtonText()}}&nbsp;<span class="caret"></span></button>';
-                template += '<ul class="dropdown-menu dropdown-menu-form" ng-style="{display: open ? \'block\' : \'none\', height : settings.scrollable ?   \'settings.scrollableHeight\' : \'auto\' }" style="overflow: scroll" >';
+                template += '<ul class="dropdown-menu dropdown-menu-form" ng-style="{display: open ? \'block\' : \'none\', height : settings.scrollable ? settings.scrollableHeight : \'auto\' }" style="overflow: scroll" >';
                 template += '<li ng-hide="!settings.showCheckAll || settings.selectionLimit > 0"><a data-ng-click="selectAll()"><span class="glyphicon glyphicon-ok"></span>  {{texts.checkAll}}</a>';
                 template += '<li ng-show="settings.showUncheckAll"><a data-ng-click="deselectAll();"><span class="glyphicon glyphicon-remove"></span>   {{texts.uncheckAll}}</a></li>';
                 template += '<li ng-hide="(!settings.showCheckAll || settings.selectionLimit > 0) && !settings.showUncheckAll" class="divider"></li>';