issue: Fix single label recovery bug

See: Yona Github issue yona-projects#112
helols · Mar 16, 2017 · b5db52a · b5db52a
1 parent 4decb21
commit b5db52a
Showing 1 changed file with 18 additions and 6 deletions.
diff --git a/public/javascripts/common/yobi.ui.Select2.js b/public/javascripts/common/yobi.ui.Select2.js
@@ -191,22 +191,28 @@
                     var data = [evt.object];
                     var element = $(evt.object.element);
                     var select2Object = $(evt.target).data("select2");
+                    var oldData = select2Object.data()
 
                     // Remove label which category is same with selected label from current data
                     // if selected label belonged exclusive category
                     if(element.data("categoryIsExclusive")){
-                        var filtered = _filterLabelInSameCategory(evt.object, select2Object.data());
+                        var categoryId = $(evt.object.element).data("categoryId");
+                        var filtered = _filterLabelInSameCategory(categoryId, oldData);
                         data = data.concat(filtered);
+
+                        if(oldData.length != filtered.length){
+                            _unselect(select2Object, categoryId);
+                        }
                     } else {
-                        data = data.concat(select2Object.data());
+                        data = data.concat(oldData);
                     }
 
                     _rememberLastScrollTop();
 
                     // Set data as filtered
                     // and trigger "change" event
                     select2Object.data(data, true);
-
+                
                     if(select2Object.opts.closeOnSelect !== false){
                         select2Object.close();
                     }
@@ -215,9 +221,7 @@
                     return false;
                 }
 
-                function _filterLabelInSameCategory(label, currentData){
-                    var categoryId = $(label.element).data("categoryId");
-
+                function _filterLabelInSameCategory(categoryId, currentData){
                     return currentData.filter(function(data){
                         return (categoryId !== $(data.element).data("categoryId"));
                     });
@@ -240,6 +244,14 @@
                 function _onOpenIssueLabel(){
                     _restoreLastScrollTop();
                 }
+
+                // When select2 v3.x is migrated to v4.x, it will probably need to be updated.
+                function _unselect(select2Object, categoryId){
+                    select2Object.results.find(".select2-selected").filter(function(){
+                        var optionElement = $(this).data("select2-data").element; 
+                        return $(optionElement).data("categoryId") === categoryId; 
+                    }).removeClass("select2-selected");
+                }
             }
         };