DomainCompare is now a simple function, no more mixin

htdocs/src/components/ZoneList.vue

@@ -54,14 +54,12 @@
 
 <script>
 import axios from 'axios'
-import DomainCompare from '@/mixins/domainCompare'
 import SourcesApi from '@/services/SourcesApi'
+import { domainCompare } from '@/utils/domainCompare'
 
 export default {
   name: 'ZoneList',
 
-  mixins: [DomainCompare],
-
   props: {
     inSource: {
       type: Object,
@@ -98,8 +96,7 @@ export default {
         }
       }
 
-      var vm = this
-      ret.sort(function (a, b) { return vm.domainCompare(a.domain, b.domain) })
+      ret.sort(function (a, b) { return domainCompare(a.domain, b.domain) })
 
       return ret
     }

htdocs/src/components/hSubdomainList.vue

@@ -80,10 +80,10 @@
 </template>
 
 <script>
-import DomainCompare from '@/mixins/domainCompare'
 import ServiceSpecsApi from '@/services/ServiceSpecsApi'
 import ValidateDomain from '@/mixins/validateDomain'
 import ZoneApi from '@/services/ZoneApi'
+import { domainCompare } from '@/utils/domainCompare'
 
 export default {
   name: 'HSubdomainList',
@@ -93,7 +93,7 @@ export default {
     hSubdomainItem: () => import('@/components/hSubdomainItem')
   },
 
-  mixins: [DomainCompare, ValidateDomain],
+  mixins: [ValidateDomain],
 
   props: {
     domain: {
@@ -148,7 +148,7 @@ export default {
       }
 
       var domains = Object.keys(this.myServices.services)
-      domains.sort(this.domainCompare)
+      domains.sort(domainCompare)
 
       return domains
     }

htdocs/src/utils/domainCompare.js

@@ -29,21 +29,17 @@
 // The fact that you are presently reading this means that you have had
 // knowledge of the CeCILL license and that you accept its terms.
 
-export default {
-  methods: {
-    domainCompare (a, b) {
-      var as = a.split('.').reverse()
-      var bs = b.split('.').reverse()
+export function domainCompare (a, b) {
+  var as = a.split('.').reverse()
+  var bs = b.split('.').reverse()
 
-      var maxDepth = Math.min(as.length, bs.length)
-      for (var i = 0; i < maxDepth; i++) {
-        var cmp = as[i].localeCompare(bs[i])
-        if (cmp !== 0) {
-          return cmp
-        }
-      }
-
-      return as.length - bs.length
+  var maxDepth = Math.min(as.length, bs.length)
+  for (var i = 0; i < maxDepth; i++) {
+    var cmp = as[i].localeCompare(bs[i])
+    if (cmp !== 0) {
+      return cmp
     }
   }
+
+  return as.length - bs.length
 }