Merge branch 'master' of github.com:bitpay/mystery into test/test-p2p-sync

This commit is contained in:
Manuel Araoz 2014-01-16 16:12:49 -03:00
commit cfac69ccb1
3 changed files with 5 additions and 5 deletions

View File

@ -33,7 +33,7 @@ script(type='text/javascript', src='/js/services/status.js')
script(type='text/javascript', src='/js/services/address.js')
script(type='text/javascript', src='/js/services/transactions.js')
script(type='text/javascript', src='/js/services/blocks.js')
script(type='text/javascript', src='/js/services/index.js')
script(type='text/javascript', src='/js/services/socket.js')
//Application Controllers
script(type='text/javascript', src='/js/controllers/index.js')

View File

@ -8,7 +8,7 @@ angular.module('mystery',
'ui.bootstrap',
'ui.route',
'mystery.system',
'mystery.index',
'mystery.socket',
'mystery.blocks',
'mystery.transactions',
'monospaced.qrcode',
@ -18,7 +18,7 @@ angular.module('mystery',
]);
angular.module('mystery.system', []);
angular.module('mystery.index', []);
angular.module('mystery.socket', []);
angular.module('mystery.blocks', []);
angular.module('mystery.transactions', []);
angular.module('mystery.address', []);

View File

@ -1,6 +1,6 @@
'use strict';
app.factory('socket', function($rootScope) {
angular.module('mystery.socket').factory('socket', ['$rootScope', function($rootScope) {
var socket = io.connect();
return {
on: function(eventName, callback) {
@ -22,5 +22,5 @@ app.factory('socket', function($rootScope) {
});
}
};
});
}]);