Merge pull request #27 from dnasir/dev

Merge dev > master
dnasir · Mar 4, 2014 · 9462d97 · 9462d97
2 parents c031bc0 + 406ff2a
commit 9462d97
Showing 1 changed file with 11 additions and 12 deletions.
diff --git a/jquery.cascadingdropdown.js b/jquery.cascadingdropdown.js
@@ -1,5 +1,5 @@
 /* 
- *   jQuery Cascading Dropdown Plugin 1.2.4
+ *   jQuery Cascading Dropdown Plugin 1.2.5
  *   https://github.com/dnasir/jquery-cascading-dropdown
  *
  *   Copyright 2013, Dzulqarnain Nasir
@@ -96,11 +96,12 @@
                     response($.map(self.options.source, function(item) {
                         return {
                             label: item.label || item.value || item,
-                            value: item.value || item.label || item
+                            value: item.value || item.label || item,
+                            selected: item.selected
                         };
                     }));
                 };
-            } else if ( typeof self.options.source === "string" ) {
+            } else if ( typeof self.options.source === 'string' ) {
                 var url = self.options.source;
 
                 this.source = function(request, response) {
@@ -147,11 +148,6 @@
             // Disable it first
             self.disable();
 
-            // Set selected dropdown item if defined
-            if(!self.initialised) {
-                self.options.selected && self.setSelected(self.options.selected);
-            }
-
             // If required dropdowns have no value, return
             if(!self._requirementsMet()) {
                 self.setSelected(0);
@@ -229,10 +225,13 @@
 
         // Trigger the ready event when instance is initialised for the first time
         _triggerReady: function() {
-            if(!this.initialised) {
-                this.initialised = true;
-                this.el.triggerHandler('ready');
-            }
+            if(this.initialised) return;
+
+            // Set selected dropdown item if defined
+            this.options.selected && this.setSelected(this.options.selected);
+
+            this.initialised = true;
+            this.el.triggerHandler('ready');
         },
 
         // Sets the selected dropdown item