Merge pull request #215 from MilosMosovsky/fix-dirty-flag

Fix incorrect dirty flag when initializing from JSON #151
angular-ui · Aug 1, 2014 · f81cbc8 · f81cbc8 · jimmywarting · Sep 12, 2014
2 parents 2781639 + 4f06595
commit f81cbc8
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/src/select2.js b/src/select2.js
@@ -139,7 +139,7 @@ angular.module('ui.select2', []).value('uiSelect2Config', {}).directive('uiSelec
               $timeout(function () {
                 elm.select2('val', controller.$viewValue);
                 // Refresh angular to remove the superfluous option
-                elm.trigger('change');
+                controller.$render();
                 if(newVal && !oldVal && controller.$setPristine) {
                   controller.$setPristine(true);
                 }
@@ -221,13 +221,14 @@ angular.module('ui.select2', []).value('uiSelect2Config', {}).directive('uiSelec
 
           // Not sure if I should just check for !isSelect OR if I should check for 'tags' key
           if (!opts.initSelection && !isSelect) {
-            var isPristine = controller.$pristine;
-            controller.$setViewValue(
-              convertToAngularModel(elm.select2('data'))
-            );
-            if (isPristine) {
-              controller.$setPristine();
-            }
+              var isPristine = controller.$pristine;
+              controller.$pristine = false;
+              controller.$setViewValue(
+                  convertToAngularModel(elm.select2('data'))
+              );
+              if (isPristine) {
+                  controller.$setPristine();
+              }
             elm.prev().toggleClass('ng-pristine', controller.$pristine);
           }
         });