From cbcdc7c236cce54901e3125e90f9a57390d440b2 Mon Sep 17 00:00:00 2001 From: Maximilian Mader Date: Thu, 27 Feb 2014 20:43:54 +0100 Subject: [PATCH 1/5] Fix empty topic boxes --- file/js/be.bastelstu.Chat.litcoffee | 10 +++++----- file/style/be.bastelstu.chat.less | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/file/js/be.bastelstu.Chat.litcoffee b/file/js/be.bastelstu.Chat.litcoffee index f23518f..75a7606 100644 --- a/file/js/be.bastelstu.Chat.litcoffee +++ b/file/js/be.bastelstu.Chat.litcoffee @@ -825,9 +825,9 @@ Joins a room. $('#timsChatTopic > .topic').text currentRoom.topic if currentRoom.topic.trim() is '' - $('#timsChatTopic').addClass 'empty' + $('#timsChatTopic').addClass 'invisible' else - $('#timsChatTopic').removeClass 'empty' + $('#timsChatTopic').removeClass 'invisible' $('.timsChatMessage').addClass 'unloaded' @@ -864,7 +864,7 @@ Open private channel $('.timsChatMessageContainer').height $('.timsChatMessageContainer').height() if userID isnt 0 - $('#timsChatTopic').removeClass 'empty' + $('#timsChatTopic').removeClass 'invisible' $('#timsChatTopic > .topic').html WCF.Language.get 'chat.global.privateChannelTopic', {username: userList.allTime[userID].username} $('#timsChatMessageTabMenu').removeClass 'singleTab' @@ -890,9 +890,9 @@ Open private channel else $('#timsChatTopic > .topic').text currentRoom.topic if currentRoom.topic.trim() is '' - $('#timsChatTopic').addClass 'empty' + $('#timsChatTopic').addClass 'invisible' else - $('#timsChatTopic').removeClass 'empty' + $('#timsChatTopic').removeClass 'invisible' $('.timsChatMessageContainer').removeClass 'active' $("#timsChatMessageContainer#{userID}").addClass 'active' diff --git a/file/style/be.bastelstu.chat.less b/file/style/be.bastelstu.chat.less index 3f6b896..4180c92 100644 --- a/file/style/be.bastelstu.chat.less +++ b/file/style/be.bastelstu.chat.less @@ -212,7 +212,7 @@ border-color: @wcfContainerBorderColor; > .timsChatText { - li { + > li { border-style: solid; border-width: 0 0 1px 0; border-color: @wcfContainerBorderColor; From bf0463a325465896524fa561171b400976534640 Mon Sep 17 00:00:00 2001 From: Maximilian Mader Date: Thu, 27 Feb 2014 20:52:47 +0100 Subject: [PATCH 2/5] Fix attachment upload dropdown z-index issue --- file/style/be.bastelstu.chat.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/file/style/be.bastelstu.chat.less b/file/style/be.bastelstu.chat.less index 4180c92..ab7ffff 100644 --- a/file/style/be.bastelstu.chat.less +++ b/file/style/be.bastelstu.chat.less @@ -455,6 +455,10 @@ } } + #timsChatUploadDropdownMenu { + z-index: 398; + } + #timsChatCopyrightDialog { > div { background-repeat: no-repeat; From f5bd373839c2dd3446ee10fd99874c54fa9e5884 Mon Sep 17 00:00:00 2001 From: Maximilian Mader Date: Thu, 27 Feb 2014 22:16:08 +0100 Subject: [PATCH 3/5] Add smiley overlay for mobile devices --- file/js/be.bastelstu.Chat.litcoffee | 24 +++++++++++++++++++++++- file/style/be.bastelstu.chat.less | 18 +++++++++++++++++- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/file/js/be.bastelstu.Chat.litcoffee b/file/js/be.bastelstu.Chat.litcoffee index 75a7606..c420e86 100644 --- a/file/js/be.bastelstu.Chat.litcoffee +++ b/file/js/be.bastelstu.Chat.litcoffee @@ -49,7 +49,9 @@ exposed by a function if necessary. userListSize = 0 remainingFailures = 3 - + + overlaySmileyList = null + events = newMessage: $.Callbacks() userMenu: $.Callbacks() @@ -147,6 +149,26 @@ Insert the appropriate smiley code into the input when a smiley is clicked. $('#smilies').on 'click', 'img', -> insertText " #{$(@).attr('alt')} " +Copy the first loaded category of smilies so it won't get detached by wcfDialog + + overlaySmileyList = $('
    ').append $('#smilies .smileyList').clone().children() + +Add click event to smilies in the overlay + + overlaySmileyList.on 'click', 'img', -> + insertText " #{$(@).attr('alt')} " + overlaySmileyList.wcfDialog 'close' + +Open the smiley wcfDialog + + $('#timsChatSmileyPopupButton').on 'click', -> + overlaySmileyList.wcfDialog + title: WCF.Language.get 'chat.general.smilies' + + overlaySmileyList.css + 'max-height': $(window).height() - overlaySmileyList.parent().siblings('.dialogTitlebar').outerHeight() + 'overflow': 'auto' + Handle private channel menu $('#timsChatMessageTabMenu > .tabMenu').on 'click', '.timsChatMessageTabMenuAnchor', -> diff --git a/file/style/be.bastelstu.chat.less b/file/style/be.bastelstu.chat.less index ab7ffff..fe31fd2 100644 --- a/file/style/be.bastelstu.chat.less +++ b/file/style/be.bastelstu.chat.less @@ -425,7 +425,7 @@ #timsChatUserList { > ul { - > li { + > .timsChatUser { &.you { a { &:hover { @@ -435,6 +435,10 @@ } } + &.away { + opacity: 0.5; + } + a { img { margin-right: @wcfGapTiny; @@ -469,6 +473,18 @@ #fish { font-size: 2rem; } + + .dialogContent { + .smileyList { + > li { + > a { + img { + margin: @wcfGapTiny; + } + } + } + } + } } // TODO From ae27b7e059deb1ebe799986d6028d80c05c7293c Mon Sep 17 00:00:00 2001 From: Maximilian Mader Date: Thu, 27 Feb 2014 22:20:50 +0100 Subject: [PATCH 4/5] =?UTF-8?q?Fix=20german=20translation=20=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- language/de.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language/de.xml b/language/de.xml index 7e3cf30..9e45e48 100644 --- a/language/de.xml +++ b/language/de.xml @@ -158,7 +158,7 @@ Probieren Sie, den Chat neu zu laden