Merge branch 'release/6.0.7'

* release/6.0.7: fixes custom event casing
austintoddj · Oct 13, 2020 · 4db7e92 · 4db7e92
2 parents a16525b + 3d32f23
commit 4db7e92
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 23 deletions.
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
         "dev": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
         "format": "prettier --write \"**/*.{scss,js,vue}\"",
         "lint": "eslint --ext .js,.vue resources/js/ --fix",
-        "prod": "yarn lint && yarn format && cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
+        "prod": "yarn format && cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
         "watch": "yarn dev --watch"
     },
     "dependencies": {

diff --git a/public/js/app.js b/public/js/app.js
diff --git a/public/js/app.js.map b/public/js/app.js.map
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,6 +1,6 @@
 {
-    "/js/app.js": "/js/app.js?id=bd3f5dfd2728dd6ed7d4",
+    "/js/app.js": "/js/app.js?id=99d7e35f5ecb4ba1378f",
     "/css/app.css": "/css/app.css?id=19ea79a138b52ba255e6",
-    "/js/app.js.map": "/js/app.js.map?id=6a526130f725e6380694",
+    "/js/app.js.map": "/js/app.js.map?id=de3a1ce4dcb46de31961",
     "/css/app.css.map": "/css/app.css.map?id=fb1e43343083b7c71be0"
 }
diff --git a/resources/js/components/editor/EmbedContentModal.vue b/resources/js/components/editor/EmbedContentModal.vue
@@ -76,7 +76,7 @@ export default {
     },
 
     mounted() {
-        this.$parent.$on('openingEmbedContentModal', (data) => {
+        this.$parent.$on('opening-embed-content-modal', (data) => {
             if (!isEmpty(data)) {
                 this.blot = data.existingBlot;
                 this.content = data.content;

diff --git a/resources/js/components/editor/EmbedImageModal.vue b/resources/js/components/editor/EmbedImageModal.vue
@@ -274,7 +274,7 @@ export default {
     },
 
     mounted() {
-        this.$parent.$on('openingEmbedImageModal', (data) => {
+        this.$parent.$on('opening-embed-image-modal', (data) => {
             if (!isEmpty(data)) {
                 this.selectedImageCaption = isEmpty(data.caption) ? '' : data.caption;
                 this.selectedImageUrl = data.url;

diff --git a/resources/js/components/editor/QuillEditor.vue b/resources/js/components/editor/QuillEditor.vue
@@ -94,11 +94,11 @@
             </div>
         </nav>
 
-        <embed-content-modal ref="embedContentModal" @addingEmbedContent="insertEmbedContent" />
+        <embed-content-modal ref="embedContentModal" @adding-embed-content="insertEmbedContent" />
         <embed-image-modal
             ref="embedImageModal"
-            @addingEmbedImage="insertEmbedImage"
-            @removingEmbedImage="removeEmbedImage"
+            @adding-embed-image="insertEmbedImage"
+            @removing-embed-image="removeEmbedImage"
         />
     </div>
 </template>

diff --git a/resources/js/views/EditPost.vue b/resources/js/views/EditPost.vue
@@ -93,7 +93,7 @@
                 </div>
 
                 <div class="form-group my-2">
-                    <quill-editor :key="post.id" :post="post" @updatePost="savePost" />
+                    <quill-editor :key="post.id" :post="post" @update-post="savePost" />
                 </div>
             </div>
         </main>
@@ -105,26 +105,27 @@
                 :post="post"
                 :tags="tags"
                 :topics="topics"
-                @syncSlug="updateSlug"
-                @addTag="addTag"
-                @addPostTag="addPostTag"
-                @addPostTopic="addPostTopic"
-                @addTopic="addTopic"
-                @updatePost="savePost"
+                :errors="errors"
+                @sync-slug="updateSlug"
+                @add-tag="addTag"
+                @add-post-tag="addPostTag"
+                @add-post-topic="addPostTopic"
+                @add-topic="addTopic"
+                @update-post="savePost"
             />
             <featured-image-modal
                 ref="featuredImageModal"
                 :post="post"
-                @updateFeaturedImage="updateFeaturedImage"
-                @removeFeaturedImage="removeFeaturedImage"
-                @updatePost="savePost"
+                @update-featured-image="updateFeaturedImage"
+                @remove-featured-image="removeFeaturedImage"
+                @update-post="savePost"
             />
             <seo-modal
                 ref="seoModal"
                 :post="post"
-                @syncTitle="updateMetaTitle"
-                @syncDescription="updateMetaDescription"
-                @updatePost="savePost"
+                @sync-title="updateMetaTitle"
+                @sync-description="updateMetaDescription"
+                @update-post="savePost"
             />
             <delete-modal
                 ref="deleteModal"