comfortable_mexican_sofa 2.0.12 → 2.0.13

data/app/assets/javascripts/comfy/admin/cms/files_modal.js

@@ -0,0 +1,40 @@
+// Site files modal.
+(() => {
+  let modal = null;
+
+  const initModalContent = (modalContent) => {
+    window.CMS.fileUpload.init(modalContent);
+    window.CMS.fileLinks(modalContent);
+    modalContent.addEventListener('dragstart', (evt) => {
+      if (evt.target.nodeType === Node.ELEMENT_NODE &&
+          evt.target.matches('.cms-uploader-filelist .item-title a') && modal != null) {
+        modal.hide();
+      }
+    });
+  };
+
+  window.CMS.files = {
+    init() {
+      const modalToggle = document.querySelector('.cms-files-open-modal');
+      const modalContainer = document.querySelector('.cms-files-modal');
+      if (modalToggle === null || modalContainer === null) return;
+      const modalContent = modalContainer.querySelector('.modal-content');
+      modalToggle.addEventListener('click', (evt) => {
+        evt.preventDefault();
+        fetch(modalContainer.dataset.url, {credentials: 'same-origin'}).then((resp) => resp.text()).then((html) => {
+          modalContent.innerHTML = `<div class="modal-body">${html}</div>`;
+          initModalContent(modalContent);
+        });
+        modal = modal || new bootstrap.Modal(modalContainer);
+        modal.show();
+      });
+    },
+    dispose() {
+      if (modal !== null) {
+        modal.hide();
+        modal.dispose();
+        modal = null;
+      }
+    }
+  };
+})();

data/app/assets/javascripts/comfy/admin/cms/page_fragments.js

@@ -0,0 +1,22 @@
+window.CMS.pageFragments = () => {
+  const toggle = document.querySelector('select#fragments-toggle');
+  if (toggle === null) return;
+  const url = new URL(toggle.dataset.url, document.location.href);
+  toggle.addEventListener('change', () => {
+    url.searchParams.set('layout_id', toggle.value);
+    fetch(url, {credentials: 'same-origin'}).then((resp) => resp.text()).then((html) => {
+      const container = document.querySelector('#form-fragments-container');
+      container.innerHTML = html;
+      // TODO: Only dispose of the widgets that were within the fragment.
+      CMS.wysiwyg.dispose();
+      CMS.timepicker.dispose();
+      CMS.codemirror.dispose();
+
+      CMS.fileLinks(container);
+      // TODO: Container should also be passed here once the TODO above is addressed.
+      CMS.wysiwyg.init();
+      CMS.timepicker.init();
+      CMS.codemirror.init();
+    });
+  });
+};

data/app/assets/javascripts/comfy/admin/cms/slugify.js

@@ -0,0 +1,34 @@
+(() => {
+  const SLUGIFY_REPLACEMENTS = [
+    [/[àáâã]/g, 'a'],
+    [/ä/g, 'ae'],
+    [/[èéëê]/g, 'e'],
+    [/[ìíïî]/g, 'i'],
+    [/[òóôõ]/g, 'o'],
+    [/ö/g, 'oe'],
+    [/[ùúû]/g, 'u'],
+    [/ü/g, 'ue'],
+    [/ñ/g, 'n'],
+    [/ç/g, 'c'],
+    [/ß/g, 'ss'],
+    [/[·\/,:;_ ]/g, '-']
+  ];
+
+  const slugifyValue = (value) => {
+    let slug = value.trim().toLowerCase();
+    for (const [from, to] of SLUGIFY_REPLACEMENTS) {
+      slug = slug.replace(from, to);
+    }
+    // Remove any other URL incompatible characters and replace multiple dashes with just a single one.
+    return slug.replace(/[^a-z0-9-]/g, '').replace(/-+/g, '-');
+  };
+
+  window.CMS.slugify = () => {
+    const input = document.querySelector('input[data-slugify=true]');
+    const slugInput = document.querySelector('input[data-slug]');
+    if (input === null || slugInput === null) return;
+    input.addEventListener('input', () => {
+      slugInput.value = slugifyValue(input.value);
+    });
+  };
+})();

