[Rt-commit] rt branch, 5.0-trunk, updated. rt-5.0.0alpha1-90-g07f207984b

[? sunnavy]

The branch, 5.0-trunk has been updated
       via  07f207984ba101627ca6b25792a0cc4b2221bd18 (commit)
       via  7595dd6b3ec07626ac1ae6b9e6cb3ab8a4de0a0e (commit)
       via  b9af312342fdc86c277897c9f7668e7141e9c6cb (commit)
      from  2db4df336e793eb4351f0ebe267603bb9e8c0374 (commit)

Summary of changes:
 share/static/css/elevator-light/keyboard-shortcuts.css | 3 +--
 share/static/js/util.js                                | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit b9af312342fdc86c277897c9f7668e7141e9c6cb
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Fri Mar 13 19:04:34 2020 -0500

    Fix keyboard shortcut highlight and scroll
    
    The keyboard shortcut highlight border-left syntax was missing the
    "solid" definition so was not being displayed when selected.
    
    Additionally, the function to scroll the selected element into view
    was breaking on the last row of a ticket collection, since
    obj.next().height() was undefined, it caused currentItemSize to be NaN.

diff --git a/share/static/css/elevator-light/keyboard-shortcuts.css b/share/static/css/elevator-light/keyboard-shortcuts.css
index aa16e55fa1..2b8fee2c5f 100644
--- a/share/static/css/elevator-light/keyboard-shortcuts.css
+++ b/share/static/css/elevator-light/keyboard-shortcuts.css
@@ -25,6 +25,5 @@
 }
 
 .ticket-list .selected-row tr {
-    border-left-color: #3858a3;
-    border-left-width: 3px;
+    border-left: 3px solid #3858a3;
 }
diff --git a/share/static/js/util.js b/share/static/js/util.js
index 6ee838aa63..fdf6a1941e 100644
--- a/share/static/js/util.js
+++ b/share/static/js/util.js
@@ -935,7 +935,7 @@ function scrollToJQueryObject(obj) {
     var viewportHeight = jQuery(window).height(),
         currentScrollPosition = jQuery(window).scrollTop(),
         currentItemPosition = obj.offset().top,
-        currentItemSize = obj.height() + obj.next().height();
+        currentItemSize = obj.height() + ( obj.next().height() ? obj.next().height() : 0 );
 
     if (currentScrollPosition + viewportHeight < currentItemPosition + currentItemSize) {
         jQuery('html, body').scrollTop(currentItemPosition - viewportHeight + currentItemSize);

commit 7595dd6b3ec07626ac1ae6b9e6cb3ab8a4de0a0e
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Mon Mar 16 12:37:23 2020 -0500

    Change keyboard shortcut color to grey background
    
    Previously the keyboard shortcut highlight added a left border
    which made the row shift to the right when selected.  This commit
    switches from a left border to a background color change to make
    the row no longer shift.

diff --git a/share/static/css/elevator-light/keyboard-shortcuts.css b/share/static/css/elevator-light/keyboard-shortcuts.css
index 2b8fee2c5f..f81b9fef44 100644
--- a/share/static/css/elevator-light/keyboard-shortcuts.css
+++ b/share/static/css/elevator-light/keyboard-shortcuts.css
@@ -25,5 +25,5 @@
 }
 
 .ticket-list .selected-row tr {
-    border-left: 3px solid #3858a3;
+    background-color: rgba(156, 156, 156, 0.35);
 }

commit 07f207984ba101627ca6b25792a0cc4b2221bd18
Merge: 2db4df336e 7595dd6b3e
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Thu Apr 9 20:31:07 2020 +0800

    Merge branch '5.0/fix-keyboard-shortcuts' into 5.0-trunk


-----------------------------------------------------------------------