From f04662235547aa4e46c3be56c4a5dbfa92f698ab Mon Sep 17 00:00:00 2001 From: gusreiber Date: Thu, 10 Mar 2016 15:05:00 -0800 Subject: [PATCH] fixing merge goop --- core/src/main/resources/lib/form/select/select.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/core/src/main/resources/lib/form/select/select.js b/core/src/main/resources/lib/form/select/select.js index 4165166619..5d1262efb1 100644 --- a/core/src/main/resources/lib/form/select/select.js +++ b/core/src/main/resources/lib/form/select/select.js @@ -44,11 +44,8 @@ Behaviour.specify("SELECT.select", 'select', 1000, function(e) { function hasChanged(selectEl, originalValue) { // seems like a race condition allows this to fire before the 'selectEl' is defined. If that happens, exit.. -<<<<<<< HEAD + if(!selectEl || !selectEl.options || !selectEl.options[0]) -======= - if(!selectEl || !selectEl.options || !selectEl[0]) ->>>>>>> 219481a2926a6a6e2d86753f250449ba73f198ba return false; var firstValue = selectEl.options[0].value; var selectedValue = selectEl.value; -- GitLab