trusty-cms 7.0.43 → 7.0.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf029635066daad115b3e46b75fa8846fb74928e3ff78bfb90fac2b8e0043507
-  data.tar.gz: 24528aea58cd22785bd779b0e1dad29b18d78a3a0f356a6daa0a0b0c17463fc6
+  metadata.gz: a8830acaf3a1831bd605a84200434f0a46db566a361ee665f5de5de5d9044503
+  data.tar.gz: 3e5916aa4f93bc4146e31434deabc17d9b69f61e2666697c85c768e7e62be5d1
 SHA512:
-  metadata.gz: d71bafd88d6a393c2c8c61839a97212c23e07dec07cc348ad0ab0555aaeeb04b69ace7db4325453a8a29ef2033bb719bc72fd5d6ffa5eefa3557beabc67e3ba3
-  data.tar.gz: b7d2957a929e2f12dbd431e7d9a7fa1e6533cc0813ca27705bf5e3851f24dcbcd48dd5c0c75df4c1de4888d42ae6f9979158faa25e838da827fe4f717056449d
+  metadata.gz: 813b2951257943be50acae8fca1b9f4c51d87e1419e9646351b26e26e0ff2e91ca671f0ac8d9604457563dfb706d4cc0ed769ff928e0e22d6c8d9aea761dae3f
+  data.tar.gz: 1494b9500c15592298d5362cec96b4c3fcfc4a0ca8394dea97de9edc1ca5988f29e49cc85eae1a09394e3370d5e2cdfdfb3e2767c5c371ea87567470b328d9e3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (7.0.43)
+    trusty-cms (7.0.45)
       RedCloth (= 4.3.3)
       activestorage-validator
       acts_as_list (>= 0.9.5, < 1.3.0)

data/app/assets/builds/trusty_cms/ckeditor5.js

@@ -103072,10 +103072,14 @@ Original error: ${originalError.name}: ${originalError.message}` : "";
 
   // app/javascript/plugins/asset_tags/asset_tag_builder.js
   var AssetTagBuilder = class extends Plugin {
+    static get requires() {
+      return [Widget];
+    }
     init() {
       console.log("AssetTagBuilder plugin initialized");
       this._defineSchema();
       this._defineConverters();
+      this._defineDataNormalization();
     }
     _defineSchema() {
       const schema = this.editor.model.schema;
@@ -103124,7 +103128,7 @@ Original error: ${originalError.name}: ${originalError.message}` : "";
           if (alt) attrs.alt = alt;
           if (height) attrs.height = height;
           if (width) attrs.width = width;
-          return writer.createEmptyElement("r:asset:image", attrs);
+          return writer.createContainerElement("r:asset:image", attrs);
         }
       });
       editingDowncast.elementToElement({
@@ -103141,10 +103145,64 @@ Original error: ${originalError.name}: ${originalError.message}` : "";
           if (alt) attrs.alt = alt;
           if (height) attrs.height = height;
           if (width) attrs.width = width;
-          return writer.createContainerElement("r:asset:image", attrs);
+          const container = writer.createContainerElement("span", {
+            class: "asset-image-tag",
+            "data-asset-id": id,
+            "data-asset-size": size
+          });
+          const label = writer.createUIElement(
+            "span",
+            { class: "asset-image-tag__label" },
+            function(domDocument) {
+              const domEl = this.toDomElement(domDocument);
+              const parts = [
+                "Asset image",
+                id ? `#${id}` : "",
+                size ? `(${size})` : "",
+                alt ? `\u2014 ${alt}` : "",
+                height ? `height: ${height}` : "",
+                width ? `width: ${width}` : ""
+              ].filter(Boolean);
+              domEl.textContent = parts.join(" ");
+              return domEl;
+            }
+          );
+          writer.insert(writer.createPositionAt(container, 0), label);
+          return toWidget(container, writer, { label: `Asset image ${id ? `#${id}` : ""}` });
         }
       });
     }
+    _defineDataNormalization() {
+      const editor = this.editor;
+      const processor = editor.data.processor;
+      const originalToView = processor.toView.bind(processor);
+      const originalToData = processor.toData.bind(processor);
+      processor.toView = (data) => {
+        let normalized = data;
+        normalized = normalized.replace(
+          /<r:asset:image\b([^>]*?)\/>/gi,
+          "<r:asset:image$1></r:asset:image>"
+        );
+        normalized = normalized.replace(
+          /<r:asset:image\b([^>]*?)>(?!\s*<\/r:asset:image>)/gi,
+          "<r:asset:image$1></r:asset:image>"
+        );
+        return originalToView(normalized);
+      };
+      processor.toData = (viewFragment) => {
+        const html2 = originalToData(viewFragment);
+        return html2.replace(
+          /<r:asset:image\b([^>]*?)>([\s\S]*?)<\/r:asset:image>/gi,
+          (match, attrs, inner) => {
+            const cleanedInner = inner.replace(
+              /^(?:\s|&nbsp;|&#160;)+|(?:\s|&nbsp;|&#160;)+$/g,
+              ""
+            );
+            return `<r:asset:image${attrs} />${cleanedInner}`;
+          }
+        );
+      };
+    }
   };
 
   // app/javascript/plugins/asset_tags/asset_tags.js
@@ -103225,7 +103283,6 @@ Original error: ${originalError.name}: ${originalError.message}` : "";
         "code",
         "removeFormat",
         "|",
-        "specialCharacters",
         "horizontalLine",
         "link",
         "bookmark",