masq
/
glowing-bear
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Handshake' of https://github.com/AStove/glowing-bear into Handshake

This commit is contained in:
Jeremy Mahieu 2020-04-22 12:19:37 +02:00
parent 3fe48d9e4e 24bb0dbb44
commit ab06c14d64
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
css/glowingbear.css
View File

@ -963,4 +963,12 @@ code {
.checkbox.indent { .checkbox.indent {
margin-left: 20px; margin-left: 20px;
}
#bufferlines.hideTime td.time {
display:none;
}
#bufferlines.hideTime td.prefix {
display:none;
} }

2
index.html
View File

@ -409,7 +409,7 @@ npm run build-electron-{windows, darwin, linux}</pre>
</li> </li>
</ul> </ul>
</div> </div>
<div id="bufferlines" class="favorite-font" ng-swipe-right="swipeRight()" ng-swipe-left="swipeLeft()" ng-swipe-disable-mouse ng-class="{'withnicklist': showNicklist}" when-scrolled="infiniteScroll()" imgur-drop> <div id="bufferlines" class="favorite-font" ng-swipe-right="swipeRight()" ng-swipe-left="swipeLeft()" ng-swipe-disable-mouse ng-class="{'withnicklist': showNicklist, 'hideTime': activeBuffer().hideBufferLineTimes}" when-scrolled="infiniteScroll()" imgur-drop>
<table> <table>
<tbody> <tbody>
<tr class="bufferline"> <tr class="bufferline">

8
js/models.js
View File

@ -90,7 +90,9 @@ models.service('models', ['$rootScope', '$filter', 'bufferResume', function($roo
// There are two kinds of types: bufferType (free vs formatted) and // There are two kinds of types: bufferType (free vs formatted) and
// the kind of type that distinguishes queries from channels etc // the kind of type that distinguishes queries from channels etc
var bufferType = message.type; var bufferType = message.type;
var type = message.local_variables.type;
// If type is undefined set it as other to avoid later errors
var type = message.local_variables.type || 'other';
var indent = (['channel', 'private'].indexOf(type) >= 0); var indent = (['channel', 'private'].indexOf(type) >= 0);
var plugin = message.local_variables.plugin; var plugin = message.local_variables.plugin;
@ -98,6 +100,9 @@ models.service('models', ['$rootScope', '$filter', 'bufferResume', function($roo
var pinned = message.local_variables.pinned === "true"; var pinned = message.local_variables.pinned === "true";
// hide timestamps for certain buffer types
var hideBufferLineTimes = type && type === 'relay';
// Server buffers have this "irc.server.freenode" naming schema, which // Server buffers have this "irc.server.freenode" naming schema, which
// messes the sorting up. We need it to be "irc.freenode" instead. // messes the sorting up. We need it to be "irc.freenode" instead.
var serverSortKey = plugin + "." + server + var serverSortKey = plugin + "." + server +
@ -365,6 +370,7 @@ models.service('models', ['$rootScope', '$filter', 'bufferResume', function($roo
getHistoryDown: getHistoryDown, getHistoryDown: getHistoryDown,
isNicklistEmpty: isNicklistEmpty, isNicklistEmpty: isNicklistEmpty,
nicklistRequested: nicklistRequested, nicklistRequested: nicklistRequested,
hideBufferLineTimes: hideBufferLineTimes,
pinned: pinned, pinned: pinned,
queryNicklist: queryNicklist, queryNicklist: queryNicklist,
}; };