Commit e86aa19e by Lee Munkyeong

Merge branch 'release_sp3' into 'devlop_contactUI'

# Conflicts:
#   public/js/chat-ui.js
parents 990c3063 65204d49
......@@ -39,8 +39,16 @@ $(window).on('resize', function() {
$(".chat_list").removeClass("col-6").addClass("col-12");
$(".squareBoxContent span").removeClass("landscape_span");
$(".mesgs").removeClass("landscape_mesgs");
}
$(".mesgs").removeClass("landscape_mesgs");
}
if (CHAT_UTIL.isIOS()) {
if (isLandscape == true) {
$(".mesgs").addClass("landscape_mesgs");
} else if (isLandscape == false) {
$(".mesgs").removeClass("landscape_mesgs");
}
}
})
// New Room
......@@ -156,6 +164,48 @@ $('#messages').scroll(function(){
}
});
// UIの位置調整(キーボード出現時)
$('#message-form').on('focus', function(){
if (CHAT_UTIL.isIOS()) {
// メッセージ入力欄の位置指定
document.querySelector('.fixed-bottom').style.bottom = 10000 + 'px';
setTimeout(function() {
document.querySelector('.fixed-bottom').style.bottom = 0 + 'px';
},200);
}
});
CHAT_UI.setNavigationPosition = function(y) {
if (document.activeElement.id == 'message-form') {
$('.navbar').css('position','absolute');
$('.navbar').css('top', (y) + 'px');
$('.tab-pane').css('margin-top', y + 'px');
var height = document.getElementById("messages").getBoundingClientRect().height;
$('.msg_history').css('height', height - y + 'px');
} else if (document.activeElement.id == 'message-search') {
$('.msg_history').css('height', '');
}
}
CHAT_UI.resetNavigationPosition = function() {
$('.navbar').css('position','');
$('.navbar').css('top', '');
$('.tab-pane').css('margin-top','');
$('.msg_history').css('height', '');
}
// 端末の向きを記録(キーボード出現時にLandscapeModeと判定する対策)
var isLandscape;
CHAT_UI.setOrientation = function(isLandscapeMode){
if (isLandscapeMode == 'false') {
$(".mesgs").removeClass("landscape_mesgs");
isLandscape = false;
} else {
$(".mesgs").addClass("landscape_mesgs");
isLandscape = true;
}
}
//メッセージ送信
$('#message-form').on('keypress', function(event){
if (event.which == 13) {
......
// 名前空間
var CHAT = {};
// test comment
//招待するメンバーを保存する変数
CHAT.globalSelectedUserList = new Array();
CHAT.globalIsInvite = false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment