Merge remote-tracking branch 'tangoc/MAGETWO-43966' into bugs_pr

Author: Bohdan Korablov

app/code/Magento/Customer/Block/CustomerData.php

@@ -7,24 +7,14 @@
 
 class CustomerData extends \Magento\Framework\View\Element\Template
 {
-    /**
-     * Sections that can not be cached on frontend-side
-     *
-     * @var array
-     */
-    protected $nonCachedSections = [];
-
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param array $data
-     * @param array $nonCachedSections
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
-        array $data = [],
-        array $nonCachedSections = []
+        array $data = []
     ) {
-        $this->nonCachedSections = $nonCachedSections;
         parent::__construct($context, $data);
     }
 
@@ -50,24 +40,4 @@ public function getCustomerDataUrl($route)
     {
         return $this->getUrl($route, ['_secure' => $this->getRequest()->isSecure()]);
     }
-
-    /**
-     * Get sections that can not be cached on frontend-side
-     *
-     * @return array
-     */
-    public function getNotCachedSections()
-    {
-        return $this->nonCachedSections;
-    }
-
-    /**
-     * Get keys of sections that can not be cached on frontend-side
-     *
-     * @return array
-     */
-    public function getNonCachedSectionKeys()
-    {
-        return array_keys($this->nonCachedSections);
-    }
 }

app/code/Magento/Customer/view/frontend/templates/js/customer-data.phtml

@@ -13,7 +13,6 @@
         '*' => ['Magento_Customer/js/customer-data' => [
             'sectionLoadUrl' => $block->getCustomerDataUrl('customer/section/load'),
             'cookieLifeTime' => $block->getCookieLifeTime(),
-            'nonCachedSections' => $block->getNonCachedSectionKeys(),
         ]],
     ]);
 ?>

app/code/Magento/Customer/view/frontend/web/js/customer-data.js

@@ -23,8 +23,6 @@ define([
             storage.removeAll();
             var date = new Date(Date.now() + parseInt(options.cookieLifeTime, 10) * 1000);
             $.localStorage.set('mage-cache-timeout', date);
-        } else {
-            invalidateNonCachedSections(options);
         }
     };
 
@@ -35,12 +33,6 @@ define([
         }
     };
 
-    var invalidateNonCachedSections = function(options) {
-        _.each(options.nonCachedSections, function (sectionName) {
-            storageInvalidation.set(sectionName, true);
-        });
-    }
-
     var dataProvider = {
         getFromStorage: function (sectionNames) {
             var result = {};