Apply machineboy2045#135

Author: fstr

dist/angular-selectize.js

@@ -17,7 +17,10 @@ angular.module('selectize', []).value('selectizeConfig', {}).directive("selectiz
       scope.config = scope.config || {};
 
       var isEmpty = function(val) {
-        return val === undefined || val === null || !val.length; //support checking empty arrays
+          if(angular.isArray(val)) {
+              return (val.length === 0);
+          }
+          return modelCtrl.$isEmpty(val); //call to real Angular function
       };
 
       var toggle = function(disabled) {
@@ -44,16 +47,16 @@ angular.module('selectize', []).value('selectizeConfig', {}).directive("selectiz
       }
 
       var setSelectizeValue = function() {
+        if (!angular.equals(selectize.items, scope.ngModel)) {
+          selectize.setValue(scope.ngModel, true);
+        }
+        
         validate();
 
         selectize.$control.toggleClass('ng-valid', modelCtrl.$valid);
         selectize.$control.toggleClass('ng-invalid', modelCtrl.$invalid);
         selectize.$control.toggleClass('ng-dirty', modelCtrl.$dirty);
         selectize.$control.toggleClass('ng-pristine', modelCtrl.$pristine);
-
-        if (!angular.equals(selectize.items, scope.ngModel)) {
-          selectize.setValue(scope.ngModel, true);
-        }
       }
 
       settings.onChange = function(value) {