diff --git a/public/js/chatroomApp.js b/public/js/chatroomApp.js index 9562ff5..3dcc1ca 100644 --- a/public/js/chatroomApp.js +++ b/public/js/chatroomApp.js @@ -48,5 +48,5 @@ if (!connected) { window.location.reload(); } - }, 2500); + }, 2200); }).call(this); diff --git a/public/js/dist/chatroom.js b/public/js/dist/chatroom.js index 0bba76d..646c90f 100644 --- a/public/js/dist/chatroom.js +++ b/public/js/dist/chatroom.js @@ -361,5 +361,5 @@ if (!connected) { window.location.reload(); } - }, 2500); + }, 2200); }).call(this); diff --git a/public/js/dist/chatroom.min.js b/public/js/dist/chatroom.min.js index a959b9c..ca7fde8 100644 --- a/public/js/dist/chatroom.min.js +++ b/public/js/dist/chatroom.min.js @@ -1 +1 @@ -(function(){var e=this.syaberi!=null?this.syaberi:this.syaberi={};e.templates=this.syaberi.templates!=null?this.syaberi.templates:this.syaberi.templates={},e.templates.chat={},e.templates.chat.chatL=Handlebars.compile('

{{{message}}}

{{#if extImageUrl}} {{/if}} {{#if youtubeVid}} {{/if}}
{{time}} [1] {{#if isHis}} 閉じる {{/if}}
'),e.templates.chat.chatR=Handlebars.compile('

{{{message}}}

{{#if extImageUrl}} {{/if}} {{#if youtubeVid}} {{/if}}
{{time}} [2] {{#if isHis}} 閉じる {{/if}}
{{#if isInvite}}{{#unless isUrlOpen}}{{#if isOwner}} [招待] {{/if}}{{/unless}}{{/if}}
')}).call(this),function(){var e=this.syaberi!=null?this.syaberi:this.syaberi={};e.Chat=Backbone.Model.extend({id:null,userId:null,userName:null,type:null,body:null,image:null,time:null,url:"/chats"}),e.Chats=Backbone.Collection.extend({model:e.Chat,url:"/chats"})}.call(this),function(){var e=this.syaberi!=null?this.syaberi:this.syaberi={},t=1,n=2,r=3;e.ChatView=Backbone.View.extend({el:$("html"),events:{"click #submit_1":"submit","keydown #message1":"keydown","click img.delete_cmt":"destroy","click a.start_chat":"invite","change #uploadings_input":"upload","change #message1":"uploadOff"},initialize:function(){this.collection=new e.Chats,this.uploadCancelFlg=0,this.token=$("#token").val()},submit:function(n){var r=$.trim($("#message1").val());if(r&&r!==""){var i=$("html").data("chatroom"),s=$("html").data("userid"),o=$("html").data("username"),u=$("html").data("userimage"),a=$("html").data("urlopen");return e.socket.emit("message",{mode:"create",chatroomId:i,userId:s,userName:o,userImage:u,message:r,type:t,isUrlOpen:a,token:this.token}),this.clearInputUserMessage(),!1}},keydown:function(e){if(e.shiftKey!==!0&&e.keyCode===13)return this.submit(e),!1},destroy:function(t){if(window.confirm("本当に削除しますか?")){var n=$(t.target),r=n.data("chatid"),i=$("html").data("chatroom"),s=$("html").data("userid");e.socket.emit("message",{mode:"destroy",chatroomId:i,chatId:r,userId:s,token:this.token})}},invite:function(e){var t=$(e.target),n=t.data("userid"),r=t.data("chatid"),i=$("html").data("chatroom");window.confirm("このユーザとチャットを開始しますか?")&&$.ajax({type:"POST",url:"/chatrooms/"+i+"/invite",data:"member="+n+"&chat="+r,success:function(e){location.href="/chatrooms/"+i+"/open"}})},upload:function(){$("#uploadings_input").upload("/upload",function(e){if(e){var t=e,n=t.split('": "'),r=n[1].split('"}'),i=$("input#uploadings_input").val().split("\\"),s;for(var o=0;o

{{{message}}}

{{#if extImageUrl}} {{/if}} {{#if youtubeVid}} {{/if}}
{{time}} [1] {{#if isHis}} 閉じる {{/if}}
'),e.templates.chat.chatR=Handlebars.compile('

{{{message}}}

{{#if extImageUrl}} {{/if}} {{#if youtubeVid}} {{/if}}
{{time}} [2] {{#if isHis}} 閉じる {{/if}}
{{#if isInvite}}{{#unless isUrlOpen}}{{#if isOwner}} [招待] {{/if}}{{/unless}}{{/if}}
')}).call(this),function(){var e=this.syaberi!=null?this.syaberi:this.syaberi={};e.Chat=Backbone.Model.extend({id:null,userId:null,userName:null,type:null,body:null,image:null,time:null,url:"/chats"}),e.Chats=Backbone.Collection.extend({model:e.Chat,url:"/chats"})}.call(this),function(){var e=this.syaberi!=null?this.syaberi:this.syaberi={},t=1,n=2,r=3;e.ChatView=Backbone.View.extend({el:$("html"),events:{"click #submit_1":"submit","keydown #message1":"keydown","click img.delete_cmt":"destroy","click a.start_chat":"invite","change #uploadings_input":"upload","change #message1":"uploadOff"},initialize:function(){this.collection=new e.Chats,this.uploadCancelFlg=0,this.token=$("#token").val()},submit:function(n){var r=$.trim($("#message1").val());if(r&&r!==""){var i=$("html").data("chatroom"),s=$("html").data("userid"),o=$("html").data("username"),u=$("html").data("userimage"),a=$("html").data("urlopen");return e.socket.emit("message",{mode:"create",chatroomId:i,userId:s,userName:o,userImage:u,message:r,type:t,isUrlOpen:a,token:this.token}),this.clearInputUserMessage(),!1}},keydown:function(e){if(e.shiftKey!==!0&&e.keyCode===13)return this.submit(e),!1},destroy:function(t){if(window.confirm("本当に削除しますか?")){var n=$(t.target),r=n.data("chatid"),i=$("html").data("chatroom"),s=$("html").data("userid");e.socket.emit("message",{mode:"destroy",chatroomId:i,chatId:r,userId:s,token:this.token})}},invite:function(e){var t=$(e.target),n=t.data("userid"),r=t.data("chatid"),i=$("html").data("chatroom");window.confirm("このユーザとチャットを開始しますか?")&&$.ajax({type:"POST",url:"/chatrooms/"+i+"/invite",data:"member="+n+"&chat="+r,success:function(e){location.href="/chatrooms/"+i+"/open"}})},upload:function(){$("#uploadings_input").upload("/upload",function(e){if(e){var t=e,n=t.split('": "'),r=n[1].split('"}'),i=$("input#uploadings_input").val().split("\\"),s;for(var o=0;o