data/app/assets/javascripts/comfy/admin/cms/sortable_list.js

@@ -0,0 +1,40 @@
+(() => {
+  const Rails = window.Rails;
+  const DATA_ID_ATTRIBUTE = 'data-id';
+
+  const sortableStore = {
+    get(sortable) {
+      return Array.from(sortable.el.children, (el) => el.getAttribute(DATA_ID_ATTRIBUTE));
+    },
+    set(sortable) {
+      fetch(`${CMS.current_path}/reorder`, {
+        body: JSON.stringify({order: sortable.toArray()}),
+        headers: {'Content-Type': 'application/json', 'X-CSRF-Token': Rails.csrfToken()},
+        credentials: 'same-origin',
+        method: 'PUT',
+      });
+    }
+  };
+
+  const sortableInstances = [];
+  window.CMS.sortableList = {
+    init(root = document) {
+      for (const sortableRoot of root.querySelectorAll('.sortable')) {
+        sortableInstances.push(Sortable.create(sortableRoot, {
+          handle: '.dragger',
+          draggable: 'li',
+          dataIdAttr: DATA_ID_ATTRIBUTE,
+          store: sortableStore,
+          onStart: (evt) => evt.from.classList.add('sortable-active'),
+          onEnd: (evt) => evt.from.classList.remove('sortable-active')
+        }));
+      }
+    },
+    dispose() {
+      for (const sortable of sortableInstances) {
+        sortable.destroy();
+      }
+      sortableInstances.length = 0;
+    }
+  }
+})();

data/app/assets/javascripts/comfy/admin/cms/timepicker.js

@@ -0,0 +1,30 @@
+(() => {
+  const flatpickrInstances = [];
+  window.CMS.timepicker = {
+    init(root = document) {
+      const datetimes = root.querySelectorAll('input[type=text][data-cms-datetime]');
+      const dates = root.querySelectorAll('input[type=text][data-cms-date]');
+      if (datetimes.length === 0 && dates.length === 0) return;
+      const locale = CMS.getLocale();
+      for (const datetime of datetimes) {
+        flatpickrInstances.push(flatpickr(datetime, {
+          format: 'yyyy-mm-dd hh:ii',
+          enableTime: true,
+          locale: locale,
+        }));
+      }
+      for (const date of dates) {
+        flatpickrInstances.push(flatpickr(date, {
+          format: 'yyyy-mm-dd',
+          locale: locale,
+        }));
+      }
+    },
+    dispose() {
+      for (const flatpickrInstance of flatpickrInstances) {
+        flatpickrInstance.destroy();
+      }
+      flatpickrInstances.length = 0;
+    }
+  };
+})();

data/app/assets/javascripts/comfy/admin/cms/wysiwyg.js

