bump

Author: joaoneto

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
+## 2014-08-03
+- added track by (by João Neto <joaopintoneto@gmail.com>)
+
+## 2014-08-02
+- fixed ng-required ref #9 (by João Neto <joaopintoneto@gmail.com>)
+
+## 2014-06-23
+- Fixing script path (by Danilo Valente <danilovalente96@gmail.com>)
+- Fixing script path (by Danilo Valente <danilovalente96@gmail.com>)
+
 ## 2014-06-21
+- updated .travis.yml (by João Neto <joaopintoneto@gmail.com>)
+- updated .travis.yml (by João Neto <joaopintoneto@gmail.com>)
+- updated .travis.yml (by João Neto <joaopintoneto@gmail.com>)
+- renamed travis config file (by João Neto <joaopintoneto@gmail.com>)
+- updated CHANGELOG.md (by João Neto <joaopintoneto@gmail.com>)
 - build (by João Neto <joaopintoneto@gmail.com>)
 - added CHANGELOG.md to bower.json ignore (by João Neto <joaopintoneto@gmail.com>)
 - added capability to handle ng-options added capability to configure bootstrap select options fix tests (by João Neto <joaopintoneto@gmail.com>)

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-bootstrap-select",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "main": "./build/angular-bootstrap-select.js",
   "description": "Directive to wrap bootstrap-select",
   "author": "https://github.com/joaoneto/angular-bootstrap-select/graphs/contributors",

build/angular-bootstrap-select.js

@@ -4,52 +4,54 @@ angular.module('angular-bootstrap-select.extra', [])
     return {
       restrict: 'A',
       link: function (scope, element, attrs) {
-        //prevent directive from attaching itself to everything that defines a toggle attribute
+        // prevent directive from attaching itself to everything that defines a toggle attribute
         if (!element.hasClass('selectpicker')) {
           return;
         }
 
         var target = element.parent();
+        var toggleFn = function () {
+          target.toggleClass('open');
+        };
+        var hideFn = function () {
+          target.removeClass('open');
+        };
 
-        element.bind('click', function () {
-          target.toggleClass('open')
-        });
+        element.on('click', toggleFn);
+        element.next().on('click', hideFn);
 
-        element.next().find('li').bind('click', function () {
-          target.toggleClass('open')
-        })
+        scope.$on('$destroy', function () {
+          element.off('click', toggleFn);
+          element.next().off('click', hideFn);
+        });
       }
     };
   });
 
 angular.module('angular-bootstrap-select', [])
-.directive('selectpicker', ['$timeout', '$parse', function ($timeout, $parse) {
+  .directive('selectpicker', ['$parse', function ($parse) {
     return {
       restrict: 'A',
       require: '?ngModel',
-      priority: 1001,
+      priority: 10,
       compile: function (tElement, tAttrs, transclude) {
         tElement.selectpicker($parse(tAttrs.selectpicker)());
+        tElement.selectpicker('refresh');
         return function (scope, element, attrs, ngModel) {
-          if (angular.isUndefined(ngModel)){
-            return;
-          }
+          if (!ngModel) return;
 
-          scope.$watch(attrs.ngModel, function () {
-            $timeout(function () {
-              element.selectpicker('val', element.val());
+          scope.$watch(attrs.ngModel, function (newVal, oldVal) {
+            scope.$evalAsync(function () {
+              if (!attrs.ngOptions || /track by/.test(attrs.ngOptions)) element.val(newVal);
               element.selectpicker('refresh');
             });
           });
 
           ngModel.$render = function () {
-            $timeout(function () {
-              element.selectpicker('val', ngModel.$viewValue || '');
+            scope.$evalAsync(function () {
               element.selectpicker('refresh');
             });
-          };
-
-          ngModel.$viewValue = element.val();
+          }
         };
       }
 

build/angular-bootstrap-select.min.js

@@ -1,6 +1,6 @@
 {
   "name": "angular-bootstrap-select",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "Directive to wrap bootstrap-select",
   "devDependencies": {
     "grunt-karma": "~0.4.5",