tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4625 from kinglozzer/pulls/editform-field-focus

Browse Source 
FIX: Issues with field focus in edit forms (fixes #4621)
This commit is contained in:
Daniel Hensby 2015-09-24 17:52:25 +01:00
commit e2fbbda2fd
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
admin/javascript/LeftAndMain.EditForm.js
View File

@ -278,21 +278,23 @@
sessionData = hasSessionStorage ? window.sessionStorage.getItem(this.attr('id')) : null, sessionData = hasSessionStorage ? window.sessionStorage.getItem(this.attr('id')) : null,
sessionStates = sessionData ? JSON.parse(sessionData) : false, sessionStates = sessionData ? JSON.parse(sessionData) : false,
elementID, elementID,
tabbed = this.find('.ss-tabset'), tabbed = (this.find('.ss-tabset').length !== 0),
activeTab, activeTab,
elementTab, elementTab,
toggleComposite, toggleComposite,
scrollY; scrollY;
if(hasSessionStorage && sessionStates.length > 0){ if(hasSessionStorage && sessionStates.length > 0){
$.each(sessionStates, function(i, sessionState) { $.each(sessionStates, function(i, sessionState) {
if(self.is('#' + sessionState.id)){ if(self.is('#' + sessionState.id)){
elementID = $('#' + sessionState.selected); elementID = $('#' + sessionState.selected);
} }
}); });
// If the element IDs saved in session states don't match up to anything in this particular form
// that probably means we haven't encountered this form yet, so focus on the first input
if($(elementID).length < 1){ if($(elementID).length < 1){
this.focusFirstInput();
return; return;
} }
@ -330,14 +332,18 @@
} }
} else { } else {
// If there is no focus data attribute set, focus input on first form element. Exclude elements which // If session storage is not supported or there is nothing stored yet, focus on the first input
// specifically opt-out of this behaviour via "data-skip-autofocus". this.focusFirstInput();
// This opt-out is useful if the first visible field is shown far down a scrollable area,
// for example for the pagination input field after a long GridField listing.
// Skip if an element in the form is already focused.
this.find(':input:not(:submit)[data-skip-autofocus!="true"]').filter(':visible:first').focus();
} }
},
/**
* Skip if an element in the form is already focused. Exclude elements which specifically
* opt-out of this behaviour via "data-skip-autofocus". This opt-out is useful if the
* first visible field is shown far down a scrollable area, for example for the pagination
* input field after a long GridField listing.
*/
focusFirstInput: function() {
this.find(':input:not(:submit)[data-skip-autofocus!="true"]').filter(':visible:first').focus();
} }
}); });