|
|
@ -44,6 +44,7 @@
|
|
|
|
return -1;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
window.events = _.clone(Backbone.Events);
|
|
|
|
var accountManager;
|
|
|
|
var accountManager;
|
|
|
|
window.getAccountManager = function() {
|
|
|
|
window.getAccountManager = function() {
|
|
|
|
if (!accountManager) {
|
|
|
|
if (!accountManager) {
|
|
|
@ -58,12 +59,13 @@
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Whisper.Registration.markDone();
|
|
|
|
Whisper.Registration.markDone();
|
|
|
|
console.log("dispatching registration event");
|
|
|
|
console.log("dispatching registration event");
|
|
|
|
extension.trigger('registration_done');
|
|
|
|
events.trigger('registration_done');
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return accountManager;
|
|
|
|
return accountManager;
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
storage.fetch();
|
|
|
|
storage.fetch();
|
|
|
|
storage.onready(function() {
|
|
|
|
storage.onready(function() {
|
|
|
|
window.dispatchEvent(new Event('storage_ready'));
|
|
|
|
window.dispatchEvent(new Event('storage_ready'));
|
|
|
@ -75,7 +77,7 @@
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
console.log("listening for registration events");
|
|
|
|
console.log("listening for registration events");
|
|
|
|
extension.on('registration_done', function() {
|
|
|
|
events.on('registration_done', function() {
|
|
|
|
console.log("handling registration event");
|
|
|
|
console.log("handling registration event");
|
|
|
|
extension.keepAwake();
|
|
|
|
extension.keepAwake();
|
|
|
|
init(true);
|
|
|
|
init(true);
|
|
|
|