From c7b891f9a3e65d7832e3aedf7462865f4eaa4b42 Mon Sep 17 00:00:00 2001
From: Quentin Raynaud <github@undoso.eu>
Date: Sun, 18 May 2014 19:40:55 +0200
Subject: [PATCH] Support options.separator and external jQuery

- if select2.options.separator is used, then act accordingly
- if angular is loaded with jQlite (ptobably because jQuery
  was loaded after angular), keep things working
---
 src/select2.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/select2.js b/src/select2.js
index 828032d..c788fc2 100644
--- a/src/select2.js
+++ b/src/select2.js
@@ -14,6 +14,10 @@ angular.module('ui.select2', []).value('uiSelect2Config', {}).directive('uiSelec
     require: 'ngModel',
     priority: 1,
     compile: function (tElm, tAttrs) {
+      // Do this to use the external jQuery instead of angular.element
+      // if angular is loaded with jQlite and not jQuery
+      tElm = $(tElm[0]);
+
       var watch,
         repeatOption,
         repeatAttr,
@@ -22,7 +26,7 @@ angular.module('ui.select2', []).value('uiSelect2Config', {}).directive('uiSelec
 
       // Enable watching of the options dataset if in use
       if (tElm.is('select')) {
-        repeatOption = tElm.find( 'optgroup[ng-repeat], optgroup[data-ng-repeat], option[ng-repeat], option[data-ng-repeat]');
+        repeatOption = tElm.find('optgroup[ng-repeat], optgroup[data-ng-repeat], option[ng-repeat], option[data-ng-repeat]');
 
         if (repeatOption.length) {
           repeatAttr = repeatOption.attr('ng-repeat') || repeatOption.attr('data-ng-repeat');
@@ -31,6 +35,10 @@ angular.module('ui.select2', []).value('uiSelect2Config', {}).directive('uiSelec
       }
 
       return function (scope, elm, attrs, controller) {
+        // Do this to use the external jQuery instead of angular.element
+        // if angular is loaded with jQlite and not jQuery
+        elm = $(elm[0]);
+
         // instance-specific options
         var opts = angular.extend({}, options, scope.$eval(attrs.uiSelect2));
 
@@ -98,7 +106,7 @@ angular.module('ui.select2', []).value('uiSelect2Config', {}).directive('uiSelec
               if (opts.multiple) {
                 var viewValue = controller.$viewValue;
                 if (angular.isString(viewValue)) {
-                  viewValue = viewValue.split(',');
+                  viewValue = viewValue.split(opts.separator || ',');
                 }
                 elm.select2(
                   'data', convertToSelect2Model(viewValue));