wip

Author: Etienne Laurent

modules/@apostrophecms/rich-text-widget/index.js

@@ -937,6 +937,7 @@ module.exports = {
       // Quickly replaces inline image placeholder URLs with
       // actual, SEO-friendly URLs based on `widget._relatedDocs`.
       linkImages(widget, content) {
+        console.log('----');
         console.log('content', content);
         // "Why no regexps?" We need to do this as quickly as we can.
         // indexOf and lastIndexOf are much faster.
@@ -945,52 +946,53 @@ module.exports = {
           let offset = 0;
           while (true) {
             const target = `${self.apos.modules['@apostrophecms/image'].action}/${doc.aposDocId}/src`;
-            console.log('target', target);
             i = content.indexOf(target, offset);
             console.log('i', i);
             if (i === -1) {
-              console.log('---');
               break;
             }
             offset = i + target.length;
-            console.log('offset', offset);
             // If you can edit the widget, you don't want the link replaced,
             // as that would lose the image if you edit the widget
             const left = content.lastIndexOf('<', i);
-            console.log('left', left);
             const src = content.indexOf(' src="', left);
-            console.log('src', src);
             const close = content.indexOf('"', src + 6);
-            console.log('close', close);
             if ((left !== -1) && (src !== -1) && (close !== -1)) {
               content = content.substring(0, src + 5) + doc.attachment._urls[self.apos.modules['@apostrophecms/image'].getLargestSize()] + content.substring(close + 1);
-              console.log('content', content);
-              console.log('---');
 
-              // update or insert alt attribute
+              // Update or insert alt attribute
               const tagEnd = content.indexOf('>', left);
+              console.log('tagEnd', tagEnd);
               if (tagEnd !== -1) {
                 let imgTag = content.substring(left, tagEnd + 1);
-                // Look for alt attribute in the tag
+                console.log('imgTag', imgTag);
                 const altAttr = ' alt="';
                 const altIndex = imgTag.indexOf(altAttr);
+                console.log('altIndex', altIndex);
                 if (altIndex !== -1) {
                   // Replace the existing alt value
                   const altValueStart = altIndex + altAttr.length;
+                  console.log('altValueStart', altValueStart);
                   const altValueEnd = imgTag.indexOf('"', altValueStart);
+                  console.log('altValueEnd', altValueEnd);
                   imgTag = imgTag.substring(0, altValueStart) +
                     self.apos.util.escapeHtml(doc.alt || '') +
                     imgTag.substring(altValueEnd);
+                  console.log('updated imgTag', imgTag);
                 } else {
                   // Insert alt attribute before closing >
                   imgTag = imgTag.replace(
                     /\/?>$/,
                     ` alt="${self.apos.util.escapeHtml(doc.alt || '')}"$&`
                   );
+                  console.log('inserted imgTag', imgTag);
                 }
                 // Replace the tag in content
                 content = content.substring(0, left) +
                   imgTag + content.substring(tagEnd + 1);
+
+                console.log('updated content', content);
+                console.log('---');
               }
 
             } else {

modules/@apostrophecms/rich-text-widget/ui/apos/tiptap-extensions/Image.js

@@ -115,6 +115,7 @@ export default options => {
       ];
     },
 
+    // TODO: update alt attibute on edit mode (here?)
     renderHTML({ HTMLAttributes }) {
       const result = [
         'figure',