Skip to content

Commit

Permalink
SAK-33598 : When student attachment uploads in assignment, focus goes…
Browse files Browse the repository at this point in the history 
… to the top of the page (sakaiproject#5027)
  • Loading branch information
@frasese @ern
frasese authored and ern committed Nov 22, 2017
1 parent b27597f commit d0ad304
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 10 deletions.
10 changes: 7 additions & 3 deletions assignment/tool/src/webapp/js/assignments.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -796,7 +796,7 @@ ASN.enableSubmitUnlessNoFile = function(checkForFile)
}
};

ASN.submitForm = function( formID, option, submissionID, view )
ASN.submitForm = function( formID, option, submissionID, view, focusId )
{
// Get the form
var form = document.getElementById( formID );
Expand All @@ -808,6 +808,10 @@ ASN.submitForm = function( formID, option, submissionID, view )
form.action = ASN.updateQueryStringParameter(form.action,"submissionId",submissionID);
}

if(focusId){
form.action = form.action + '#' + focusId;
}

// Do the onsubmit() if the form has one
if( form && form.onsubmit )
{
Expand Down Expand Up @@ -842,10 +846,10 @@ ASN.submitForm = function( formID, option, submissionID, view )
}
};

ASN.doStudentViewSubmissionAction = function( formID, option, attachmentID )
ASN.doStudentViewSubmissionAction = function( formID, option, attachmentID, focusId )
{
document.getElementById( formID ).currentAttachment.value = attachmentID;
ASN.submitForm( formID, option, null, null );
ASN.submitForm( formID, option, null, null, focusId );
};

