🔃 [EngCom] Public Pull Requests - 2.1-develop

Accepted Public Pull Requests:
 - #17084: [Backport] [FIX] Remove not used and empty template (by @mageprince)
 - #17085: [Backport] [FIX] Remove not used variable in template (by @mageprince)
 - #17086: [Backport] Act better on existing input focus instead of removing it (by @mageprince)


Fixed GitHub Issues:
 - #13988: Mini search field looses focus after its JavaScript is initialized (reported by @krzksz) has been fixed in #17086 by @mageprince in 2.1-develop branch
   Related commits:
     1. 90f884f

Author: Stanislav Idolov

app/code/Magento/Search/view/frontend/web/form-mini.js

@@ -89,7 +89,9 @@ define([
                 }, this), 250);
             }, this));
 
-            this.element.trigger('blur');
+            if (this.element.get(0) === document.activeElement) {
+                this.setActiveState(true);
+            }
 
             this.element.on('focus', this.setActiveState.bind(this, true));
             this.element.on('keydown', this._onKeyDown);

app/code/Magento/Tax/view/frontend/templates/checkout/discount.phtml

@@ -38,7 +38,6 @@
 </tr>
 
 <?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary() && $_value != 0): ?>
-    <?php $isTop = 1; ?>
     <?php foreach ($block->getTotal()->getFullInfo() as $info): ?>
         <?php if (isset($info['hidden']) && $info['hidden']) {
             continue;
@@ -64,7 +63,6 @@
                 <?php endif; ?>
             </tr>
             <?php $isFirst = 0; ?>
-            <?php $isTop = 0; ?>
         <?php endforeach; ?>
     <?php endforeach; ?>
 <?php endif;?>