UltrasonicNXT has uploaded a new change for review.
https://gerrit.wikimedia.org/r/110969
Change subject: Lots of kick fixes
......................................................................
Lots of kick fixes
Move links outside useritem-header
Fix click handler
Fix kick input disabling
Change-Id: Ie72288efc22977aae9e9c8195406e40747d1fa9a
---
M GetNew.api.php
M MediaWikiChat.css
M MediaWikiChat.js
M MediaWikiChat.php
4 files changed, 11 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiChat
refs/changes/69/110969/1
diff --git a/GetNew.api.php b/GetNew.api.php
index 58b1b6e..31d0412 100644
--- a/GetNew.api.php
+++ b/GetNew.api.php
@@ -100,7 +100,7 @@
$users[$toid] = true; // ensure pm
receiver is in users list
} elseif ( $row->chat_type ==
MediaWikiChat::TYPE_KICK ) {
- if ( $row->chat_to_name ==
$wgUser->getName() ) {
+ if ( $row->chat_to_id ==
$wgUser->getId() ) {
$result->addValue( $mName,
'kick', true );
}
$timestamp = $row->chat_timestamp;
diff --git a/MediaWikiChat.css b/MediaWikiChat.css
index 261d365..0c90e56 100644
--- a/MediaWikiChat.css
+++ b/MediaWikiChat.css
@@ -76,6 +76,7 @@
background-color: #FFF;
transition: background-color 0.5s;
-webkit-transition: background-color 0.5s;
+ position: relative;
}
.mwchat-useritem[data-read="true"] {
background-color: #FDD;
@@ -94,8 +95,10 @@
.mwchat-item-message * {
display: inline;
}
-.mwchat-useritem-header-right {
- float: right;
+.mwchat-useritem-header-links {
+ top: 5px;
+ right: 5px;
+ position: absolute;
}
.mwchat-useritem-blocklink, .mwchat-useritem-kicklink {
color: #000 !important;
diff --git a/MediaWikiChat.js b/MediaWikiChat.js
index cffadbb..3da009f 100644
--- a/MediaWikiChat.js
+++ b/MediaWikiChat.js
@@ -345,8 +345,7 @@
var add = true;
var html = '<div class="mwchat-useritem noshow" data-unread=""
data-name="' + user.name + '" data-id="' + userId + '" id="' + userE + '">';
- html += '<div class="mwchat-useritem-header">';
- html += '<span class="mwchat-useritem-header-left" title="' +
mw.message( 'chat-private-message' ).text() + '">';
+ html += '<div class="mwchat-useritem-header" title="' +
mw.message( 'chat-private-message' ).text() + '">';
if ( mw.config.get( 'wgChatSocialAvatars' ) ) {
html += '<img src="' + user.avatar + '" />';
@@ -358,7 +357,7 @@
html += '<img src="' + mw.message(
'chat-mod-image').escaped() + '" height="16px" alt="" title="';
html += mw.message( 'chat-user-is-moderator' ).text() +
'" />';
}
- html += '</span><span class="mwchat-useritem-header-right">';
+ html += '</div><span class="mwchat-useritem-header-links">';
if ( MediaWikiChat.amIMod && ( !user.mod ) ) {
html += '<a class="mwchat-useritem-blocklink" href="' +
mw.config.get( 'wgArticlePath' ).replace( '$1', 'Special:UserRights/' +
user.name );
@@ -370,7 +369,7 @@
}
}
- html += '</span></div>';
+ html += '</span>';
html += '<div class="mwchat-useritem-window"
style="display:none;">';
html += '<div class="mwchat-useritem-content"></div>';
html += '<input type="text" placeholder="' + mw.message(
'chat-type-your-private-message' ).text() + '" />';
@@ -401,7 +400,7 @@
$( '#mwchat-users #' + userE + ' input' ).keypress(
MediaWikiChat.userKeypress );
$( '.mwchat-useritem-kicklink' ).click( function() {
- var parent = $( this ).parent();
+ var parent = $( this ).parent().parent();
$.ajax({
type: 'POST',
diff --git a/MediaWikiChat.php b/MediaWikiChat.php
index 9fa591d..04c4cdb 100644
--- a/MediaWikiChat.php
+++ b/MediaWikiChat.php
@@ -17,7 +17,7 @@
$wgExtensionCredits['specialpage'][] = array(
'path' => __FILE__,
'name' => 'MediaWikiChat',
- 'version' => '2.5.1',
+ 'version' => '2.5.2',
'author' => 'Adam Carter/UltrasonicNXT',
'url' => 'https://www.mediawiki.org/wiki/Extension:MediaWikiChat',
'descriptionmsg' => 'chat-desc',
--
To view, visit https://gerrit.wikimedia.org/r/110969
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie72288efc22977aae9e9c8195406e40747d1fa9a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiChat
Gerrit-Branch: master
Gerrit-Owner: UltrasonicNXT <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
