diff --git a/app/views/shared/_accessible_combobox.html.erb b/app/views/shared/_accessible_combobox.html.erb
index c648cd8..1bfef5e 100644
--- a/app/views/shared/_accessible_combobox.html.erb
+++ b/app/views/shared/_accessible_combobox.html.erb
@@ -1,7 +1,6 @@
<% if !models.nil? %>
<% json = {} %>
<% models.map{|m| json[m[attribute]] = m.id} %>
- <%= tip = tooltip ||= '' %>
" name="<%= name.gsub("_#{attribute}]", "_id]") %>"
value="<%= default_selection.id unless default_selection.nil? %>" />
- " class="error-tooltip left-indent">
+
<% else %>
diff --git a/lib/assets/javascripts/dmproadmap/forms.js b/lib/assets/javascripts/dmproadmap/forms.js
index 3ac7c46..4136bbc 100644
--- a/lib/assets/javascripts/dmproadmap/forms.js
+++ b/lib/assets/javascripts/dmproadmap/forms.js
@@ -46,6 +46,11 @@
err = $(input).siblings("span.error-tooltip-right");
}
+ // If no error container was found its an accessible combobox
+ if(err.attr('id') === undefined){
+ err = $(input).parent().siblings("span.error-tooltip");
+ }
+
// If an error element is available and the error message is not empty and the field
// is not empty (unless its a required field!)
if(err.length > 0 && (errorMessage === '' || (!blankAsError && $(input).val().trim().length <= 0))){
diff --git a/lib/assets/javascripts/views/plans/new.js b/lib/assets/javascripts/views/plans/new.js
index 69579fa..2391ec9 100644
--- a/lib/assets/javascripts/views/plans/new.js
+++ b/lib/assets/javascripts/views/plans/new.js
@@ -19,16 +19,6 @@
handleComboboxChange();
});
- // If there was no selection, highlight the box and display tooltip
- $("#plan_funder_name").blur(function(){
- var msg = ($("#plan_funder_id").val().trim().length <= 0 ? __('Please select a valid funding organisation from the list.') : '');
- toggleInputError($("#plan_funder_id"), msg, true);
- });
- $("#plan_org_name").blur(function(){
- var msg = ($("#plan_org_id").val().trim().length <= 0 ? __('Please select a valid research organisation from the list.') : '');
- toggleInputError($("#plan_org_id"), msg, true);
- });
-
// Make sure the checkbox is unchecked if we're entering text
$(".js-combobox").keyup(function(){
var whichOne = $(this).prop('id').split('_')[1];