|
@@ -2,10 +2,10 @@ var Uploader = {
|
|
|
|
|
|
roomId: null,
|
|
|
|
|
|
- createRoom: function() {
|
|
|
+ createRoom: function(callback) {
|
|
|
var self = this;
|
|
|
$.post('/room', {}, function(response) {
|
|
|
- self.roomId = $.parseJSON(response).id
|
|
|
+ callback($.parseJSON(response).id);
|
|
|
})
|
|
|
},
|
|
|
|
|
@@ -54,12 +54,13 @@ var Uploader = {
|
|
|
var CryptoUploader = {
|
|
|
|
|
|
createRoom: function() {
|
|
|
- Uploader.createRoom();
|
|
|
- CryptoUtils.initialize()
|
|
|
- .then(function(){
|
|
|
- window.location = window.location.href+"#"+Uploader.roomId+","+CryptoUtils.urlSafeKey;
|
|
|
- window.location.reload();
|
|
|
- })
|
|
|
+ Uploader.createRoom(function(roomId){
|
|
|
+ CryptoUtils.initialize()
|
|
|
+ .then(function(){
|
|
|
+ window.location = window.location.href+"#"+roomId+","+CryptoUtils.urlSafeKey;
|
|
|
+ window.location.reload();
|
|
|
+ })
|
|
|
+ });
|
|
|
},
|
|
|
|
|
|
uploadFile: function() {
|
|
@@ -136,8 +137,7 @@ $(function(){
|
|
|
}
|
|
|
else {
|
|
|
$("#room").hide();
|
|
|
- $("#create-room").show();
|
|
|
- $("#create-room > input").on('click', function(e){
|
|
|
+ $("#create-room > input").show().on('click', function(e){
|
|
|
CryptoUploader.createRoom();
|
|
|
});
|
|
|
}
|