Merge pull request #50 from spree-contrib/overrides-changes

Changes initializers and page view events overrides
spree-contrib · Sep 9, 2020 · 261f2de · 261f2de
2 parents 5b2c403 + a695e7e
commit 261f2de
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 40 deletions.
diff --git a/app/overrides/add_google_analytics_page_view_to_spree_application.rb b/app/overrides/add_google_analytics_page_view_to_spree_application.rb
@@ -1,17 +1,9 @@
 spree_version = Gem.loaded_specs['spree_core'].version
 unless spree_version >= Gem::Version.create('3.3.0') && spree_version < Gem::Version.create('3.5.0') && spree_version != Gem::Version.create('3.5.0.alpha')
   Deface::Override.new(
-    virtual_path: 'spree/layouts/spree_application',
+    virtual_path: 'spree/shared/_head',
     name: 'add_google_analytics_page_viewed_to_spree_application',
-    insert_bottom: "[data-hook='body']",
-    partial: 'spree/shared/trackers/google_analytics/page_viewed.js',
-    original: '6841b819babbe4df1f03d0bc8e05dc81bf0d45ad'
-  )
-
-  Deface::Override.new(
-    virtual_path: 'spree/layouts/checkout',
-    name: 'add_google_analytics_page_viewed_to_spree_checkout',
-    insert_bottom: "[data-hook='body']",
+    insert_before: 'meta',
     partial: 'spree/shared/trackers/google_analytics/page_viewed.js',
     original: '6841b819babbe4df1f03d0bc8e05dc81bf0d45ad'
   )

diff --git a/app/overrides/add_google_analytics_to_spree_application.rb b/app/overrides/add_google_analytics_to_spree_application.rb
@@ -1,17 +1,9 @@
 if Gem.loaded_specs['spree_core'].version >= Gem::Version.create('3.5.0.alpha')
   Deface::Override.new(
-    virtual_path: 'spree/layouts/spree_application',
+    virtual_path: 'spree/shared/_head',
     name: 'add_google_analytics_initializer_to_spree_application',
-    insert_top: '[data-hook="inside_head"]',
+    insert_before: 'meta',
     partial: 'spree/shared/trackers/google_analytics/initializer.js',
     original: 'cfa30a2831d9a41394c03229cd28b3c7eee69585'
   )
-
-  Deface::Override.new(
-    virtual_path: 'spree/layouts/checkout',
-    name: 'add_google_analytics_initializer_to_spree_checkout',
-    insert_top: '[data-hook="inside_head"]',
-    partial: 'spree/shared/trackers/google_analytics/initializer.js',
-    original: 'ca3d46a134b93856baf937cf2e473da66d9d8efc'
-  )
 end
diff --git a/app/overrides/add_segment_initializer_to_layout.rb b/app/overrides/add_segment_initializer_to_layout.rb
@@ -1,17 +1,9 @@
 spree_version = Gem.loaded_specs['spree_core'].version
 unless spree_version >= Gem::Version.create('3.3.0') && spree_version < Gem::Version.create('3.5.0') && spree_version != Gem::Version.create('3.5.0.alpha')
   Deface::Override.new(
-    virtual_path: 'spree/layouts/spree_application',
+    virtual_path: 'spree/shared/_head',
     name: 'add_segment_initializer_to_layout',
-    insert_bottom: '[data-hook="inside_head"]',
-    partial: 'spree/shared/trackers/segment/initializer.js',
-    original: '6841b819babbe4df1f03d0bc8e05dc81bf0d45ad'
-  )
-
-  Deface::Override.new(
-    virtual_path: 'spree/layouts/checkout',
-    name: 'add_segment_initializer_to_spree_checkout',
-    insert_bottom: '[data-hook="inside_head"]',
+    insert_before: 'meta',
     partial: 'spree/shared/trackers/segment/initializer.js',
     original: '6841b819babbe4df1f03d0bc8e05dc81bf0d45ad'
   )

diff --git a/app/overrides/add_segment_page_viewed_to_layout.rb b/app/overrides/add_segment_page_viewed_to_layout.rb
@@ -1,17 +1,9 @@
 spree_version = Gem.loaded_specs['spree_core'].version
 unless spree_version >= Gem::Version.create('3.3.0') && spree_version < Gem::Version.create('3.5.0') && spree_version != Gem::Version.create('3.5.0.alpha')
   Deface::Override.new(
-    virtual_path: 'spree/layouts/spree_application',
+    virtual_path: 'spree/shared/_head',
     name: 'add_segment_page_tracker_to_body',
-    insert_bottom: "[data-hook='body']",
-    partial: 'spree/shared/trackers/segment/page_viewed.js',
-    original: '6841b819babbe4df1f03d0bc8e05dc81bf0d45ad'
-  )
-
-  Deface::Override.new(
-    virtual_path: 'spree/layouts/checkout',
-    name: 'add_segment_page_tracker_to_spree_checkout',
-    insert_bottom: "[data-hook='body']",
+    insert_before: 'meta',
     partial: 'spree/shared/trackers/segment/page_viewed.js',
     original: '6841b819babbe4df1f03d0bc8e05dc81bf0d45ad'
   )