mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 13:47:31 +02:00
Code Issues Releases Wiki Activity

Issue #4923 Tweaked to prevent conflict with <button value=''> . Allow HTML for FontAwesome icons.

Browse Source
This commit is contained in:
Cameron
2022-12-16 11:31:56 -08:00
parent 90ab73d9cc
commit 6bad3580a8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e107_web/js/core/admin.jquery.js
View File

@@ -62,9 +62,9 @@ var e107 = e107 || {'settings': {}, 'behaviors': {}};
if($this.attr('data-modal-submit')) if($this.attr('data-modal-submit'))
{ {
var buttonObj = $('#e-modal-iframe').contents().find('#etrigger-submit'); var buttonObj = $('#e-modal-iframe').contents().find('#etrigger-submit');
var buttonCaption = buttonObj.text(); // copy submit button caption from iframe form. var buttonCaption = buttonObj.html(); // copy submit button caption from iframe form.
if(buttonObj.val()) if(!buttonCaption && buttonObj.val())
{ {
buttonCaption = buttonObj.val(); // copy when it's an <input type='submit'.. buttonCaption = buttonObj.val(); // copy when it's an <input type='submit'..
} }
@@ -74,7 +74,7 @@ var e107 = e107 || {'settings': {}, 'behaviors': {}};
var buttonClass = $('#e-modal-iframe').contents().find('#etrigger-submit').attr('data-modal-submit-class'); // co var buttonClass = $('#e-modal-iframe').contents().find('#etrigger-submit').attr('data-modal-submit-class'); // co
if(buttonCaption) if(buttonCaption)
{ {
$('#e-modal-submit').text(buttonCaption).fadeIn(); // display the button in the modal footer. $('#e-modal-submit').html(buttonCaption).fadeIn(); // display the button in the modal footer.
} }
if(buttonClass) if(buttonClass)