Merge pull request sonata-project#2009 from kluevandrew/patch-1

Fix bootrstrap popover for select2 field
jonas8 · Apr 1, 2014 · 557c47c · 557c47c
2 parents 832af3a + 8b8fdf5
commit 557c47c
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/Resources/public/base.js b/Resources/public/base.js
@@ -113,11 +113,14 @@ var Admin = {
             }
 
             var target = input,
-                fieldShortDescription = input.closest('.field-container').find('.field-short-description')
-            ;
-
+                fieldShortDescription = input.closest('.field-container').find('.field-short-description'),
+                select2 = input.closest('.select2-container')
+                ;
+
             if (fieldShortDescription.length) {
                 target = fieldShortDescription;
+            } else if (select2.length) {
+                target= select2;
             }
 
             target.popover({