Fixed duplicate attributes in Vue components. Fixes #1021

PiranhaCMS · Feb 3, 2020 · dfadad1 · dfadad1
1 parent e837f34
commit dfadad1
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/core/Piranha.Manager/assets/dist/js/piranha.contentedit.js b/core/Piranha.Manager/assets/dist/js/piranha.contentedit.js
@@ -685,7 +685,7 @@ Vue.component("html-column-block", {
         piranha.editor.remove(this.uid + 2);
     },
     template:
-        "<div class='block-body' class='row'>" +
+        "<div class='row block-body'>" +
         "  <div class='col-md-6'>" +
         "    <div :class='{ empty: isEmpty1 }'>" +
         "      <div :id='uid + 1' contenteditable='true' spellcheck='false' v-html='column1' v-on:blur='onBlurCol1'></div>" +
@@ -810,7 +810,7 @@ Vue.component("quote-block", {
     template:
         "<div class='block-body' :class='{ empty: isEmpty }'>" +
         "  <i class='fas fa-quote-right quote'></i>" +
-        "  <p class='lead' contenteditable='true' spellcheck='false' v-html='model.body.value' v-on:blur='onBlur'></pre>" +
+        "  <p class='lead' contenteditable='true' spellcheck='false' v-html='model.body.value' v-on:blur='onBlur'></p>" +
         "</div>"
 });
 

diff --git a/core/Piranha.Manager/assets/dist/js/piranha.contentedit.min.js b/core/Piranha.Manager/assets/dist/js/piranha.contentedit.min.js
diff --git a/core/Piranha.Manager/assets/dist/js/piranha.js b/core/Piranha.Manager/assets/dist/js/piranha.js
@@ -1050,7 +1050,7 @@ Vue.component("page-item", {
         "      {{ item.typeName }}" +
         "    </div>" +
         "  </div>" +
-        "  <ol class='dd-list' v-if='item.items.length > 0' class='dd-list'>" +
+        "  <ol class='dd-list' v-if='item.items.length > 0'>" +
         "    <page-item v-for='child in item.items' v-bind:key='child.id' v-bind:item='child'>" +
         "    </page-item>" +
         "  </ol>" +

diff --git a/core/Piranha.Manager/assets/dist/js/piranha.min.js b/core/Piranha.Manager/assets/dist/js/piranha.min.js
diff --git a/core/Piranha.Manager/assets/src/js/components/blocks/html-column-block.js b/core/Piranha.Manager/assets/src/js/components/blocks/html-column-block.js
@@ -41,7 +41,7 @@ Vue.component("html-column-block", {
         piranha.editor.remove(this.uid + 2);
     },
     template:
-        "<div class='block-body' class='row'>" +
+        "<div class='row block-body'>" +
         "  <div class='col-md-6'>" +
         "    <div :class='{ empty: isEmpty1 }'>" +
         "      <div :id='uid + 1' contenteditable='true' spellcheck='false' v-html='column1' v-on:blur='onBlurCol1'></div>" +

diff --git a/core/Piranha.Manager/assets/src/js/components/blocks/quote-block.js b/core/Piranha.Manager/assets/src/js/components/blocks/quote-block.js
@@ -28,6 +28,6 @@ Vue.component("quote-block", {
     template:
         "<div class='block-body' :class='{ empty: isEmpty }'>" +
         "  <i class='fas fa-quote-right quote'></i>" +
-        "  <p class='lead' contenteditable='true' spellcheck='false' v-html='model.body.value' v-on:blur='onBlur'></pre>" +
+        "  <p class='lead' contenteditable='true' spellcheck='false' v-html='model.body.value' v-on:blur='onBlur'></p>" +
         "</div>"
 });
diff --git a/core/Piranha.Manager/assets/src/js/components/page-item.js b/core/Piranha.Manager/assets/src/js/components/page-item.js
@@ -25,7 +25,7 @@ Vue.component("page-item", {
         "      {{ item.typeName }}" +
         "    </div>" +
         "  </div>" +
-        "  <ol class='dd-list' v-if='item.items.length > 0' class='dd-list'>" +
+        "  <ol class='dd-list' v-if='item.items.length > 0'>" +
         "    <page-item v-for='child in item.items' v-bind:key='child.id' v-bind:item='child'>" +
         "    </page-item>" +
         "  </ol>" +