From ced0b44b2fea5566d173d60b5bbbb50a73e303d7 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Thu, 17 Mar 2016 08:47:56 -0500 Subject: [PATCH] fix: Remove name from sortable inventory --- website/public/js/controllers/sortableInventoryCtrl.js | 7 +++---- website/views/options/inventory/equipment.jade | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/website/public/js/controllers/sortableInventoryCtrl.js b/website/public/js/controllers/sortableInventoryCtrl.js index 16512927ec..73cea5b560 100644 --- a/website/public/js/controllers/sortableInventoryCtrl.js +++ b/website/public/js/controllers/sortableInventoryCtrl.js @@ -5,17 +5,16 @@ habitrpg.controller('SortableInventoryController', ['$scope', intelligence: ['-int', '-(con+int+per+str)'], perception: ['-per', '-(con+int+per+str)'], strength: ['-str', '-(con+int+per+str)'], - name: 'text()', set: 'set' } - $scope.order = attributeSort.name; - $scope.orderChoice = 'name'; - $scope.setOrder = function (order) { $scope.orderChoice = order; if (order in attributeSort) { $scope.order = attributeSort[order]; } }; + + $scope.orderChoice = 'set'; + $scope.setOrder($scope.orderChoice); }]); diff --git a/website/views/options/inventory/equipment.jade b/website/views/options/inventory/equipment.jade index 97c0b18d5b..f2d11be6da 100644 --- a/website/views/options/inventory/equipment.jade +++ b/website/views/options/inventory/equipment.jade @@ -7,7 +7,7 @@ mixin orderByButton button.btn.btn-default.dropdown-toggle(type='button', data-toggle='dropdown') | {{env.t("orderBy", { item: env.t(orderChoice) })}} #[span.caret] ul.dropdown-menu - - each attr in ["name", "set"] + - each attr in ["set"] +choice(attr) li.divider(role="separator") - each attr in ["constitution", "intelligence", "perception", "strength"]