Allow to skip usage of localstorage

AOEpeople · Mar 24, 2017 · 5f3dc70 · 5f3dc70
1 parent 168ca93
commit 5f3dc70
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/app/design/frontend/base/default/template/aoestatic/placeholder.phtml b/app/design/frontend/base/default/template/aoestatic/placeholder.phtml
@@ -1,4 +1,8 @@
 <?php /* @var $this Aoe_Static_Block_Placeholder */ ?>
-<div class="as-placeholder" <?php if ($this->getPlaceholderId()) { echo 'id="'.$this->getPlaceholderId().'"'; } ?> rel="<?php echo $this->getPlaceholderBlockname() ?>">
+<div class="as-placeholder"
+    <?php if ($this->getPlaceholderId()) { echo 'id="'.$this->getPlaceholderId().'"'; } ?>
+     rel="<?php echo $this->getPlaceholderBlockname() ?>"
+    <?php // use skip-aoestatic to disable the use of the browsers localstorage (e.g. to show a load spinner) ?>
+     data-aoestatic="use-localstorage">
 	<?php echo $this->getChildHtml(); ?>
 </div>
diff --git a/js/aoestatic/common.js b/js/aoestatic/common.js
@@ -114,9 +114,12 @@ var Aoe_Static = {
                 }
                 var rel = $(this).attr('rel');
                 if (rel) {
-                    var localStorageKey = Aoe_Static._getLocalStorageKey(rel);
-                    if (localStorage.getItem(localStorageKey)) {
-                        Aoe_Static._replaceBlock(id, localStorage.getItem(localStorageKey));
+                    var dataAttribute = $(this).attr('data-aoestatic');
+                    if (!dataAttribute || dataAttribute !== 'skip-localstorage') {
+                        var localStorageKey = Aoe_Static._getLocalStorageKey(rel);
+                        if (localStorage.getItem(localStorageKey)) {
+                            Aoe_Static._replaceBlock(id, localStorage.getItem(localStorageKey));
+                        }
                     }
                     data.getBlocks[id] = rel;
                     counter++;