From d54fd4dd0e584b3e363ec8c5cb8997c1e1cfabb4 Mon Sep 17 00:00:00 2001
From: Dean Sofer <proloser@hotmail.com>
Date: Fri, 20 Jul 2012 19:10:33 -0700
Subject: [PATCH] Passing a string to select2('val') with initSelection causes
 it to be used.

Signed-off-by: Igor Vaynberg <igor.vaynberg@gmail.com>
---
 select2.js | 36 ++++++++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/select2.js b/select2.js
index 28578b11..0ffa3064 100755
--- a/select2.js
+++ b/select2.js
@@ -1429,7 +1429,7 @@
 
         // single
         val: function () {
-            var val, data = null;
+            var val, data = null, self = this;
 
             if (arguments.length === 0) {
                 return this.opts.element.val();
@@ -1448,8 +1448,18 @@
                 this.updateSelection(data);
             } else {
                 // val is an object. !val is true for [undefined,null,'']
-                this.opts.element.val(!val ? "" : this.id(val));
-                this.updateSelection(val);
+                if (this.opts.initSelection) {
+                    that = this;
+                    this.opts.initSelection(this.opts.element.val(val), function(data){
+                        self.opts.element.val(!data ? "" : self.id(data));
+                        self.updateSelection(data);
+                        self.setPlaceholder();
+                    });
+                    return;
+                } else {
+                    this.opts.element.val(!val ? "" : this.id(val));
+                    this.updateSelection(val);
+                }
             }
             this.setPlaceholder();
 
@@ -1905,11 +1915,21 @@
                 });
                 this.updateSelection(data);
             } else {
-                val = (val === null) ? [] : val;
-                // val is a list of objects
-                $(val).each(function () { data.push(self.id(this)); });
-                this.setVal(data);
-                this.updateSelection(val);
+                if (this.opts.initSelection) {
+                    this.opts.initSelection(this.opts.element.val(val), function(newVal){
+                        $(newVal).each(function () { data.push(self.id(this)); });
+                        self.setVal(data);
+                        self.updateSelection(newVal);
+                        self.clearSearch();
+                    });
+                    return;
+                } else {	
+                    val = (val === null) ? [] : val;
+                    // val is a list of objects
+                    $(val).each(function () { data.push(self.id(this)); });
+                    this.setVal(data);
+                    this.updateSelection(val);
+                }
             }
 
             this.clearSearch();