Fixes $watch on options model

The reference to $scope.options was being overwritten. This saves what's returned from the generateOptions function and pushes it to an emptied scope.options while keeping its reference. Resolves machineboy2045#63
miketeix · Mar 31, 2015 · d1b81ba · d1b81ba
1 parent 4662161
commit d1b81ba
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/dist/selectize.js b/dist/selectize.js
@@ -89,13 +89,17 @@ angular.module('selectize', []).value('selectizeConfig', {}).directive("selectiz
 
       // ngModel (ie selected items) is included in this because if no options are specified, we
       // need to create the corresponding options for the items to be visible
-      scope.options = generateOptions( (scope.options || config.options || scope.ngModel).slice() );
+      scope.generatedOptions = generateOptions( (scope.options || config.options || scope.ngModel).slice() );
+      scope.options.length = 0;
+      scope.generatedOptions.forEach(function (item) {
+        scope.options.push(item);
+      });
 
       var angularCallback = config.onInitialize;
 
       config.onInitialize = function(){
         selectize = element[0].selectize;
-        selectize.addOption(scope.options)
+        selectize.addOption(scope.generatedOptions)
         selectize.setValue(scope.ngModel)
 
         //provides a way to access the selectize element from an
@@ -105,9 +109,14 @@ angular.module('selectize', []).value('selectizeConfig', {}).directive("selectiz
         }
 
         scope.$watch('options', function(){
+          scope.generatedOptions = generateOptions( (scope.options || config.options || scope.ngModel).slice() );
+          scope.options.length = 0;
+          scope.generatedOptions.forEach(function (item) {
+            scope.options.push(item);
+          });
           selectize.clearOptions();
-          selectize.addOption(scope.options)
-          selectize.setValue(scope.ngModel)
+          selectize.addOption(scope.generatedOptions);
+          selectize.setValue(scope.ngModel);
         }, true);
 
         scope.$watchCollection('ngModel', updateSelectize);