From ba790ae47013470e9bce78a87e07c060e1a1c5b8 Mon Sep 17 00:00:00 2001
From: Thijs Wenker <me@thoys.nl>
Date: Sat, 17 Nov 2018 01:20:36 +0100
Subject: [PATCH] fix behavior after merge.

---
 scripts/system/html/js/entityList.js | 6 +++---
 scripts/system/html/js/listView.js   | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/scripts/system/html/js/entityList.js b/scripts/system/html/js/entityList.js
index fe657cd8b5..84ad59df36 100644
--- a/scripts/system/html/js/entityList.js
+++ b/scripts/system/html/js/entityList.js
@@ -396,8 +396,8 @@ function loaded() {
         
         elEntityTableHeaderRow = document.querySelectorAll("#entity-table thead th");
         
-        entityList = new ListView(elEntityTableBody, elEntityTableScroll, elEntityTableHeaderRow,
-                                  createRow, updateRow, clearRow, preRefresh, postRefresh, WINDOW_NONVARIABLE_HEIGHT);
+        entityList = new ListView(elEntityTableBody, elEntityTableScroll, elEntityTableHeaderRow, createRow, updateRow,
+                                  clearRow, preRefresh, postRefresh, preRefresh, WINDOW_NONVARIABLE_HEIGHT);
 
         entityListContextMenu = new EntityListContextMenu();
 
@@ -448,7 +448,7 @@ function loaded() {
 
         function preRefresh() {
             // move the rename input to the body
-            if (elRenameInput) {
+            if (!isRenameFieldBeingMoved && elRenameInput) {
                 isRenameFieldBeingMoved = true;
                 document.body.appendChild(elRenameInput);
                 // keep the focus
diff --git a/scripts/system/html/js/listView.js b/scripts/system/html/js/listView.js
index 482576e2fe..49a91388a5 100644
--- a/scripts/system/html/js/listView.js
+++ b/scripts/system/html/js/listView.js
@@ -13,8 +13,8 @@ debugPrint = function (message) {
     console.log(message);
 };
 
-function ListView(elTableBody, elTableScroll, elTableHeaderRow, createRowFunction, 
-                  updateRowFunction, clearRowFunction, preRefreshFunction, postRefreshFunction, WINDOW_NONVARIABLE_HEIGHT) {
+function ListView(elTableBody, elTableScroll, elTableHeaderRow, createRowFunction, updateRowFunction, clearRowFunction,
+                  preRefreshFunction, postRefreshFunction, preResizeFunction, WINDOW_NONVARIABLE_HEIGHT) {
     this.elTableBody = elTableBody;
     this.elTableScroll = elTableScroll;
     this.elTableHeaderRow = elTableHeaderRow;
@@ -27,6 +27,7 @@ function ListView(elTableBody, elTableScroll, elTableHeaderRow, createRowFunctio
     this.clearRowFunction = clearRowFunction;
     this.preRefreshFunction = preRefreshFunction;
     this.postRefreshFunction = postRefreshFunction;
+    this.preResizeFunction = preResizeFunction;
     
     // the list of row elements created in the table up to max viewable height plus SCROLL_ROWS rows for scrolling buffer
     this.elRows = [];
@@ -248,7 +249,7 @@ ListView.prototype = {
             debugPrint("ListView.resize - no valid table body or table scroll element");
             return;
         }
-
+        this.preResizeFunction();
         let prevScrollTop = this.elTableScroll.scrollTop;  
 
         // take up available window space