Minor fixes

Voog · Feb 10, 2022 · 4acdc0f · 4acdc0f
1 parent d514ee0
commit 4acdc0f
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 44 deletions.
diff --git a/components/template-variables.tpl b/components/template-variables.tpl
@@ -1,11 +1,4 @@
 {% capture dont_render %}
-  {% comment %}Detects viewing mode.{% endcomment %}
-  {% if editmode %}
-    {% assign view_mode = "editmode" %}
-  {% else %}
-    {% assign view_mode = "publicmode" %}
-  {% endif %}
-
   {% comment %}SITE BODY RELATED VARIABLES.{% endcomment %}
   {% comment %}Assign variables based on page type.{% endcomment %}
   {% if blog_article_page %}

diff --git a/javascripts/application.js b/javascripts/application.js
@@ -737,6 +737,7 @@ MMCQ = (function() {
   // Enables the usage of the initiations outside this file.
   // For example add "<script>site.initBlogPage();</script>" at the end of the "Blog & News" page to initiate blog listing view functions.
   window.site = $.extend(window.site || {}, {
+    handleProductPageContent: handleProductPageContent,
     initFrontPage: initFrontPage,
     initCommonPage: initCommonPage,
     initProductPage: initProductPage,
@@ -746,10 +747,6 @@ MMCQ = (function() {
     bindSiteSearch: bindSiteSearch
   });
 
-  window.template = $.extend(window.template || {}, {
-    handleProductPageContent: handleProductPageContent
-  });
-
   // Initiates site wide functions.
   init();
 })(jQuery);
diff --git a/javascripts/application.min.js b/javascripts/application.min.js
diff --git a/javascripts/editmode.js b/javascripts/editmode.js
@@ -1,8 +1,4 @@
 ; (function ($) {
-  var editmode = function () {
-    return $('html').hasClass('editmode');
-  };
-
   // Returns the suitable version of the image depending on the viewport width.
   var getImageByWidth = function (sizes, targetWidth) {
     var prevImage;
@@ -480,11 +476,9 @@
   // Opens product admin view on product image click
 
   var handleProductImageClick = function(product_id) {
-    if (editmode()) {
-      $('.product-content .product-image').click(function() {
-        window.open('/admin/ecommerce/products/' + product_id, '_blank').focus();
-      });
-    }
+    $('.product-content .product-image').click(function() {
+      window.open('/admin/ecommerce/products/' + product_id, '_blank').focus();
+    });
   };
 
   var init = function () {

diff --git a/javascripts/editmode.min.js b/javascripts/editmode.min.js
diff --git a/layouts/auto_generated_product.tpl b/layouts/auto_generated_product.tpl
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 {% include "template-variables" %}
 
-<html class="{% if editmode %}editmode{% else %}public{% endif %}" lang="{{ page.language_code }}" data-view-state="{{ view_mode }}">
+<html class="{% if editmode %}editmode{% else %}public{% endif %}" lang="{{ page.language_code }}">
 
 <head prefix="og: http://ogp.me/ns#">
   {% include "html-head" %}
@@ -114,10 +114,12 @@
   {% include "template-tools" %}
 
   <script>
-    template && template.handleProductPageContent();
-    {%- if editmode and product %}
-      site && site.handleProductImageClick({{ product.id }});
-    {% endif -%}
+    if (site) {
+      site.handleProductPageContent();
+      {%- if editmode and product %}
+        site.handleProductImageClick({{ product.id }});
+      {% endif -%}
+    }
   </script>
 </body>
 

diff --git a/layouts/product.tpl b/layouts/product.tpl
@@ -67,7 +67,7 @@
               <div class="mar_0-32 flex_col">
                 <section class="content-body content-formatted js-buy-btn-content mar_32-0"
                   data-search-indexing-allowed="true">
-                  <div class="content-item-title content-area" data-search-indexing-allowed="true">
+                  <div class="content-item-title content-area">
                     {% contentblock name="page_title" publish_default_content="true" %}
                       <h1>{{ page.title }}</h1>
                     {% endcontentblock %}

diff --git a/sources/javascripts/concat/editmode/editmode.js b/sources/javascripts/concat/editmode/editmode.js
@@ -1,8 +1,4 @@
 ; (function ($) {
-  var editmode = function () {
-    return $('html').hasClass('editmode');
-  };
-
   // Returns the suitable version of the image depending on the viewport width.
   var getImageByWidth = function (sizes, targetWidth) {
     var prevImage;
@@ -480,11 +476,9 @@
   // Opens product admin view on product image click
 
   var handleProductImageClick = function(product_id) {
-    if (editmode()) {
-      $('.product-content .product-image').click(function() {
-        window.open('/admin/ecommerce/products/' + product_id, '_blank').focus();
-      });
-    }
+    $('.product-content .product-image').click(function() {
+      window.open('/admin/ecommerce/products/' + product_id, '_blank').focus();
+    });
   };
 
   var init = function () {

diff --git a/sources/javascripts/concat/global/main.js b/sources/javascripts/concat/global/main.js
@@ -196,6 +196,7 @@
   // Enables the usage of the initiations outside this file.
   // For example add "<script>site.initBlogPage();</script>" at the end of the "Blog & News" page to initiate blog listing view functions.
   window.site = $.extend(window.site || {}, {
+    handleProductPageContent: handleProductPageContent,
     initFrontPage: initFrontPage,
     initCommonPage: initCommonPage,
     initProductPage: initProductPage,
@@ -205,10 +206,6 @@
     bindSiteSearch: bindSiteSearch
   });
 
-  window.template = $.extend(window.template || {}, {
-    handleProductPageContent: handleProductPageContent
-  });
-
   // Initiates site wide functions.
   init();
 })(jQuery);
diff --git a/sources/stylesheets/components/_image-drop-area.scss b/sources/stylesheets/components/_image-drop-area.scss
@@ -7,7 +7,7 @@
   overflow: hidden;
   margin-top: 10px;
 
-  [data-view-state="editmode"] & {
+  .editmode & {
     cursor: pointer;
   }
 

diff --git a/stylesheets/main.css b/stylesheets/main.css
@@ -1733,7 +1733,7 @@ body.dark-background {
   left: 0;
 }
 
-[data-view-state="editmode"] .item-top {
+.editmode .item-top {
   cursor: pointer;
 }
 

diff --git a/stylesheets/main.min.css b/stylesheets/main.min.css