finish changes for #179. Fixes #179, fixes #49.

Please look for regressions.
This commit is contained in:
Stefan Breunig
2013-02-16 10:46:02 +01:00
parent 2023e33567
commit 6d41221131
4 changed files with 19 additions and 14 deletions

View File

@ -29,7 +29,7 @@ window.setupStyles = function() {
[ '#largepreview.enl img { border:2px solid '+COLORS[TEAM_ENL]+'; } ', [ '#largepreview.enl img { border:2px solid '+COLORS[TEAM_ENL]+'; } ',
'#largepreview.res img { border:2px solid '+COLORS[TEAM_RES]+'; } ', '#largepreview.res img { border:2px solid '+COLORS[TEAM_RES]+'; } ',
'#largepreview.none img { border:2px solid '+COLORS[TEAM_NONE]+'; } ', '#largepreview.none img { border:2px solid '+COLORS[TEAM_NONE]+'; } ',
'#chatcontrols { bottom: '+(CHAT_SHRINKED+24)+'px; }', '#chatcontrols { bottom: '+(CHAT_SHRINKED+22)+'px; }',
'#chat { height: '+CHAT_SHRINKED+'px; } ', '#chat { height: '+CHAT_SHRINKED+'px; } ',
'.leaflet-right { margin-right: '+(SIDEBAR_WIDTH+1)+'px } ', '.leaflet-right { margin-right: '+(SIDEBAR_WIDTH+1)+'px } ',
'#updatestatus { width:'+(SIDEBAR_WIDTH+2)+'px; } ', '#updatestatus { width:'+(SIDEBAR_WIDTH+2)+'px; } ',

View File

@ -320,13 +320,14 @@ window.chat.renderData = function(data, element, likelyWereOldMsgs) {
}); });
var scrollBefore = scrollBottom(elm); var scrollBefore = scrollBottom(elm);
elm.html(msgs); elm.html('<table>' + msgs + '</table>');
chat.keepScrollPosition(elm, scrollBefore, likelyWereOldMsgs); chat.keepScrollPosition(elm, scrollBefore, likelyWereOldMsgs);
} }
window.chat.renderDivider = function(text) { window.chat.renderDivider = function(text) {
return '<summary>─ '+text+' ──────────────────────────────────────────────────────────────────────────</summary>'; var d = '──────────────────────────────────────────────────────────────────────────';
return '<tr><td colspan="3" style="padding-top:3px"><summary>─ ' + text + d + '</summary></td></tr>';
} }
@ -337,7 +338,7 @@ window.chat.renderMsg = function(msg, nick, time, team) {
var t = '<time title="'+tb+'" data-timestamp="'+time+'">'+ta+'</time>'; var t = '<time title="'+tb+'" data-timestamp="'+time+'">'+ta+'</time>';
var s = 'style="color:'+COLORS[team]+'"'; var s = 'style="color:'+COLORS[team]+'"';
var title = nick.length >= 8 ? 'title="'+nick+'" class="help"' : ''; var title = nick.length >= 8 ? 'title="'+nick+'" class="help"' : '';
return '<p>'+t+'<span class="invisibleseparator"> &lt;</span><mark '+s+'>'+nick+'</mark><span class="invisibleseparator">&gt; </span><span>'+msg+'</span></p>'; return '<tr><td>'+t+'</td><td><mark '+s+'>'+nick+'</mark></td><td>'+msg+'</td></tr>';
} }
@ -397,7 +398,7 @@ window.chat.chooser = function(event) {
var t = $(event.target); var t = $(event.target);
var tt = t.text(); var tt = t.text();
var span = $('#chatinput span'); var mark = $('#chatinput mark');
$('#chatcontrols .active').removeClass('active'); $('#chatcontrols .active').removeClass('active');
t.addClass('active'); t.addClass('active');
@ -408,19 +409,19 @@ window.chat.chooser = function(event) {
switch(tt) { switch(tt) {
case 'faction': case 'faction':
span.css('color', ''); mark.css('color', '');
span.text('tell faction:'); mark.text('tell faction:');
break; break;
case 'public': case 'public':
span.css('cssText', 'color: red !important'); mark.css('cssText', 'color: red !important');
span.text('broadcast:'); mark.text('broadcast:');
break; break;
case 'compact': case 'compact':
case 'full': case 'full':
span.css('cssText', 'color: #bbb !important'); mark.css('cssText', 'color: #bbb !important');
span.text('tell Jarvis:'); mark.text('tell Jarvis:');
break; break;
default: default:
@ -504,7 +505,7 @@ window.chat.setup = function() {
window.requests.addRefreshFunction(chat.request); window.requests.addRefreshFunction(chat.request);
var cls = PLAYER.team === 'ALIENS' ? 'enl' : 'res'; var cls = PLAYER.team === 'ALIENS' ? 'enl' : 'res';
$('#chatinput span').addClass(cls) $('#chatinput mark').addClass(cls)
} }

View File

@ -12,7 +12,7 @@ window.renderPortalDetails = function(guid) {
var d = window.portals[guid].options.details; var d = window.portals[guid].options.details;
var update = selectPortal(guid); selectPortal(guid);
// collect some random data thats not worth to put in an own method // collect some random data thats not worth to put in an own method
var links = {incoming: 0, outgoing: 0}; var links = {incoming: 0, outgoing: 0};

View File

@ -79,7 +79,11 @@ document.getElementsByTagName('body')[0].innerHTML = ''
+ ' <div id="chatcompact"></div>' + ' <div id="chatcompact"></div>'
+ ' <div id="chatfull"></div>' + ' <div id="chatfull"></div>'
+ '</div>' + '</div>'
+ '<form id="chatinput" style="display:none"><time></time><span>tell faction:</span><input type="text"/></form>' + '<form id="chatinput" style="display:none"><table><tr>'
+ ' <td><time></time></td>'
+ ' <td><mark>tell faction:</mark></td>'
+ ' <td><input type="text"/></td>'
+ '</tr></table></form>'
+ '<a id="sidebartoggle"><span class="toggle close"></span></a>' + '<a id="sidebartoggle"><span class="toggle close"></span></a>'
+ '<div id="scrollwrapper">' // enable scrolling for small screens + '<div id="scrollwrapper">' // enable scrolling for small screens
+ ' <div id="sidebar" style="display: none">' + ' <div id="sidebar" style="display: none">'