Merge pull request #12 from lou/keepOrder

Keep order

2 files changed, 28 insertions, 2 deletions

diff --git a/js/application.js b/js/application.js
index 81a2fe6..d2dbaae 100644
--- a/js/application.js
+++ b/js/application.js
@@ -28,6 +28,8 @@
     
     $('#simpleCountries').multiSelect({});
 
+    $('#ikeeporder').multiSelect({ keepOrder: true });
+
     $('#empty-array-select').multiSelect({ emptyArray: true})
     
     $('#callbackCountries').multiSelect({
diff --git a/js/jquery.multi-select.js b/js/jquery.multi-select.js
index 7ed4e31..9858296 100644
--- a/js/jquery.multi-select.js
+++ b/js/jquery.multi-select.js
@@ -13,7 +13,8 @@
     'init' : function(options){
       this.settings = {
         disabledClass : 'disabled',
-        emptyArray : false
+        emptyArray : false,
+        keepOrder : false
       };
       if(options) {
         this.settings = $.extend(this.settings, options);
@@ -119,7 +120,30 @@
           selectedLi.click(function(){
             ms.multiSelect('deselect', $(this).attr('ms-value'));
           });
-          selectedUl.append(selectedLi);
+
+          var selectedUlLis = selectedUl.children('.ms-elem-selected');
+          if (method != 'init' && ms.data('settings').keepOrder && selectedUlLis.length > 0) {
+
+            var getIndexOf = function(value) {
+              elems = selectableUl.children('.ms-elem-selectable');
+              return(elems.index(elems.closest('[ms-value="'+value+'"]')));
+            }
+            
+            var index = getIndexOf(selectedLi.attr('ms-value'));
+            if (index == 0)
+              selectedUl.prepend(selectedLi);
+            else {
+              for (i = index - 1; i >= 0; i--){
+                if (selectedUlLis[i] && getIndexOf($(selectedUlLis[i]).attr('ms-value')) < index) {
+                  $(selectedUlLis[i]).after(selectedLi);
+                  break;
+                }
+              }
+            }
+          } else {
+            selectedUl.append(selectedLi);
+          }
+
           if (ms.find("option[value='']")){
             ms.find("option[value='']").removeAttr('selected');
           }