diff options
author | Steve Beaver <sbeaver@netgate.com> | 2017-01-02 11:34:38 -0500 |
---|---|---|
committer | Steve Beaver <sbeaver@netgate.com> | 2017-01-02 11:36:01 -0500 |
commit | d9f1170e65462b6c1c1c2144484508b02f60fea8 (patch) | |
tree | acca3e1196ba9904f7b57ac4f823ec3f33faea53 /src/usr/local/www/js | |
parent | 3705d2637e127238aaa015e7763e3245fea62ec3 (diff) | |
download | pfsense-d9f1170e65462b6c1c1c2144484508b02f60fea8.zip pfsense-d9f1170e65462b6c1c1c2144484508b02f60fea8.tar.gz |
Fixed #6972
I was only able to reproduce tis issue using Chrome, but it should now be resolved
Diffstat (limited to 'src/usr/local/www/js')
-rw-r--r-- | src/usr/local/www/js/pfSense.js | 6 | ||||
-rw-r--r-- | src/usr/local/www/js/pfSenseHelpers.js | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/usr/local/www/js/pfSense.js b/src/usr/local/www/js/pfSense.js index 4467ee1..92c4e21 100644 --- a/src/usr/local/www/js/pfSense.js +++ b/src/usr/local/www/js/pfSense.js @@ -175,7 +175,7 @@ $(function() { // Use element title in the confirmation message, or if not available // the element value $('.btn-danger, .fa-trash').on('click', function(e){ - if (!($(this).hasClass('no-confirm'))) { + if (!($(this).hasClass('no-confirm')) && !($(this).hasClass('icon-embed-btn'))) { var msg = $.trim(this.textContent).toLowerCase(); if (!msg) @@ -262,7 +262,7 @@ $(function() { $('.table-rowdblclickedit>tbody>tr').dblclick(function () { $(this).find(".fa-pencil")[0].click(); }); - + // Focus first input $(':input:enabled:visible:first').focus(); @@ -270,7 +270,7 @@ $(function() { $(this).css('height', 80).resizable({minHeight: 80, minWidth: 200}).parent().css('padding-bottom', 0); $(this).css('height', 78); }); - + // Run in-page defined events while (func = window.events.shift()) func(); diff --git a/src/usr/local/www/js/pfSenseHelpers.js b/src/usr/local/www/js/pfSenseHelpers.js index 5e80fce..e8898ba 100644 --- a/src/usr/local/www/js/pfSenseHelpers.js +++ b/src/usr/local/www/js/pfSenseHelpers.js @@ -407,9 +407,9 @@ $('[id^=addrow]').click(function() { $('[id^=delete]').click(function(event) { if ($('.repeatable').length > 1) { if ((typeof retainhelp) == "undefined") - moveHelpText(event.target.id); + moveHelpText($(this).attr("id")); - delete_row(event.target.id); + delete_row($(this).attr("id")); } else { alert('The last row may not be deleted.'); } |