fix(sharing): Add social service to Inventory

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

View File

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

View File

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

View File

@@ -3,7 +3,7 @@ include ../avatar/generated_avatar
script(type='text/ng-template', id='modals/levelUp.html')
div(id='fb-root')
.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')
.container-fluid
.row