ASN.doTagsListAction = function( formID, value, providerID )
Expand Down
14 changes: 7 additions & 7 deletions assignment/tool/src/webapp/vm/assignment/chef_assignments_student_view_submission.vm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,7 @@ $(document).ready(function(){
#end
#end
#if (($submissionType==2) || ($submissionType==3) || ($submissionType==5 && $size < 2))
<div class="highlightPanel" style="background:#ffe">
<div id="attachmentspanel" class="highlightPanel" style="background:#ffe">
<h3 style="margin-top:0;margin-bottom:.5em">
#if ($submissionType == 5)
$tlang.getString("gen.att.single")
Expand Down Expand Up @@ -804,7 +804,7 @@ $(document).ready(function(){
</td>
<td class="itemAction">
<div class="spinnerBesideContainer">
<a href="javascript:void(0)" onclick="SPNR.insertSpinnerAfter( this, null, null ); ASN.doStudentViewSubmissionAction( 'addSubmissionForm', 'removeAttachment', '$attachment.id' ); return false;">
<a href="javascript:void(0)" onclick="SPNR.insertSpinnerAfter( this, null, null ); ASN.doStudentViewSubmissionAction( 'addSubmissionForm', 'removeAttachment', '$attachment.id', 'attachmentspanel' ); return false;">
$tlang.getString("stuviewsubm.removeatt")<span class="skip"> $validator.escapeHtml($props.getPropertyFormatted($props.NamePropDisplayName))</span>
</a>
</div>
Expand Down Expand Up @@ -836,15 +836,15 @@ $(document).ready(function(){
</td>
<td>
<div id="clonableUploadW spinnerBesideContainer">
<input type="file" name="upload" class="upload" id="clonableUpload" #if($content_review_acceptedMimeTypes) accept="$content_review_acceptedMimeTypes" #end onchange="SPNR.insertSpinnerAfter( this, null, null ); document.getElementById('addSubmissionForm').action='#toolLinkParam("AssignmentAction" "doAttachUpload" "sakai_csrf_token=$validator.escapeUrl($sakai_csrf_token)")';ASN.submitForm( 'addSubmissionForm', null, null, null );"/>
<input type="file" name="upload" class="upload" id="clonableUpload" #if($content_review_acceptedMimeTypes) accept="$content_review_acceptedMimeTypes" #end onchange="SPNR.insertSpinnerAfter( this, null, null ); document.getElementById('addSubmissionForm').action='#toolLinkParam("AssignmentAction" "doAttachUpload" "sakai_csrf_token=$validator.escapeUrl($sakai_csrf_token)")';ASN.submitForm( 'addSubmissionForm', null, null, null, 'attachmentspanel' );"/>
</div>
</td>
##Only show for inline and attachments
#if ($submissionType == 3)
<td>
<span class="navIntraToolLink">
<input class="disableme enabled" type="button" value="$howManySubAttsLinks" name="attach" id="attach" accesskey="a" #if(!$allowSubmit) disabled="disabled"#end
onclick="SPNR.disableControlsAndSpin( this, null ); ASN.submitForm( 'addSubmissionForm', 'attach', null, null ); return false;" />
onclick="SPNR.disableControlsAndSpin( this, null ); ASN.submitForm( 'addSubmissionForm', 'attach', null, null, 'attachmentspanel' ); return false;" />
</span>
</td>
#end
Expand Down Expand Up @@ -872,7 +872,7 @@ $(document).ready(function(){
</td>
<td>
<div class="spinnerBesideContainer">
<input type="file" name="upload" class="upload" id="clonableUpload" #if($content_review_acceptedMimeTypes) accept="$content_review_acceptedMimeTypes" #end onchange="SPNR.insertSpinnerAfter( this, null, null ); document.getElementById('addSubmissionForm').action='#toolLinkParam("AssignmentAction" "doAttachUploadSingle" "sakai_csrf_token=$validator.escapeUrl($sakai_csrf_token)")';ASN.submitForm( 'addSubmissionForm', null, null, null );"/>
<input type="file" name="upload" class="upload" id="clonableUpload" #if($content_review_acceptedMimeTypes) accept="$content_review_acceptedMimeTypes" #end onchange="SPNR.insertSpinnerAfter( this, null, null ); document.getElementById('addSubmissionForm').action='#toolLinkParam("AssignmentAction" "doAttachUploadSingle" "sakai_csrf_token=$validator.escapeUrl($sakai_csrf_token)")';ASN.submitForm( 'addSubmissionForm', null, null, null, 'attachmentspanel' );"/>
</div>
<input type="hidden" name="submissionFileCount" id="submissionFileCount" value="1"/>
</td>
Expand Down Expand Up @@ -919,13 +919,13 @@ $(document).ready(function(){
#set($props = $attachment.Properties)
#if ($props)
#attachmentDetails()
<a href="javascript:void(0)" onclick="SPNR.insertSpinnerAfter( this, null, null ); ASN.submitForm( 'addSubmissionForm', 'removeNewSingleUploadedFile', null, null ); return false;">
<a href="javascript:void(0)" onclick="SPNR.insertSpinnerAfter( this, null, null ); ASN.submitForm( 'addSubmissionForm', 'removeNewSingleUploadedFile', null, null, 'attachmentspanel' ); return false;">
$tlang.getString("stuviewsubm.removeatt")<span class="skip"> $validator.escapeHtml($props.getPropertyFormatted($props.NamePropDisplayName))</span>
</a>
<br>
#else
$tlang.getString("stuviewsubm.uploadnew")
<input type="file" name="upload" class="upload" id="clonableUpload" #if($content_review_acceptedMimeTypes) accept="$content_review_acceptedMimeTypes" #end onchange="SPNR.insertSpinnerAfter( this, null, null ); document.getElementById('addSubmissionForm').action='#toolLinkParam("AssignmentAction" "doAttachUploadSingle" "sakai_csrf_token=$validator.escapeUrl($sakai_csrf_token)")';ASN.submitForm( 'addSubmissionForm', null, null, null );"/>
<input type="file" name="upload" class="upload" id="clonableUpload" #if($content_review_acceptedMimeTypes) accept="$content_review_acceptedMimeTypes" #end onchange="SPNR.insertSpinnerAfter( this, null, null ); document.getElementById('addSubmissionForm').action='#toolLinkParam("AssignmentAction" "doAttachUploadSingle" "sakai_csrf_token=$validator.escapeUrl($sakai_csrf_token)")';ASN.submitForm( 'addSubmissionForm', null, null, null, 'attachmentspanel' );"/>
#end
</span>
</div>
Expand Down

0 comments on commit d0ad304

Please sign in to comment.