From 81eb02296df582e7ef08d9dcb901468d53c76afc Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 27 Jun 2015 14:53:17 +1000
Subject: [PATCH] Fixes broken invalid state

---
 modules/backend/assets/js/october-min.js | 5 +++--
 modules/cms/assets/js/october.cmspage.js | 7 ++++---
 modules/system/assets/ui/js/tab.js       | 7 +++++--
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/modules/backend/assets/js/october-min.js b/modules/backend/assets/js/october-min.js
index 0b899036b..ab65af51c 100644
--- a/modules/backend/assets/js/october-min.js
+++ b/modules/backend/assets/js/october-min.js
@@ -4347,8 +4347,9 @@ return this}
 $(document).render(function(){$('[data-control=tab]').ocTab()})
 $(window).on('ajaxInvalidField',function(event,element,name,messages,isFirst){if(!isFirst)return
 event.preventDefault()
-element.closest('[data-control=tab]').ocTab('goToElement',element)
-element.focus()})}(window.jQuery);(function($){$(document).on('keydown','div.custom-checkbox',function(e){if(e.keyCode==32)
+var $el=$(element)
+$el.closest('[data-control=tab]').ocTab('goToElement',$el)
+$el.focus()})}(window.jQuery);(function($){$(document).on('keydown','div.custom-checkbox',function(e){if(e.keyCode==32)
 e.preventDefault()})
 $(document).on('keyup','div.custom-checkbox',function(e){if(e.keyCode==32){var $cb=$('input',this)
 if($cb.data('oc-space-timestamp')==e.timeStamp)
diff --git a/modules/cms/assets/js/october.cmspage.js b/modules/cms/assets/js/october.cmspage.js
index 4de9a86f2..328f7e1d5 100644
--- a/modules/cms/assets/js/october.cmspage.js
+++ b/modules/cms/assets/js/october.cmspage.js
@@ -118,8 +118,9 @@
 
         ev.preventDefault()
 
-        var $panel = element.closest('.form-tabless-fields.collapsed'),
-            $primaryPanel = element.closest('.control-tabs.primary.collapsed')
+        var $el = $(element),
+            $panel = $el.closest('.form-tabless-fields.collapsed'),
+            $primaryPanel = $el.closest('.control-tabs.primary.collapsed')
 
         if ($panel.length > 0)
             $panel.removeClass('collapsed')
@@ -133,7 +134,7 @@
             $secondaryPanel.removeClass('primary-collapsed')
         }
 
-        element.focus()
+        $el.focus()
     }
 
     CmsPage.prototype.onTabClosed = function(ev) {
diff --git a/modules/system/assets/ui/js/tab.js b/modules/system/assets/ui/js/tab.js
index 416d02a76..4cffd2d0b 100644
--- a/modules/system/assets/ui/js/tab.js
+++ b/modules/system/assets/ui/js/tab.js
@@ -446,9 +446,12 @@
      */
     $(window).on('ajaxInvalidField', function(event, element, name, messages, isFirst){
         if (!isFirst) return
+
         event.preventDefault()
-        element.closest('[data-control=tab]').ocTab('goToElement', element)
-        element.focus()
+
+        var $el = $(element)
+        $el.closest('[data-control=tab]').ocTab('goToElement', $el)
+        $el.focus()
     })
 
 }(window.jQuery);
\ No newline at end of file