alchemy_cms 7.0.0 → 7.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82ad696b6ce7f6cb6abd94cba68e8b00dbee69ae087afeec0ff8ac851e0e2d20
-  data.tar.gz: 5dc84ef100d7c09ca4328c68c50e2defa25dd8c87f25afbb0927134692da5ac9
+  metadata.gz: c4828c1eaebd1d74c37372855818011e7e07a284accefd1b597314ec5d811841
+  data.tar.gz: 9722020245707a9399fd18fe1385c7ad2afdc224d4819a713392dd173709e4fe
 SHA512:
-  metadata.gz: 4c2f641200be5634ff92ce977b7f067a68438ef221e0402c72c3aca0f0aa055b2e54bc604779eceef97442051b53414acdf8c5e67cdc8996d81e246ce1ce460b
-  data.tar.gz: 237943716710431905599a475dd2a02e69695ec6debbb0105157208c041878bb287bff7868e8233a95ffed68f50ac5822a64bfe522d2b288341d713de24631e5
+  metadata.gz: ffc68ea09c5f5a4c1a377a7c2c726c353f8e94d6c863e635c18f86893b4b37ef90aba8da716977fb1ffb0f6e8ca52aebed5d23568cfb4bc16efce9ba148beaed
+  data.tar.gz: 2c63d6722d652e8cfe5f243d840ee1df85f024f780981c6d38dbbb960d39ccd04d1426aefc65602868bbf2b71563e4407136f675f4067728f43f1b029f8c84c1

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 7.0.2 (2023-07-31)
+
+- [7.0] Fix DOM ids and labels of ingredient editors [#2538](https://github.com/AlchemyCMS/alchemy_cms/pull/2538) ([tvdeyen](https://github.com/tvdeyen))
+- [7.0] Bugfix: Initialize PagePublicationFields on Pages Table [#2537](https://github.com/AlchemyCMS/alchemy_cms/pull/2537) ([tvdeyen](https://github.com/tvdeyen))
+- [v7.0] Use selenium-webdriver instead of webdrivers gem [#2532](https://github.com/AlchemyCMS/alchemy_cms/pull/2532) ([mamhoff](https://github.com/mamhoff))
+
+## 7.0.1 (2023-07-07)
+
+- Fix disconnecting Tinymce intersection observer [#2519](https://github.com/AlchemyCMS/alchemy_cms/pull/2519) ([tvdeyen](https://github.com/tvdeyen))
+
 ## 7.0.0 (2023-07-05)
 
 - Remove old alchemy_admin files from sprockets builds [#2517](https://github.com/AlchemyCMS/alchemy_cms/pull/2517) ([tvdeyen](https://github.com/tvdeyen))

data/alchemy_cms.gemspec

@@ -63,7 +63,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rspec-activemodel-mocks", ["~> 1.0"]
   gem.add_development_dependency "rspec-rails", [">= 4.0.0.beta2"]
   gem.add_development_dependency "simplecov", ["~> 0.20"]
-  gem.add_development_dependency "webdrivers", ["~> 5.0"]
+  gem.add_development_dependency "selenium-webdriver", ["~> 4.10"]
   gem.add_development_dependency "webmock", ["~> 3.3"]
   gem.add_development_dependency "shoulda-matchers", ["~> 5.0"]
   gem.add_development_dependency "timecop", ["~> 0.9"]

data/app/assets/javascripts/alchemy/alchemy.initializer.js.coffee

@@ -52,5 +52,6 @@ $(document).on 'turbo:load', ->
 
 $(document).on 'turbo:before-fetch-request', ->
   # Ensure that all tinymce editors get removed before parsing a new page
+  Alchemy.Tinymce.removeIntersectionObserver()
   Alchemy.Tinymce.removeFrom $('.has_tinymce')
   return

data/app/helpers/alchemy/admin/ingredients_helper.rb

@@ -32,8 +32,8 @@ module Alchemy
       end
 
       # Renders the label and hint for a ingredient.
-      def ingredient_label(ingredient, column = :value)
-        label_tag ingredient.form_field_id(column) do
+      def ingredient_label(ingredient, column = :value, html_options = {})
+        label_tag ingredient.form_field_id(column), html_options do
           [render_ingredient_role(ingredient), render_hint_for(ingredient)].compact.join(" ").html_safe
         end
       end

data/app/javascript/alchemy_admin/tinymce.js

@@ -41,10 +41,6 @@ function initEditors(ids) {
 // initialize IntersectionObserver
 // the observer will initialize Tinymce if the textarea becomes visible
 function initializeIntersectionObserver() {
-  if (tinymceIntersectionObserver !== null) {
-    tinymceIntersectionObserver.disconnect()
-  }
-
   const observerCallback = (entries, observer) => {
     entries.forEach((entry) => {
       if (entry.intersectionRatio > 0) {
@@ -108,6 +104,12 @@ function removeEditor(editorId) {
   }
 }
 
+function removeIntersectionObserver() {
+  if (tinymceIntersectionObserver !== null) {
+    tinymceIntersectionObserver.disconnect()
+  }
+}
+
 export default {
   // Initializes all TinyMCE editors with given ids
   //
@@ -135,6 +137,8 @@ export default {
     })
   },
 
+  removeIntersectionObserver,
+
   // set tinymce configuration for a given selector key
   setCustomConfig(key, configuration) {
     tinymceCustomConfigs[key] = configuration

data/app/views/alchemy/admin/pages/_table.html.erb

@@ -25,3 +25,9 @@
     <%= render partial: "table_row", collection: @pages, as: "page" %>
   </tbody>
 </table>
+
+<script type="text/javascript">
+  $(function() {
+    Alchemy.PagePublicationFields();
+  });
+</script>

data/app/views/alchemy/ingredients/_boolean_editor.html.erb

@@ -2,8 +2,8 @@
   class: boolean_editor.css_classes,
   data: boolean_editor.data_attributes do %>
   <%= element_form.fields_for(:ingredients, boolean_editor.ingredient) do |f| %>
-    <%= f.label :value, style: "display: inline-block" do %>
-      <%= f.check_box :value, id: boolean_editor.form_field_id %>
+    <%= f.label :value, style: "display: inline-block", for: nil do %>
+      <%= f.check_box :value, id: nil %>
       <%= render_ingredient_role(boolean_editor) %>
     <% end %>
     <%= render_hint_for(boolean_editor) %>

data/app/views/alchemy/ingredients/_picture_editor.html.erb

@@ -4,7 +4,7 @@
   class: picture_editor.css_classes,
   data: picture_editor.data_attributes do %>
   <%= element_form.fields_for(:ingredients, picture_editor.ingredient) do |f| %>
-    <%= ingredient_label(picture_editor, :picture_id) %>
+    <%= ingredient_label(picture_editor, :picture_id, for: nil) %>
     <%= content_tag :div,
       data: {
         target_size: picture_editor.settings[:size] || [

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "7.0.0"
+  VERSION = "7.0.2"
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.0.2
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-05 00:00:00.000000000 Z
+date: 2023-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -656,19 +656,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.20'
 - !ruby/object:Gem::Dependency
-  name: webdrivers
+  name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.10'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -1447,7 +1447,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
-rubygems_version: 3.4.15
+rubygems_version: 3.4.17
 signing_key:
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails