Fix #244 ng-model sync

Doing so while preserving the workaround for #59
leocaseiro · Jul 20, 2017 · eef6b3c · eef6b3c
1 parent 7f2f507
commit eef6b3c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/dist/angular-chosen.js b/dist/angular-chosen.js
@@ -87,8 +87,8 @@
           initOrUpdate = function() {
             var defaultText, dropListDom;
             if (chosen) {
-              dropListDom = $(element.parent()).find("div.chosen-drop");
-              if (dropListDom && dropListDom.length > 0 && parseInt(dropListDom.css("left")) >= 0) {
+              dropListDom = $(element.next('.chosen-with-drop'));
+              if (dropListDom && dropListDom.length > 0) {
                 return;
               }
               return element.trigger('chosen:updated');

diff --git a/dist/angular-chosen.min.js b/dist/angular-chosen.min.js
diff --git a/src/chosen.coffee b/src/chosen.coffee
@@ -94,10 +94,10 @@ chosenModule.directive 'chosen', ['chosen', '$timeout', (config, $timeout) ->
     initOrUpdate = ->
       if chosen
         # Fix #56 Don't scroll to top when selecting multiple items with ctrl
-        dropListDom = $(element.parent()).find("div.chosen-drop") #uses jQuery instead of Angular.
-        if dropListDom && dropListDom.length > 0 && parseInt(dropListDom.css("left")) >= 0
+        dropListDom = $(element.next('.chosen-with-drop')) #uses jQuery instead of Angular.
+        if dropListDom && dropListDom.length > 0
           return
-        return element.trigger('chosen:updated')
+        element.trigger('chosen:updated')
       else
         scope.$evalAsync ->
          chosen = element.chosen(options).data('chosen')

diff --git a/test/base.spec.js b/test/base.spec.js
@@ -11,6 +11,7 @@ describe('base functionality', function() {
     $scope.$digest();
     $timeout.flush();
     element.trigger('chosen:open.chosen'); // fills dropdown (triggers chosen:showing_dropdown when finished)
+    element.trigger('chosen:close.chosen');
   });
 
   it('should add chosen dropdown', function() {