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

Merge branch 'develop' into common-convert

Browse Source
This commit is contained in:
Blade Barringer
2015-02-10 16:27:46 -06:00
parent 17032a4f13 9c6fc78a2f
commit 8ac9dc3ced
8 changed files with 178 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
website/public/js/controllers/rootCtrl.js
View File

@@ -114,6 +114,7 @@ habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$
templateUrl: 'modals/' + template + '.html',
controller: options.controller, // optional
scope: options.scope, // optional
resolve: options.resolve, // optional
keyboard: (options.keyboard === undefined ? true : options.keyboard), // optional
backdrop: (options.backdrop === undefined ? true : options.backdrop), // optional
size: options.size, // optional, 'sm' or 'lg'