Merge pull request #54 from dnasir/Issue#50

Issue#50

Author: dnasir

bower.json

@@ -6,7 +6,11 @@
     "Dzulqarnain Nasir <[email protected]>"
   ],
   "description": "A simple and lighweight jQuery plugin for creating cascading dropdowns.",
-  "main": "dist/jquery.cascadingdropdown.js",
+  "main": [
+      "dist/jquery.cascadingdropdown.js",
+      "dist/jquery.cascadingdropdown.min.js",
+      "dist/jquery.cascadingdropdown.min.js.map"
+  ],
   "keywords": [
     "jquery",
     "cascading",
@@ -20,6 +24,6 @@
     "bower_components"
   ],
   "dependencies": {
-    "jquery": "~1.11.2"
+    "jquery": "^1.11.2"
   }
 }

dist/jquery.cascadingdropdown.js

@@ -215,13 +215,13 @@
                 return;
             }
 
-            var selected;
+            var selected = [];
 
             // Add all items as dropdown item
             var getOption = function(item) {
               var selectedAttr = '';
               if(item.selected) {
-                selected = item;
+                selected.push(item.value.toString());
               }
 
               return '<option value="' + item.value + '"' + selectedAttr + '>' + item.label + '</option>';
@@ -248,7 +248,7 @@
             self.enable();
 
             // If a selected item exists, set it as default
-            selected && self.setSelected(selected.value.toString());
+            selected.length && self.setSelected(selected);
 
             self._triggerReady();
         },
@@ -273,19 +273,43 @@
             if(typeof triggerChange === 'undefined') {
                 triggerChange = true;
             }
-
-            // If given value is a string, get the index where it appears in the dropdown
-            if(typeof indexOrValue === 'string') {
-                indexOrValue = dropdownItems.index(dropdownItems.filter(function() { return this.value === indexOrValue; })[0]);
+            
+            var selectedItems = [];
+            
+            // check if indexOrValue is an array
+            if($.isArray(indexOrValue)) {
+                selectedItems = indexOrValue;
+            } else {
+                selectedItems = selectedItems.concat(indexOrValue);
             }
 
-            // If index is undefined or out of bounds, do nothing
-            if(indexOrValue === undefined || indexOrValue < 0 || indexOrValue > dropdownItems.length) {
-                return;
-            }
+            var selectedValue;
+            if(self.el.is('[multiple]')) {
+                selectedValue = selectedItems.map(function(item) {
+                    if(typeof item === 'number'
+                        && (item !== undefined 
+                        && item > -1 
+                        && item < dropdownItems.length)) {
+                        return dropdownItems[item].value
+                    }
+                    
+                    return item;
+                });
 
+            } else {
+                selectedValue = selectedItems[0];
+
+                // if selected item is a number, get the value for the item at that index
+                if(typeof selectedItems[0] === 'number' 
+                    && (selectedItems[0] !== undefined 
+                    && selectedItems[0] > -1 
+                    && selectedItems[0] < dropdownItems.length)) {
+                    selectedValue = dropdownItems[selectedItems[0]].value;
+                }
+            }
+            
             // Set the dropdown item
-            self.el[0].selectedIndex = indexOrValue;
+            self.el.val(selectedValue);
 
             // Trigger change event
             if(triggerChange) {