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

Merge branch 'mounts' into develop

Browse Source 
Conflicts:
	views/options/inventory/stable.jade
This commit is contained in:
Tyler Renelle
2013-11-14 13:04:44 -08:00
parent 1631406a5e d245c87f29
commit 4c3f04cc49
19 changed files with 420 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
public/js/app.js
View File

@@ -30,6 +30,7 @@ window.habitrpg = angular.module('habitrpg',
.when('/options/groups', '/options/groups/tavern')
.when('/options/groups/guilds', '/options/groups/guilds/public')
.when('/options/inventory', '/options/inventory/inventory')
.when('/options/inventory/stable', '/options/inventory/stable/pets')
// redirect states that don't match
.otherwise("/tasks");
@@ -134,7 +135,8 @@ window.habitrpg = angular.module('habitrpg',
// Options > Inventory
.state('options.inventory', {
url: '/inventory',
templateUrl: "partials/options.inventory.html"
templateUrl: "partials/options.inventory.html",
controller: 'InventoryCtrl'
})
.state('options.inventory.inventory', {
url: '/inventory',
@@ -144,6 +146,14 @@ window.habitrpg = angular.module('habitrpg',
url: '/stable',
templateUrl: "partials/options.inventory.stable.html"
})
.state('options.inventory.stable.pets', {
url: '/pets',
templateUrl: "partials/options.inventory.stable.pets.html"
})
.state('options.inventory.stable.mounts', {
url: '/mounts',
templateUrl: "partials/options.inventory.stable.mounts.html"
})
// Options > Settings
.state('options.settings', {