open.source/stylus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use semverCompare on version column

Browse Source
This commit is contained in:
Rob Garrison 2018-12-02 22:05:45 -06:00
parent de7b0f44f1
commit cf4d4a2e91
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manage.html
View File

@ -172,6 +172,7 @@
<script src="js/localization.js"></script> <script src="js/localization.js"></script>
<script src="manage/filters.js"></script> <script src="manage/filters.js"></script>
<script src="manage/sort.js"></script> <script src="manage/sort.js"></script>
<script src="vendor/semver-bundle/semver.js"></script>
<script src="manage/manage-ui.js"></script> <script src="manage/manage-ui.js"></script>
<script src="manage/manage-actions.js"></script> <script src="manage/manage-actions.js"></script>
<script data-src="manage/draggable.js"></script> <script data-src="manage/draggable.js"></script>

11
manage/sort.js
View File

@ -1,4 +1,4 @@
/* global installed t $ prefs */ /* global installed t $ prefs semverCompare */
/* exported sorter */ /* exported sorter */
'use strict'; 'use strict';
@ -16,6 +16,7 @@ const sorter = (() => {
const sorterType = { const sorterType = {
alpha: (a, b) => a < b ? -1 : a === b ? 0 : 1, alpha: (a, b) => a < b ? -1 : a === b ? 0 : 1,
number: (a, b) => (a || 0) - (b || 0), number: (a, b) => (a || 0) - (b || 0),
semver: (a, b) => semverCompare(a, b)
}; };
const tagData = { const tagData = {
@ -41,12 +42,8 @@ const sorter = (() => {
}, },
version: { version: {
text: '#', text: '#',
parse: ({style}) => (style.usercssData && style.usercssData.version || '') parse: ({style}) => (style.usercssData && style.usercssData.version || ''),
.split(/[.-]/) sorter: sorterType.semver
.splice(0, 3) // ignore extra labels; e.g. 1.2.3-beta.1
.map(n => n ? n.padStart(4, '0') : '')
.join(''),
sorter: sorterType.number
}, },
dateInstalled: { dateInstalled: {
text: t('dateInstalled'), text: t('dateInstalled'),