@@ -0,0 +1,65 @@
+(() => {
+  const Rails = window.Rails;
+  const buildRedactorOptions = () => {
+    const fileUploadPath = document.querySelector('meta[name="cms-file-upload-path"]').content;
+    const pagesPath = document.querySelector('meta[name="cms-pages-path"]').content;
+    const csrfParam = Rails.csrfParam();
+    const csrfToken = Rails.csrfToken();
+
+    const imageUpload = new URL(fileUploadPath, document.location.href);
+    imageUpload.searchParams.set('source', 'redactor');
+    imageUpload.searchParams.set('type', 'image');
+    imageUpload.searchParams.set(csrfParam, csrfToken);
+
+    const imageManagerJson = new URL(fileUploadPath, document.location.href);
+    imageManagerJson.searchParams.set('source', 'redactor');
+    imageManagerJson.searchParams.set('type', 'image');
+
+    const fileUpload = new URL(fileUploadPath, document.location.href);
+    fileUpload.searchParams.set('source', 'redactor');
+    fileUpload.searchParams.set('type', 'file');
+    fileUpload.searchParams.set(csrfParam, csrfToken);
+
+    const fileManagerJson = new URL(fileUploadPath, document.location.href);
+    fileManagerJson.searchParams.set('source', 'redactor');
+    fileManagerJson.searchParams.set('type', 'file');
+
+    const definedLinks = new URL(pagesPath, document.location.href);
+    definedLinks.searchParams.set('source', 'redactor');
+
+    return {
+      minHeight: 160,
+      autoresize: true,
+      buttonSource: true,
+      formatting: ['p', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6'],
+      plugins: ['imagemanager', 'filemanager', 'table', 'video', 'definedlinks'],
+      lang: CMS.getLocale(),
+      convertDivs: false,
+      imageUpload,
+      imageManagerJson,
+      fileUpload,
+      fileManagerJson,
+      definedLinks
+    };
+  };
+
+  const redactorInstances = [];
+  window.CMS.wysiwyg = {
+    init(root = document) {
+      const textareas = root.querySelectorAll('textarea.rich-text-editor, textarea[data-cms-rich-text]');
+      if (textareas.length === 0) return;
+      const redactorOptions = buildRedactorOptions();
+      for (const textarea of textareas) {
+        redactorInstances.push(new jQuery.Redactor(textarea, redactorOptions));
+      }
+    },
+    dispose() {
+      for (const redactor of redactorInstances) {
+        redactor.core.destroy();
+      }
+      redactorInstances.length = 0;
+    }
+  }
+})();
+
+

data/app/assets/javascripts/comfy/vendor/redactor.js

@@ -8,6 +8,9 @@
 	License: http://imperavi.com/redactor/license/
 
 	Usage: $('#content').redactor();
+
+	NOTE: This is the most recent editor we have licence for. There are inline
+	fixes and tweaks annotated with "COMFY FIX"
 */
 
 (function($)
@@ -1362,6 +1365,12 @@
 				},
 				setEventDrop: function(e)
 				{
+					// COMFY FIX
+					// Adding ability to drag-n-drop file links
+					var text = e.dataTransfer.getData('text/plain');
+					if (text) this.insert.html(text, false);
+					// END COMFY FIX
+
 					this.code.sync();
 					setTimeout(this.clean.clearUnverified, 1);
 					this.core.setCallback('drop', e);
@@ -7729,12 +7738,9 @@
 						var node2 = this.selection.getMarker(2);
 						this.selection.setMarker(this.range, node2, false);
 
-						// comfy fix
-						if (this.utils.browser('chrome'))
-						{
-							this.caret.set(node1, 0, node2, 0);
-						}
-						// end fix
+						// COMFY FIX
+						if (this.utils.browser('chrome')) this.caret.set(node1, 0, node2, 0);
+						// END COMFY FIX
 					}
 
 					this.savedSel = this.$editor.html();

data/app/assets/stylesheets/comfy/admin/cms/base.sass

@@ -11,13 +11,6 @@ body#comfy
     overflow: hidden
     width: 100%
 
-  &.in-iframe
-    height: 100%
-    #cms-left, #cms-right
-      display: none
-    #cms-main
-      padding-top: 0
-
   .alert
     border-radius: 0
     margin: 0 -15px 1rem -15px
@@ -212,34 +205,12 @@ body#comfy
   // -- Files ------------------------------------------------------------------
   .cms-files-modal
     z-index: 99999
-    iframe
-      width: 100%
-      height: 100%
-      border: 0
-
-  &.c-comfy-admin-cms-files
-    ul.list
-      input.file-path
-        border: 0
-        color: $gray-500
-        background: inherit
-      .progress
-        width: 100%
-        height: 25px
-    form
-      .file-image
-        img
-          width: 100%
-
-    .cms-uploader-drag-drop-target-active
-      position: fixed !important
-      z-index: 9999
-      top: 0
-      left: 0
-      width: 100%
-      height: 100%
-      border: dotted #ccc 1px
-      background-color: rgba(255, 255, 255, 0.7)
+    .modal-dialog
+      max-width: 900px
+    .modal-content
+      max-height: calc(100vh - 60px)
+    .modal-body
+      overflow-y: auto
 
   // -- Revisions --------------------------------------------------------------
   &[class*="c-comfy-admin-cms-revisions-"], &[class*="c-comfy-admin-blog-revisions-"]
@@ -257,3 +228,29 @@ body#comfy
           text-decoration: none
         del
           background-color: #ffc6c6
+
+#cms-uploader
+  ul.list
+    .file-path
+      border: 0
+      color: $gray-500
+      background: inherit
+      white-space: nowrap
+      user-select: all
+    .progress
+      width: 100%
+      height: 25px
+  form
+    .file-image
+      img
+        width: 100%
+
+  .cms-uploader-drag-drop-target-active
+    position: fixed !important
+    z-index: 9999
+    top: 0
+    left: 0
+    width: 100%
+    height: 100%
+    border: dotted #ccc 1px
+    background-color: rgba(255, 255, 255, 0.7)

data/app/controllers/application_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ApplicationController < ActionController::Base
 
   protect_from_forgery

data/app/controllers/comfy/admin/base_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Comfy::Admin::BaseController < ComfortableMexicanSofa.config.base_controller.to_s.constantize
 
   include Comfy::Paginate
@@ -11,7 +13,7 @@ class Comfy::Admin::BaseController < ComfortableMexicanSofa.config.base_controll
   helper Comfy::Admin::CmsHelper
   helper Comfy::CmsHelper
 
-  protect_from_forgery
+  protect_from_forgery with: :exception
 
   before_action :authenticate
 

data/app/controllers/comfy/admin/cms/base_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Comfy::Admin::Cms::BaseController < Comfy::Admin::BaseController
 
   before_action :load_admin_site,
@@ -5,6 +7,8 @@ class Comfy::Admin::Cms::BaseController < Comfy::Admin::BaseController
                 :load_seeds,
                 except: :jump
 
+  layout :infer_layout
+
   if ComfortableMexicanSofa.config.admin_cache_sweeper.present?
     cache_sweeper(*ComfortableMexicanSofa.config.admin_cache_sweeper)
   end
@@ -30,7 +34,7 @@ protected
   end
 
   def set_locale
-    I18n.locale = ComfortableMexicanSofa.config.admin_locale || (@site && @site.locale)
+    I18n.locale = ComfortableMexicanSofa.config.admin_locale || (@site&.locale)
     true
   end
 
@@ -44,4 +48,8 @@ protected
     end
   end
 
+  def infer_layout
+    false if params[:layout] == "false"
+  end
+
 end

data/app/controllers/comfy/admin/cms/categories_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Comfy::Admin::Cms::CategoriesController < Comfy::Admin::Cms::BaseController
 
   before_action :load_category, only: %i[edit update destroy]

data/app/controllers/comfy/admin/cms/files_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Comfy::Admin::Cms::FilesController < Comfy::Admin::Cms::BaseController
 
   include ::Comfy::ReorderAction
@@ -67,7 +69,7 @@ class Comfy::Admin::Cms::FilesController < Comfy::Admin::Cms::BaseController
 
     case params[:source]
     when "plupload"
-      render body: render_to_string(partial: "file", object: @file)
+      render partial: "file", object: @file
     when "redactor"
       render json: {
         filelink: url_for(@file.attachment),

data/app/controllers/comfy/admin/cms/layouts_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Comfy::Admin::Cms::LayoutsController < Comfy::Admin::Cms::BaseController
 
   include ::Comfy::ReorderAction

data/app/controllers/comfy/admin/cms/pages_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Comfy::Admin::Cms::PagesController < Comfy::Admin::Cms::BaseController
 
   include ::Comfy::ReorderAction
@@ -61,6 +63,7 @@ class Comfy::Admin::Cms::PagesController < Comfy::Admin::Cms::BaseController
   def form_fragments
     @page = @site.pages.find_by(id: params[:id]) || @site.pages.new
     @page.layout = @site.layouts.find_by(id: params[:layout_id])
+    render partial: "comfy/admin/cms/fragments/form_fragments", locals: { record: @page, scope: :page }, layout: false
   end
 
   def toggle_branch
@@ -112,7 +115,7 @@ protected
   def build_page
     @page = @site.pages.new(page_params)
     @page.parent ||= (@site.pages.find_by_id(params[:parent_id]) || @site.pages.root)
-    @page.layout ||= (@page.parent && @page.parent.layout || @site.layouts.first)
+    @page.layout ||= (@page.parent&.layout || @site.layouts.first)
   end
 
   def load_page