IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix some minor UI issues on IE11. Fixes #4462

Browse Source 
Includes some Jasmine test case fixes from Ganesh.
This commit is contained in:
Murtuza Zabuawala 2019-07-12 10:06:30 +01:00 committed by Dave Page
parent 1df26cb731
commit 20a5899c7d
4 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes_4_11.rst
View File

@ -35,3 +35,4 @@ Bug fixes
| `Issue #4437 <https://redmine.postgresql.org/issues/4437>`_ - Fix table icon issue when updating any existing field. | `Issue #4437 <https://redmine.postgresql.org/issues/4437>`_ - Fix table icon issue when updating any existing field.
| `Issue #4442 <https://redmine.postgresql.org/issues/4442>`_ - Ensure browser should not be started by Selenium when feature tests are excluded from a test run. | `Issue #4442 <https://redmine.postgresql.org/issues/4442>`_ - Ensure browser should not be started by Selenium when feature tests are excluded from a test run.
| `Issue #4450 <https://redmine.postgresql.org/issues/4450>`_ - Fix reverse engineered sql for Foreign Data Wrapper created on EPAS server in redwood mode. | `Issue #4450 <https://redmine.postgresql.org/issues/4450>`_ - Fix reverse engineered sql for Foreign Data Wrapper created on EPAS server in redwood mode.
| `Issue #4462 <https://redmine.postgresql.org/issues/4462>`_ - Fix some minor UI issues on IE11.

5
web/pgadmin/static/js/backgrid.pgadmin.js
View File

@ -206,6 +206,11 @@ define([
if(cell && cell.$el.hasClass('edit-cell') && if(cell && cell.$el.hasClass('edit-cell') &&
!cell.$el.hasClass('privileges') || cell.$el.hasClass('delete-cell')) { !cell.$el.hasClass('privileges') || cell.$el.hasClass('delete-cell')) {
model.trigger('backgrid:next', m, n, false); model.trigger('backgrid:next', m, n, false);
if(cell.$el.hasClass('delete-cell')) {
setTimeout(function(){
$(cell.$el).trigger('focus');
}, 50);
}
break; break;
} else if (renderable && editable) { } else if (renderable && editable) {
cell.enterEditMode(); cell.enterEditMode();

11
web/pgadmin/static/scss/_pgadmin.style.scss
View File

@ -741,6 +741,17 @@ table tr td {
} }
} }
/* Specific to IE11 where we want to highlight the focus on grid buttons */
@media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
table tr td {
td.edit-cell:focus,
td.delete-cell:focus,
td.string-cell:focus {
border: 2px solid $input-focus-border-color !important;;
}
}
}
.privilege_label{ .privilege_label{
font-size: 10px!important; font-size: 10px!important;
} }

23
web/regression/javascript/dialog_tab_navigator_spec.js
View File

@ -11,7 +11,7 @@ import $ from 'jquery';
import 'bootstrap'; import 'bootstrap';
describe('dialogTabNavigator', function () { describe('dialogTabNavigator', function () {
let dialog, tabNavigator, backward_shortcut, forward_shortcut; let dialog, tabNavigator, backward_shortcut, forward_shortcut, fakeEvent;
beforeEach(() => { beforeEach(() => {
dialog = $('<div tabindex="1" class="backform-tab" role="tabpanel">'+ dialog = $('<div tabindex="1" class="backform-tab" role="tabpanel">'+
@ -68,6 +68,9 @@ describe('dialogTabNavigator', function () {
tabNavigator = new dialogTabNavigator.dialogTabNavigator( tabNavigator = new dialogTabNavigator.dialogTabNavigator(
dialog, backward_shortcut, forward_shortcut); dialog, backward_shortcut, forward_shortcut);
fakeEvent = { stopPropagation: () => true };
}); });
describe('navigate', function () { describe('navigate', function () {
@ -79,7 +82,7 @@ describe('dialogTabNavigator', function () {
}); });
it('navigate backward', function () { it('navigate backward', function () {
tabNavigator.onKeyboardEvent({}, 'shift+ctrl+['); tabNavigator.onKeyboardEvent(fakeEvent, 'shift+ctrl+[');
expect(tabNavigator.navigateBackward).toHaveBeenCalled(); expect(tabNavigator.navigateBackward).toHaveBeenCalled();
@ -88,7 +91,7 @@ describe('dialogTabNavigator', function () {
}); });
it('navigate forward', function () { it('navigate forward', function () {
tabNavigator.onKeyboardEvent({}, 'shift+ctrl+]'); tabNavigator.onKeyboardEvent(fakeEvent, 'shift+ctrl+]');
expect(tabNavigator.navigateForward).toHaveBeenCalled(); expect(tabNavigator.navigateForward).toHaveBeenCalled();
@ -97,7 +100,7 @@ describe('dialogTabNavigator', function () {
}); });
it('should not navigate', function () { it('should not navigate', function () {
tabNavigator.onKeyboardEvent({}, 'shift+ctrl+a'); tabNavigator.onKeyboardEvent(fakeEvent, 'shift+ctrl+a');
expect(tabNavigator.navigateForward).not.toHaveBeenCalled(); expect(tabNavigator.navigateForward).not.toHaveBeenCalled();
@ -115,7 +118,8 @@ describe('dialogTabNavigator', function () {
navigateForwardResult = tabNavigator.navigateForward( navigateForwardResult = tabNavigator.navigateForward(
dialog.find('ul.nav-tabs:first'), dialog.find('ul.nav-tabs:first'),
dialog.find('div#1') dialog.find('div#1'),
fakeEvent
); );
}); });
@ -141,7 +145,8 @@ describe('dialogTabNavigator', function () {
navigateForwardResult = tabNavigator.navigateForward( navigateForwardResult = tabNavigator.navigateForward(
dialog.find('ul.nav-tabs:first'), dialog.find('ul.nav-tabs:first'),
dialog.find('div#1') dialog.find('div#1'),
fakeEvent
); );
}); });
@ -165,7 +170,8 @@ describe('dialogTabNavigator', function () {
navigateBackwardResult = tabNavigator.navigateBackward( navigateBackwardResult = tabNavigator.navigateBackward(
dialog.find('ul.nav-tabs:first'), dialog.find('ul.nav-tabs:first'),
dialog.find('div#1') dialog.find('div#1'),
fakeEvent
); );
}); });
@ -184,7 +190,8 @@ describe('dialogTabNavigator', function () {
navigateBackwardResult = tabNavigator.navigateBackward( navigateBackwardResult = tabNavigator.navigateBackward(
dialog.find('ul.nav-tabs:first'), dialog.find('ul.nav-tabs:first'),
dialog.find('div#1') dialog.find('div#1'),
fakeEvent
); );
}); });