cynic
/
glowing-bear
mirror of https://github.com/kurisufriend/glowing-bear
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #70 from torhve/master

Browse Source 
Chat time style
with-route-provider
David Cormier 12 years ago
parent c1612f4c46 7449a5dcd3
commit df83aa91f3
5 changed files with 1953 additions and 1940 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 3
      css/glowingbear.css
  2. 3859
      css/style.css
  3. 6
      index.html
  4. 4
      js/models.js
  5. 21
      js/weechat.js

3
css/glowingbear.css
Unescape View File

@ -57,6 +57,9 @@ td.time {
vertical-align: top; vertical-align: top;
} }
.repeated-time {
display: none;
}
td.prefix { td.prefix {
text-align: right; text-align: right;
vertical-align: top; vertical-align: top;

3859
css/style.css
View File

File diff suppressed because it is too large Load Diff

6
index.html
Unescape View File

@ -9,6 +9,7 @@
<link rel="shortcut icon" type="image/png" href="img/favicon.png" > <link rel="shortcut icon" type="image/png" href="img/favicon.png" >
<link href="css/style.css" rel="stylesheet" media="screen"> <link href="css/style.css" rel="stylesheet" media="screen">
<link href="css/glowingbear.css" rel="stylesheet" media="screen"> <link href="css/glowingbear.css" rel="stylesheet" media="screen">
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.0-rc.2/angular.min.js"></script> <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.0-rc.2/angular.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.0-rc.2/angular-sanitize.min.js"></script> <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.0-rc.2/angular-sanitize.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/underscore.js/1.5.2/underscore-min.js"></script> <script src="//cdnjs.cloudflare.com/ajax/libs/underscore.js/1.5.2/underscore-min.js"></script>
@ -18,7 +19,6 @@
<script type="text/javascript" src="js/models.js"></script> <script type="text/javascript" src="js/models.js"></script>
<script type="text/javascript" src="js/plugins.js"></script> <script type="text/javascript" src="js/plugins.js"></script>
<script type="text/javascript" src="js/favico-0.3.0.min.js"></script> <script type="text/javascript" src="js/favico-0.3.0.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script> <script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
</head> </head>
<body ng-controller="WeechatCtrl" ng-keydown="handleKeyPress($event)"> <body ng-controller="WeechatCtrl" ng-keydown="handleKeyPress($event)">
@ -216,9 +216,9 @@ $ openssl req -nodes -newkey rsa:2048 -keyout relay.pem -x509 -days 365 -out rel
<div id="bufferlines"> <div id="bufferlines">
<table> <table>
<tbody> <tbody>
<tr class="bufferline" ng-repeat-start="bufferline in activeBuffer().lines"> <tr class="bufferline" ng-repeat-start="bufferline in (bufferlines = activeBuffer().lines)">
<td ng-hide="notimestamp" class="time"> <td ng-hide="notimestamp" class="time">
<span class="date text-muted"> <span class="date" ng-class="{'repeated-time': bufferline.shortTime==bufferlines[$index-1].shortTime}">
<span class="cof-chat_time cob-chat_time coa-chat_time">{{ bufferline.date | date:'HH' }}</span><span class="cof-chat_time_delimiters cob-chat_time_delimiters coa-chat_time_delimiters">:</span><span class="cof-chat_time cob-chat_time coa-chat_time">{{ bufferline.date | date:'mm' }}</span> <span class="cof-chat_time cob-chat_time coa-chat_time">{{ bufferline.date | date:'HH' }}</span><span class="cof-chat_time_delimiters cob-chat_time_delimiters coa-chat_time_delimiters">:</span><span class="cof-chat_time cob-chat_time coa-chat_time">{{ bufferline.date | date:'mm' }}</span>
</span> </span>
</td> </td>

4
js/models.js
Unescape View File

@ -4,7 +4,7 @@
*/ */
var models = angular.module('weechatModels', []); var models = angular.module('weechatModels', []);
models.service('models', ['$rootScope', function($rootScope) { models.service('models', ['$rootScope', '$filter', function($rootScope, $filter) {
/* /*
* Buffer class * Buffer class
*/ */
@ -61,6 +61,7 @@ models.service('models', ['$rootScope', function($rootScope) {
this.BufferLine = function(message) { this.BufferLine = function(message) {
var buffer = message['buffer']; var buffer = message['buffer'];
var date = message['date']; var date = message['date'];
var shortTime = $filter('date')(date, 'HH:mm');
function addClasses(textElements) { function addClasses(textElements) {
var typeToClassPrefixFg = { var typeToClassPrefixFg = {
@ -118,6 +119,7 @@ models.service('models', ['$rootScope', function($rootScope) {
prefix: prefix, prefix: prefix,
content: content, content: content,
date: date, date: date,
shortTime: shortTime,
buffer: buffer, buffer: buffer,
tags: tags_array, tags: tags_array,
highlight: highlight, highlight: highlight,

21
js/weechat.js
Unescape View File

@ -194,10 +194,17 @@
*/ */
WeeChatProtocol._attrNameFromChar = function(ch) { WeeChatProtocol._attrNameFromChar = function(ch) {
var chars = { var chars = {
'*': 'bold', // WeeChat protocol
'!': 'reverse', '*': 'b',
'/': 'italic', '!': 'r',
'_': 'underline' '/': 'i',
'_': 'u',
// some extension often used (IRC?)
'\x01': 'b',
'\x02': 'r',
'\x03': 'i',
'\x04': 'u'
}; };
if (ch in chars) { if (ch in chars) {
@ -323,7 +330,7 @@
// foreground color with F // foreground color with F
// "F" + (A)STD // "F" + (A)STD
// "F" + (A)EXT // "F" + (A)EXT
regex: /^F(?:([*!\/_|]*)(\d{2})|@([*!\/_|]*)(\d{5}))/, regex: /^F(?:([*!\/_|]*)(\d{2})|@([\x01\x02\x03\x04*!\/_|]*)(\d{5}))/,
fn: function(m) { fn: function(m) {
var ret = { var ret = {
bgColor: null bgColor: null
@ -359,7 +366,7 @@
// "*" + (A)STD + "," + EXT // "*" + (A)STD + "," + EXT
// "*" + (A)EXT + "," + STD // "*" + (A)EXT + "," + STD
// "*" + (A)EXT + "," + EXT // "*" + (A)EXT + "," + EXT
regex: /^\*(?:([*!\/_|]*)(\d{2})|@([*!\/_|]*)(\d{5})),(\d{2}|@\d{5})/, regex: /^\*(?:([\x01\x02\x03\x04*!\/_|]*)(\d{2})|@([\x01\x02\x03\x04*!\/_|]*)(\d{5})),(\d{2}|@\d{5})/,
fn: function(m) { fn: function(m) {
var ret = {}; var ret = {};
@ -379,7 +386,7 @@
// foreground color with * (+ attributes) (fall back, must be checked before previous case) // foreground color with * (+ attributes) (fall back, must be checked before previous case)
// "*" + (A)STD // "*" + (A)STD
// "*" + (A)EXT // "*" + (A)EXT
regex: /^\*([*!\/_|]*)(\d{2}|@\d{5})/, regex: /^\*([\x01\x02\x03\x04*!\/_|]*)(\d{2}|@\d{5})/,
fn: function(m) { fn: function(m) {
return { return {
fgColor: WeeChatProtocol._getColorObj(m[2]), fgColor: WeeChatProtocol._getColorObj(m[2]),

Write Preview
Loading…
Cancel
Save