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

fix(sharing): Add social service to Inventory

Browse Source 
Also fixes accidental 'only' in tests.
This commit is contained in:
Sabe Jones
2015-10-28 16:52:07 -04:00
parent f4ea6c1d5d
commit aad3e5ade6
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/spec/controllers/inventoryCtrlSpec.js
View File

@@ -1,6 +1,6 @@
'use strict'; 'use strict';
describe.only('Inventory Controller', function() { describe('Inventory Controller', function() {
var scope, ctrl, user, rootScope; var scope, ctrl, user, rootScope;
beforeEach(function() { beforeEach(function() {

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

@@ -1,6 +1,6 @@
habitrpg.controller("InventoryCtrl", habitrpg.controller("InventoryCtrl",
['$rootScope', '$scope', 'Shared', '$window', 'User', 'Content', 'Analytics', 'Quests', 'Stats', ['$rootScope', '$scope', 'Shared', '$window', 'User', 'Content', 'Analytics', 'Quests', 'Stats', 'Social',
function($rootScope, $scope, Shared, $window, User, Content, Analytics, Quests, Stats) { function($rootScope, $scope, Shared, $window, User, Content, Analytics, Quests, Stats, Social) {
var user = User.user; var user = User.user;
@@ -11,6 +11,9 @@ habitrpg.controller("InventoryCtrl",
_updateDropAnimalCount(user.items); _updateDropAnimalCount(user.items);
// Social sharing buttons
$scope.loadWidgets = Social.loadWidgets;
// Functions from Quests service // Functions from Quests service
$scope.lockQuest = Quests.lockQuest; $scope.lockQuest = Quests.lockQuest;

2
website/views/shared/modals/level-up.jade
View File

@@ -3,7 +3,7 @@ include ../avatar/generated_avatar
script(type='text/ng-template', id='modals/levelUp.html') script(type='text/ng-template', id='modals/levelUp.html')
div(id='fb-root') div(id='fb-root')
.modal-content(style='min-width:28em') .modal-content(style='min-width:28em')
.modal-body.text-center .modal-body.text-center(style='padding-bottom:0')
h3(style='margin-bottom: 0')=env.t('gainedLevel') h3(style='margin-bottom: 0')=env.t('gainedLevel')
.container-fluid .container-fluid
.row .row