From ff81b27fc0b46e6418b7a7f78a297a3bec669ca6 Mon Sep 17 00:00:00 2001 From: Hauke Klement Date: Tue, 10 Mar 2015 18:27:05 +0100 Subject: [PATCH] removed code duplication --- app/assets/javascripts/exercises.js.erb | 5 +---- app/assets/javascripts/forms.js | 15 ++++++++++----- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/assets/javascripts/exercises.js.erb b/app/assets/javascripts/exercises.js.erb index 6468de13..95decf1e 100644 --- a/app/assets/javascripts/exercises.js.erb +++ b/app/assets/javascripts/exercises.js.erb @@ -9,11 +9,8 @@ $(function() { var element = $('#dummies').children().first().clone(); var html = $('
').append(element).html().replace(/index/g, new Date().getTime()); $('#files').append(html); - $('#files select').chosen({ - disable_search_threshold: 5, - search_contains: true - }); $('#files li:last select[name*="file_type_id"]').val(getSelectedExecutionEnvironment().file_type_id); + $('#files li:last select').chosen(window.CodeOcean.CHOSEN_OPTIONS); $('body, html').scrollTo('#add-file'); }; diff --git a/app/assets/javascripts/forms.js b/app/assets/javascripts/forms.js index ce7b4fda..cde3ee68 100644 --- a/app/assets/javascripts/forms.js +++ b/app/assets/javascripts/forms.js @@ -1,4 +1,10 @@ $(function() { + var CHOSEN_OPTIONS = { + allow_single_deselect: true, + disable_search_threshold: 5, + search_contains: true + }; + $('form').on('click', '.toggle-input', function(event) { event.preventDefault(); if (!$(this).hasClass('disabled')) { @@ -14,9 +20,8 @@ $(function() { } }); - $('select:visible').chosen({ - allow_single_deselect: true, - disable_search_threshold: 5, - search_contains: true - }); + window.CodeOcean = window.CodeOcean || {}; + window.CodeOcean.CHOSEN_OPTIONS = CHOSEN_OPTIONS; + + $('select:visible').chosen(CHOSEN_OPTIONS); });