krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 07:07:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: Remove name from sortable inventory

Browse Source
This commit is contained in:
Blade Barringer
2016-03-17 08:47:56 -05:00
parent d4d668a7aa
commit ced0b44b2f
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
website/public/js/controllers/sortableInventoryCtrl.js
View File

@@ -5,17 +5,16 @@ habitrpg.controller('SortableInventoryController', ['$scope',
intelligence: ['-int', '-(con+int+per+str)'], intelligence: ['-int', '-(con+int+per+str)'],
perception: ['-per', '-(con+int+per+str)'], perception: ['-per', '-(con+int+per+str)'],
strength: ['-str', '-(con+int+per+str)'], strength: ['-str', '-(con+int+per+str)'],
name: 'text()',
set: 'set' set: 'set'
} }
$scope.order = attributeSort.name;
$scope.orderChoice = 'name';
$scope.setOrder = function (order) { $scope.setOrder = function (order) {
$scope.orderChoice = order; $scope.orderChoice = order;
if (order in attributeSort) { if (order in attributeSort) {
$scope.order = attributeSort[order]; $scope.order = attributeSort[order];
} }
}; };
$scope.orderChoice = 'set';
$scope.setOrder($scope.orderChoice);
}]); }]);

2
website/views/options/inventory/equipment.jade
View File

@@ -7,7 +7,7 @@ mixin orderByButton
button.btn.btn-default.dropdown-toggle(type='button', data-toggle='dropdown') button.btn.btn-default.dropdown-toggle(type='button', data-toggle='dropdown')
| {{env.t("orderBy", { item: env.t(orderChoice) })}} #[span.caret] | {{env.t("orderBy", { item: env.t(orderChoice) })}} #[span.caret]
ul.dropdown-menu ul.dropdown-menu
- each attr in ["name", "set"] - each attr in ["set"]
+choice(attr) +choice(attr)
li.divider(role="separator") li.divider(role="separator")
- each attr in ["constitution", "intelligence", "perception", "strength"] - each attr in ["constitution", "intelligence", "perception", "strength"]