TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes validation on Tabs and Cms pages

This commit is contained in:
Sam Georges 2014-09-29 14:04:05 +10:00
parent fccf4907a0
commit 6363205f34
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/backend/assets/js/october.tab.js
View File

@ -433,7 +433,9 @@
/*
* Detect invalid fields, focus the tab
*/
$(window).on('ajaxInvalidField', function(ev, element, name){
$(window).on('ajaxInvalidField', function(event, element, name, messages, isFirst){
if (!isFirst) return
event.preventDefault()
element.closest('[data-control=tab]').ocTab('goToElement', element)
element.focus()
})

4
modules/cms/assets/js/october.cmspage.js
View File

@ -57,7 +57,9 @@
/*
* Detect invalid fields, uncollapse the panel
*/
$(window).on('ajaxInvalidField', function(ev, element, name){
$(window).on('ajaxInvalidField', function(ev, element, name, messages, isFirst){
if (!isFirst) return
event.preventDefault()
var $panel = element.closest('.form-tabless-fields.collapsed'),
$primaryPanel = element.closest('.control-tabs.primary.collapsed')

5
modules/system/assets/js/framework.js
View File

@ -215,10 +215,7 @@ if (window.jQuery === undefined)
$(window).trigger(_event, [fieldElement, fieldName, fieldMessages, isFirstInvalidField])
if (isFirstInvalidField) {
if (!_event.isDefaultPrevented()) {
// Bug in Chrome, calling events too early
setTimeout(function(){ fieldElement.focus() }, 1)
}
if (!_event.isDefaultPrevented()) fieldElement.focus()
isFirstInvalidField = false
}
}