From aad3e5ade6a43d3e481d1c2971cb7b0ef1cd12af Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Wed, 28 Oct 2015 16:52:07 -0400 Subject: [PATCH] fix(sharing): Add social service to Inventory Also fixes accidental 'only' in tests. --- test/spec/controllers/inventoryCtrlSpec.js | 2 +- website/public/js/controllers/inventoryCtrl.js | 7 +++++-- website/views/shared/modals/level-up.jade | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/test/spec/controllers/inventoryCtrlSpec.js b/test/spec/controllers/inventoryCtrlSpec.js index dd5525b86e..7aab231dca 100644 --- a/test/spec/controllers/inventoryCtrlSpec.js +++ b/test/spec/controllers/inventoryCtrlSpec.js @@ -1,6 +1,6 @@ 'use strict'; -describe.only('Inventory Controller', function() { +describe('Inventory Controller', function() { var scope, ctrl, user, rootScope; beforeEach(function() { diff --git a/website/public/js/controllers/inventoryCtrl.js b/website/public/js/controllers/inventoryCtrl.js index 82034a7672..0fc8a04c8b 100644 --- a/website/public/js/controllers/inventoryCtrl.js +++ b/website/public/js/controllers/inventoryCtrl.js @@ -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; diff --git a/website/views/shared/modals/level-up.jade b/website/views/shared/modals/level-up.jade index 3f8ab411e9..378e4607c7 100644 --- a/website/views/shared/modals/level-up.jade +++ b/website/views/shared/modals/level-up.jade @@ -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