Merge branch 'BDomzalski-patch-1'

Author: jseppi

angular-dropdowns.js

@@ -68,11 +68,12 @@ dd.directive('dropdownSelect', ['DropdownService',
       scope: {
         dropdownSelect: '=',
         dropdownModel: '=',
+        dropdownItemLabel: '@',
         dropdownOnchange: '&'
       },
 
-      controller: ['$scope', '$element', '$attrs', function ($scope, $element, $attrs) {
-        $scope.labelField = $attrs.dropdownItemLabel || 'text';
+      controller: ['$scope', '$element', function ($scope, $element) {
+        $scope.labelField = $scope.dropdownItemLabel || 'text';
 
         DropdownService.register($element);
 
@@ -131,11 +132,12 @@ dd.directive('dropdownMenu', ['$parse', '$compile', 'DropdownService', '$templat
       scope: {
         dropdownMenu: '=',
         dropdownModel: '=',
+        dropdownItemLabel: '@',
         dropdownOnchange: '&'
       },
 
-      controller: ['$scope', '$element', '$attrs', function ($scope, $element, $attrs) {
-        $scope.labelField = $attrs.dropdownItemLabel || 'text';
+      controller: ['$scope', '$element', function ($scope, $element) {
+        $scope.labelField = $scope.dropdownItemLabel || 'text';
 
         var $template = angular.element($templateCache.get('ngDropdowns/templates/dropdownMenu.html'));
         // Attach this controller to the element's data
@@ -233,4 +235,4 @@ dd.factory('DropdownService', ['$document',
     return service;
   }
 ]);
-})(window, window.angular);
+})(window, window.angular);

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-dropdowns",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "homepage": "https://github.com/jseppi/angular-dropdowns",
   "authors": [
     "James Seppi <[email protected]> (http://github.com/jseppi)",
@@ -11,7 +11,8 @@
     "tlvince",
     "dinodsaurus",
     "elishacook",
-    "alexisbg"
+    "alexisbg",
+    "BDomzalski"
   ],
   "description": "AngularJS Dropdown Directives",
   "main": [

dist/angular-dropdowns.js

@@ -68,11 +68,12 @@ dd.directive('dropdownSelect', ['DropdownService',
       scope: {
         dropdownSelect: '=',
         dropdownModel: '=',
+        dropdownItemLabel: '@',
         dropdownOnchange: '&'
       },
 
-      controller: ['$scope', '$element', '$attrs', function ($scope, $element, $attrs) {
-        $scope.labelField = $attrs.dropdownItemLabel || 'text';
+      controller: ['$scope', '$element', function ($scope, $element) {
+        $scope.labelField = $scope.dropdownItemLabel || 'text';
 
         DropdownService.register($element);
 
@@ -131,11 +132,12 @@ dd.directive('dropdownMenu', ['$parse', '$compile', 'DropdownService', '$templat
       scope: {
         dropdownMenu: '=',
         dropdownModel: '=',
+        dropdownItemLabel: '@',
         dropdownOnchange: '&'
       },
 
-      controller: ['$scope', '$element', '$attrs', function ($scope, $element, $attrs) {
-        $scope.labelField = $attrs.dropdownItemLabel || 'text';
+      controller: ['$scope', '$element', function ($scope, $element) {
+        $scope.labelField = $scope.dropdownItemLabel || 'text';
 
         var $template = angular.element($templateCache.get('ngDropdowns/templates/dropdownMenu.html'));
         // Attach this controller to the element's data
@@ -233,4 +235,4 @@ dd.factory('DropdownService', ['$document',
     return service;
   }
 ]);
-})(window, window.angular);
+})(window, window.angular);

dist/angular-dropdowns.min.js

@@ -1,6 +1,6 @@
 {
   "name": "angular-dropdowns",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "author": {
     "name": "James Seppi",
     "email": "[email protected]",
@@ -23,7 +23,8 @@
     "tlvince",
     "dinodsaurus",
     "elishacook",
-    "alexisbg"
+    "alexisbg",
+    "BDomzalski"
   ],
   "repository": {
     "type": "git",
@@ -37,11 +38,6 @@
     "gulp-rename": "^1.2.0",
     "gulp-rimraf": "^0.1.0",
     "gulp-uglify": "^0.3.2",
-    "jshint-stylish": "^0.4.0",
-    "karma": "^0.12.22"
-  },
-  "engines": {
-    "node": "0.10.x",
-    "npm": "1.4.x"
+    "jshint-stylish": "^0.4.0"
   }
 }