Merge branch 'release/5.2.3'

* release/5.2.3: fixes #624
austintoddj · Feb 9, 2020 · deada10 · deada10
2 parents a4bbb77 + e396fa5
commit deada10
Show file tree

Hide file tree

Showing 13 changed files with 110 additions and 104 deletions.
diff --git a/changelog.md b/changelog.md
@@ -2,6 +2,11 @@
 
 ## [Unreleased](https://github.com/cnvs/canvas/compare/master...develop)
 
+## [5.2.3](https://github.com/cnvs/canvas/compare/v5.2.2...v5.2.3) (February 9, 2020)
+
+### Fixed
+- Fixed broken editor/embed links ([#624](https://github.com/cnvs/canvas/issues/624))
+
 ## [5.2.2](https://github.com/cnvs/canvas/compare/v5.2.1...v5.2.2) (February 9, 2020)
 
 ### Fixed

diff --git a/public/js/app.js b/public/js/app.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,5 +1,5 @@
 {
-    "/js/app.js": "/js/app.js?id=33167fb06ffc33e0102c",
+    "/js/app.js": "/js/app.js?id=a35c21cfd37b870ec3d9",
     "/css/app.css": "/css/app.css?id=1b72078c7d5efcba44ea",
     "/css/app-dark.css": "/css/app-dark.css?id=c00d27458093a6dbec9d",
     "/favicon.ico": "/favicon.ico?id=b3aec2f33a001156e320"

diff --git a/resources/js/components/editor/EmbedBlot.js → .../js/components/editor/EmbedContentBlot.js b/resources/js/components/editor/EmbedBlot.js → .../js/components/editor/EmbedContentBlot.js
@@ -2,7 +2,7 @@ import Quill from 'quill'
 
 let BlockEmbed = Quill.import('blots/block/embed')
 
-class EmbedBlot extends BlockEmbed {
+class EmbedContentBlot extends BlockEmbed {
     static create(value) {
         let node = super.create()
 
@@ -19,8 +19,8 @@ class EmbedBlot extends BlockEmbed {
     }
 }
 
-EmbedBlot.blotName = 'embed'
-EmbedBlot.tagName = 'div'
-EmbedBlot.className = 'ql-embed'
+EmbedContentBlot.tagName = 'div'
+EmbedContentBlot.blotName = 'embed-content'
+EmbedContentBlot.className = 'ql-embed-content'
 
-export default EmbedBlot
+export default EmbedContentBlot
diff --git a/...urces/js/components/editor/EmbedModal.vue → ...s/components/editor/EmbedContentModal.vue b/...urces/js/components/editor/EmbedModal.vue → ...s/components/editor/EmbedContentModal.vue
@@ -45,7 +45,7 @@
     import _ from "lodash";
 
     export default {
-        name: 'embed-modal',
+        name: 'embed-content-modal',
 
         data() {
             return {
@@ -56,7 +56,7 @@
         },
 
         mounted() {
-            this.$parent.$on('openingEmbedModal', data => {
+            this.$parent.$on('openingEmbedContentModal', data => {
                 if (!_.isEmpty(data)) {
                     this.blot = data.existingBlot
                     this.content = data.content
@@ -67,7 +67,7 @@
         methods: {
             clickDone() {
                 if (!_.isEmpty(this.content)) {
-                    this.$emit('addingEmbed', {
+                    this.$emit('addingEmbedContent', {
                         content: this.content,
                         existingBlot: this.blot,
                     })

diff --git a/resources/js/components/editor/ImageBlot.js → ...es/js/components/editor/EmbedImageBlot.js b/resources/js/components/editor/ImageBlot.js → ...es/js/components/editor/EmbedImageBlot.js
@@ -2,7 +2,7 @@ import Quill from 'quill'
 
 let BlockEmbed = Quill.import('blots/block/embed')
 
-class ImageBlot extends BlockEmbed {
+class EmbedImageBlot extends BlockEmbed {
     static create(value) {
         let node = super.create()
 
@@ -36,8 +36,8 @@ class ImageBlot extends BlockEmbed {
     }
 }
 
-ImageBlot.tagName = 'div'
-ImageBlot.blotName = 'captioned-image'
-ImageBlot.className = 'embedded_image'
+EmbedImageBlot.tagName = 'div'
+EmbedImageBlot.blotName = 'embed-image'
+EmbedImageBlot.className = 'embedded_image'
 
-export default ImageBlot
+export default EmbedImageBlot
diff --git a/...urces/js/components/editor/ImageModal.vue → .../js/components/editor/EmbedImageModal.vue b/...urces/js/components/editor/ImageModal.vue → .../js/components/editor/EmbedImageModal.vue
@@ -140,7 +140,7 @@
     );
 
     export default {
-        name: 'image-modal',
+        name: 'embed-image-modal',
 
         components: {
             InfiniteLoading,
@@ -170,7 +170,7 @@
         },
 
         mounted() {
-            this.$parent.$on('openingImageModal', data => {
+            this.$parent.$on('openingEmbedImageModal', data => {
                 if (!_.isEmpty(data)) {
                     this.selectedImageCaption = _.isEmpty(data.caption) ? '' : data.caption
                     this.selectedImageUrl = data.url
@@ -257,12 +257,12 @@
             clickDone() {
                 if (!this.selectedImageUrl) {
                     if (!_.isEmpty(this.selectedImageBlot)) {
-                        this.$emit('removingImage', {
+                        this.$emit('removingEmbedImage', {
                             existingBlot: this.selectedImageBlot
                         })
                     }
                 } else {
-                    this.$emit('addingImage', {
+                    this.$emit('addingEmbedImage', {
                         url: this.selectedImageUrl,
                         caption: this.selectedImageCaption ?? '',
                         existingBlot: this.selectedImageBlot,

diff --git a/resources/js/components/editor/LinkBlot.js → ...ces/js/components/editor/EmbedLinkBlot.js b/resources/js/components/editor/LinkBlot.js → ...ces/js/components/editor/EmbedLinkBlot.js
@@ -8,7 +8,7 @@ let BlockEmbed = Quill.import('blots/block/embed');
  *      Twitter
  *      Transistor
  */
-class LinkBlot extends BlockEmbed {
+class EmbedLinkBlot extends BlockEmbed {
     static create(value) {
         let node = super.create();
 
@@ -57,7 +57,7 @@ class LinkBlot extends BlockEmbed {
     }
 }
 
-LinkBlot.blotName = 'link';
-LinkBlot.tagName = 'div';
+EmbedLinkBlot.tagName = 'div';
+EmbedLinkBlot.blotName = 'embed-link';
 
-export default LinkBlot
+export default EmbedLinkBlot
diff --git a/resources/js/components/editor/LinkModal.vue → ...s/js/components/editor/EmbedLinkModal.vue b/resources/js/components/editor/LinkModal.vue → ...s/js/components/editor/EmbedLinkModal.vue
@@ -23,7 +23,7 @@
     import $ from 'jquery'
 
     export default {
-        name: 'link-modal',
+        name: 'embed-link-modal',
 
         data() {
             return {
@@ -34,7 +34,7 @@
 
         methods: {
             addLink() {
-                this.$emit('addingLink', {
+                this.$emit('addingEmbedLink', {
                     url: this.link,
                 })
 

diff --git a/resources/js/components/editor/VideoBlot.js → ...es/js/components/editor/EmbedVideoBlot.js b/resources/js/components/editor/VideoBlot.js → ...es/js/components/editor/EmbedVideoBlot.js
@@ -7,7 +7,7 @@ let BlockEmbed = Quill.import('blots/block/embed')
  *      YouTube
  *      Vimeo
  */
-class VideoBlot extends BlockEmbed {
+class EmbedVideoBlot extends BlockEmbed {
     static create(url) {
         let node = super.create();
         let videoObj = parseVideo(url);
@@ -78,7 +78,8 @@ function parseVideo(url) {
     };
 }
 
-VideoBlot.blotName = 'video';
-VideoBlot.tagName = 'div';
+EmbedVideoBlot.tagName = 'div';
+EmbedVideoBlot.blotName = 'embed-video';
+EmbedVideoBlot.className = 'ql-embed-video'
 
-export default VideoBlot
+export default EmbedVideoBlot
diff --git a/...urces/js/components/editor/VideoModal.vue → .../js/components/editor/EmbedVideoModal.vue b/...urces/js/components/editor/VideoModal.vue → .../js/components/editor/EmbedVideoModal.vue
@@ -23,7 +23,7 @@
     import $ from 'jquery'
 
     export default {
-        name: 'video-modal',
+        name: 'embed-video-modal',
 
         data() {
             return {
@@ -34,7 +34,7 @@
 
         methods: {
             addLink() {
-                this.$emit('addingVideo', {
+                this.$emit('addingEmbedVideo', {
                     url: this.link,
                 })