Remove <a href=""> in wiki\show.twig and wiki\category.twig

pradoslaw · Jan 28, 2024 · d9e31d5 · d9e31d5
1 parent 25afb4e
commit d9e31d5
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 30 deletions.
diff --git a/resources/js/legacy/subscribe.js b/resources/js/legacy/subscribe.js
@@ -1,16 +1,18 @@
 $(() => {
-    'use strict';
-
-    $('.btn-subscribe').click((e) => {
-        let self = $(e.currentTarget);
-
-        $.post(self.attr('href'), () => {
-            self.toggleClass('on');
-            self.find('span').text(self.data(self.hasClass('on') ? 'off' : 'on'));
-        }).fail((e) => {
-            $('#modal-unauthorized').modal('show');
-        });
-
-        return false;
-    });
-});
+  'use strict';
+  $('.btn-subscribe').click(event => {
+    const self = $(event.currentTarget);
+    if (!self.data('href')) {
+      return;
+    }
+    $
+      .post(self.data('href'), () => {
+        self.toggleClass('on');
+        self.find('span').text(self.data(self.hasClass('on') ? 'off' : 'on'));
+      })
+      .fail((e) => {
+        $('#modal-unauthorized').modal('show');
+      });
+    return false;
+  });
+});
diff --git a/resources/views/forum/topic.twig b/resources/views/forum/topic.twig
@@ -132,10 +132,10 @@
       </template>
 
       <vue-post-wrapper
-        v-for="post in posts"
-        :key="post.id"
-        :post="post"
-        @reply="reply"
+          v-for="post in posts"
+          :key="post.id"
+          :post="post"
+          @reply="reply"
       ></vue-post-wrapper>
 
       <div class="row no-gutters mb-3">
@@ -148,10 +148,10 @@
 
       {% if is_writeable %}
         <vue-form
-          id="js-submit-form"
-          ref="js-submit-form"
-          :post="undefinedPost"
-          @save="resetPost"
+            id="js-submit-form"
+            ref="js-submit-form"
+            :post="undefinedPost"
+            @save="resetPost"
         ></vue-form>
       {% endif %}
 
@@ -177,10 +177,9 @@
     {% block side_menu %}
       <div id="js-sidebar" class="box" v-cloak>
         <ul class="side-menu mt-2">
-          <li v-if="isAuthorized" :class="{'on': topic.is_subscribed}" class="btn-subscribe">
-            <a @click="subscribe(topic)" href="javascript:">
+          <li v-if="isAuthorized" :class="{'on': topic.is_subscribed}" class="btn-subscribe" @click="subscribe(topic)">
+            <a>
               <i :class="{'fas': topic.is_subscribed, 'far': !topic.is_subscribed}" class="fa-star fa-fw"></i>
-
               <span v-if="topic.is_subscribed">Zakończ obserwację</span>
               <span v-else>Obserwuj wątek</span>
             </a>

diff --git a/resources/views/wiki/category.twig b/resources/views/wiki/category.twig
@@ -18,10 +18,18 @@
         </a>
       {% endif %}
 
-      <a class="nav-item" href="{{ route('wiki.submit') }}?parentId={{ wiki.id }}" title="Dodaj nową stronę w tej kategorii"><span>Napisz nowy artykuł w tym dziale</span></a>
-      <a class="nav-item" href="{{ route('wiki.subscribe', [wiki.id]) }}" class="btn-subscribe {{ subscribed ? 'on' }}" data-off="{{ labels[0] }}" data-on="{{ labels[1] }}"
+      <a class="nav-item"
+         href="{{ route('wiki.submit') }}?parentId={{ wiki.id }}"
+         title="Dodaj nową stronę w tej kategorii">
+        <span>Napisz nowy artykuł w tym dziale</span>
+      </a>
+
+      {% set labels = ['Usuń z ulubionych', 'Dodaj do ulubionych'] %}
+      <a class="nav-item btn-subscribe {{ subscribed ? 'on' }}"
+         data-href="{{ route('wiki.subscribe', [wiki.id]) }}"
+         data-off="{{ labels[0] }}"
+         data-on="{{ labels[1] }}"
          title="Obserwując tę stronę będziesz otrzymywał powiadomienia o jej zmianach">
-        {% set labels = ['Usuń z ulubionych', 'Dodaj do ulubionych'] %}
         <span>{{ labels[not subscribed] }}</span>
       </a>
 

diff --git a/resources/views/wiki/show.twig b/resources/views/wiki/show.twig
@@ -35,7 +35,7 @@
         <li>
           {% set labels = ['Usuń z ulubionych', 'Dodaj do ulubionych'] %}
           <a class="btn-subscribe {{ subscribed ? 'on' }}"
-             href="{{ route('wiki.subscribe', [wiki.id]) }}"
+             data-href="{{ route('wiki.subscribe', [wiki.id]) }}"
              data-off="{{ labels[0] }}"
              data-on="{{ labels[1] }}"
              title="Obserwując tę stronę będziesz otrzymywał powiadomienia o jej zmianach">