Update other parts for select2 4.0

huginn · Nov 18, 2016 · 26b1dc4 · 26b1dc4
1 parent 835fe96
commit 26b1dc4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/app/assets/javascripts/components/core.js.coffee b/app/assets/javascripts/components/core.js.coffee
@@ -18,7 +18,7 @@ $ ->
 
   $(".select2-linked-tags").select2(
     width: 'resolve',
-    formatSelection: (obj) ->
+    templateSelection: (obj) ->
       "<a href=\"#{this.element.data('urlPrefix')}/#{obj.id}/edit\" onClick=\"Utils.select2TagClickHandler(event, this)\">#{Utils.escape(obj.text)}</a>"
   )
 
@@ -33,4 +33,4 @@ $ ->
       sel.addRange(range)
 
   # Agent navbar dropdown
-  $('.navbar .dropdown.dropdown-hover').hover (-> $(this).addClass('open')), (-> $(this).removeClass('open'))
+  $('.navbar .dropdown.dropdown-hover').hover (-> $(this).addClass('open')), (-> $(this).removeClass('open'))
diff --git a/app/assets/javascripts/pages/scenario-form-page.js.coffee b/app/assets/javascripts/pages/scenario-form-page.js.coffee
@@ -9,7 +9,8 @@ class @ScenarioFormPage
   enabledSelect2: () ->
     $('.select2-fountawesome-icon').select2
       width: '100%'
-      formatResult: @format
-
+      escapeMarkup: (m) -> m
+      templateResult: @format
+
 $ ->
-  Utils.registerPage(ScenarioFormPage, forPathsMatching: /^scenarios/)
+  Utils.registerPage(ScenarioFormPage, forPathsMatching: /^scenarios/)