From 104332525d1deafaa06706cadadb206a248d64af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Lege=CC=81n=CC=8C?= <legen.peter90@gmail.com>
Date: Wed, 11 Sep 2013 11:55:28 +0200
Subject: [PATCH 1/2] #12 Fix for sorting select element

---
 src/select2.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/select2.js b/src/select2.js
index d8c50fa..7a106df 100644
--- a/src/select2.js
+++ b/src/select2.js
@@ -16,6 +16,7 @@ angular.module('ui.select2', []).value('uiSelect2Config', {}).directive('uiSelec
       var watch,
         repeatOption,
         repeatAttr,
+        init,
         isSelect = tElm.is('select'),
         isMultiple = (tAttrs.multiple !== undefined);
 
@@ -92,7 +93,10 @@ angular.module('ui.select2', []).value('uiSelect2Config', {}).directive('uiSelec
           }, true)
           controller.$render = function () {
             if (isSelect) {
-              elm.select2('val', controller.$viewValue);
+              if (!init) {
+                elm.select2('val', controller.$viewValue);
+                init = true;
+              }
             } else {
               if (opts.multiple) {
                 elm.select2(

From cb94835b123d6ba3fdcfe015833f438bc3e15fee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Lege=CC=81n=CC=8C?= <legen.peter90@gmail.com>
Date: Thu, 12 Sep 2013 11:09:51 +0200
Subject: [PATCH 2/2] wait for initialization

---
 src/select2.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/select2.js b/src/select2.js
index 7a106df..e671aa6 100644
--- a/src/select2.js
+++ b/src/select2.js
@@ -95,7 +95,9 @@ angular.module('ui.select2', []).value('uiSelect2Config', {}).directive('uiSelec
             if (isSelect) {
               if (!init) {
                 elm.select2('val', controller.$viewValue);
-                init = true;
+				if (controller.$viewValue) {
+					init = true;
+				}
               }
             } else {
               if (opts.multiple) {