Browse Source

Merge branch 'develop' into feature/multiselect-filtercontrol

Dennis Hernández 4 years ago
parent
commit
eb19c4edaf

+ 1 - 1
site/_includes/supports.html

@@ -42,7 +42,7 @@
           :title="'$' + support.totalDonations + ' by ' + support.name || support.slug"
           class="support-item"
           target="_blank"
-          rel="nofollow"
+          :rel="support.rel || 'nofollow'"
         >
           <img
             :class="rank.title"

+ 7 - 4
src/extensions/multiple-sort/bootstrap-table-multiple-sort.js

@@ -656,13 +656,16 @@ BootstrapTable.prototype.initToolbar = function (...args) {
     })
 
     this.$el.on('column-switch.bs.table', (field, checked) => {
-      for (let i = 0; i < that.options.sortPriority.length; i++) {
-        if (that.options.sortPriority[i].sortName === checked) {
-          that.options.sortPriority.splice(i, 1)
+      if (that.options.sortPriority !== null && that.options.sortPriority.length > 0) {
+        for (let i = 0; i < that.options.sortPriority.length; i++) {
+          if (that.options.sortPriority[i].sortName === checked) {
+            that.options.sortPriority.splice(i, 1)
+          }
         }
+
+        that.assignSortableArrows()
       }
 
-      that.assignSortableArrows()
       that.$sortModal.remove()
       showSortModal(that)
     })