Created
January 17, 2015 03:37
-
-
Save lefnire/1044fe7d22d73ca2a9e4 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/public/js/app.js b/public/js/app.js | |
index f8410f1..8433ac5 100644 | |
--- a/public/js/app.js | |
+++ b/public/js/app.js | |
@@ -1,9 +1,7 @@ | |
"use strict"; | |
window.habitrpg = angular.module('habitrpg', | |
- ['ngResource', 'ngSanitize', 'userServices', 'groupServices', 'memberServices', 'challengeServices', | |
- 'authServices', 'notificationServices', 'guideServices', 'authCtrl', 'paymentServices', | |
- 'ui.bootstrap', 'ui.keypress', 'ui.router', 'chieffancypants.loadingBar', 'At', 'infinite-scroll', 'ui.select2', 'angular.filter']) | |
+ ['authCtrl', 'ui.bootstrap', 'ui.keypress', 'ui.router', 'chieffancypants.loadingBar', 'At', 'infinite-scroll', 'ui.select2', 'angular.filter']) | |
// @see https://github.com/angular-ui/ui-router/issues/110 and https://github.com/HabitRPG/habitrpg/issues/1705 | |
// temporary hack until they have a better solution | |
diff --git a/public/js/services/authServices.js b/public/js/services/authServices.js | |
index 46bfadd..c71f855 100644 | |
--- a/public/js/services/authServices.js | |
+++ b/public/js/services/authServices.js | |
@@ -7,9 +7,9 @@ | |
var facebook = {} | |
-angular.module('authServices', ['userServices']). | |
+angular.module('habitrpg'). | |
factory('Facebook', | |
- ['$http', '$location', 'User', 'ApiUrlService', | |
+ ['$http', '$location', 'User', 'ApiUrl', | |
function($http, $location, User, ApiUrlService) { | |
//TODO FB.init({appId: '${section.parameters['facebook.app.id']}', status: true, cookie: true, xfbml: true}); | |
var auth, user = User.user; | |
diff --git a/public/js/services/challengeServices.js b/public/js/services/challengeServices.js | |
index 0b1d39e..d8c5f43 100644 | |
--- a/public/js/services/challengeServices.js | |
+++ b/public/js/services/challengeServices.js | |
@@ -4,8 +4,8 @@ | |
* Services that persists and retrieves user from localStorage. | |
*/ | |
-angular.module('challengeServices', ['ngResource']). | |
- factory('Challenges', ['ApiUrlService', '$resource', 'User', '$q', 'Members', | |
+angular.module('habitrpg'). | |
+ factory('Challenges', ['ApiUrl', '$resource', 'User', '$q', 'Members', | |
function(ApiUrlService, $resource, User, $q, Members) { | |
var Challenge = $resource(ApiUrlService.get() + '/api/v2/challenges/:cid', | |
{cid:'@_id'}, | |
diff --git a/public/js/services/groupServices.js b/public/js/services/groupServices.js | |
index 8707424..afcc71f 100644 | |
--- a/public/js/services/groupServices.js | |
+++ b/public/js/services/groupServices.js | |
@@ -4,9 +4,9 @@ | |
* Services that persists and retrieves user from localStorage. | |
*/ | |
-angular.module('groupServices', ['ngResource', 'challengeServices']). | |
- factory('Groups', ['ApiUrlService', '$resource', '$q', '$http', 'User', 'Challenges', | |
- function(ApiUrlService, $resource, $q, $http, User, Challenges) { | |
+angular.module('habitrpg'). | |
+ factory('Groups', ['ApiUrl', '$resource', '$q', '$http', 'User', 'Challenges', | |
+ function(ApiUrl, $resource, $q, $http, User, Challenges) { | |
var Group = $resource(ApiUrlService.get() + '/api/v2/groups/:gid', | |
{gid:'@_id', messageId: '@_messageId'}, | |
diff --git a/public/js/services/guideServices.js b/public/js/services/guideServices.js | |
index 3b808f0..a7d2888 100644 | |
--- a/public/js/services/guideServices.js | |
+++ b/public/js/services/guideServices.js | |
@@ -4,7 +4,7 @@ | |
* Services for each tour step when you unlock features | |
*/ | |
-angular.module('guideServices', []). | |
+angular.module('habitrpg'). | |
factory('Guide', ['$rootScope', 'User', '$timeout', function($rootScope, User, $timeout) { | |
/** | |
diff --git a/public/js/services/memberServices.js b/public/js/services/memberServices.js | |
index bb3a4c5..413a40a 100644 | |
--- a/public/js/services/memberServices.js | |
+++ b/public/js/services/memberServices.js | |
@@ -4,8 +4,8 @@ | |
* Services that persists and retrieves user from localStorage. | |
*/ | |
-angular.module('memberServices', ['ngResource', 'sharedServices']). | |
- factory('Members', ['$rootScope', 'Shared', 'ApiUrlService', '$resource', | |
+angular.module('habitrpg'). | |
+ factory('Members', ['$rootScope', 'Shared', 'ApiUrl', '$resource', | |
function($rootScope, Shared, ApiUrlService, $resource) { | |
var members = {}; | |
var Member = $resource(ApiUrlService.get() + '/api/v2/members/:uid', {uid:'@_id'}); | |
diff --git a/public/js/services/notificationServices.js b/public/js/services/notificationServices.js | |
index da2cd51..568ea6b 100644 | |
--- a/public/js/services/notificationServices.js | |
+++ b/public/js/services/notificationServices.js | |
@@ -1,7 +1,7 @@ | |
/** | |
Set up "+1 Exp", "Level Up", etc notifications | |
*/ | |
-angular.module("notificationServices", []) | |
+angular.module("habitrpg") | |
.factory("Notification", [function() { | |
var stack_topright = {"dir1": "down", "dir2": "left", "spacing1": 15, "spacing2": 15, "firstpos1": 60}; | |
function notify(html, type, icon) { | |
diff --git a/public/js/services/paymentServices.js b/public/js/services/paymentServices.js | |
index e0a059c..bc677b9 100644 | |
--- a/public/js/services/paymentServices.js | |
+++ b/public/js/services/paymentServices.js | |
@@ -1,6 +1,6 @@ | |
'use strict'; | |
-angular.module('paymentServices',[]).factory('Payments', | |
+angular.module('habitrpg').factory('Payments', | |
['$rootScope', 'User', '$http', 'Content', | |
function($rootScope, User, $http, Content) { | |
var Payments = {}; | |
diff --git a/public/js/services/sharedServices.js b/public/js/services/sharedServices.js | |
index 31ef0fc..cd74dde 100644 | |
--- a/public/js/services/sharedServices.js | |
+++ b/public/js/services/sharedServices.js | |
@@ -4,7 +4,7 @@ | |
* Services that expose habitrpg-shared | |
*/ | |
-angular.module('sharedServices', []). | |
+angular.module('habitrpg'). | |
factory('Shared', [function () { | |
return window.habitrpgShared; | |
} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment