archives/snowflake
2
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git synced 2025-10-14 05:11:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix ui.coffee debug mode message log

Browse source
This commit is contained in:
Serene Han 2016-02-06 17:28:23 -08:00
parent 889b3fee98
commit e0081ea954
3 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
proxy/Cakefile
View file

@ -21,10 +21,10 @@ STATIC = 'static'
concatCoffeeFiles = -> exec 'cat ' + FILES.join(' ') + ' | cat > ' + OUTFILE concatCoffeeFiles = -> exec 'cat ' + FILES.join(' ') + ' | cat > ' + OUTFILE
copyStaticFiles = -> exec '' + STATIC + '/* build/' copyStaticFiles = -> exec 'cp ' + STATIC + '/* build/'
compileCoffee = -> compileCoffee = ->
exec 'coffee -o build -b -c build/snowflake.coffee', (err, stdout, stderr) -> exec 'coffee -o build -cb ' + OUTFILE, (err, stdout, stderr) ->
throw err if err throw err if err
task 'test', 'snowflake unit tests', -> task 'test', 'snowflake unit tests', ->

2
proxy/snowflake.coffee
View file

@ -192,7 +192,7 @@ log = (msg) ->
console.log 'Snowflake: ' + msg console.log 'Snowflake: ' + msg
ui.log msg ui.log msg
dbg = (msg) -> log msg if ui.debug dbg = (msg) -> log msg if true == ui.debug
init = -> init = ->
ui = new UI() ui = new UI()

13
proxy/ui.coffee
View file

@ -13,8 +13,8 @@ class UI
constructor: -> constructor: ->
@$badge = document.getElementById('badge') @$badge = document.getElementById('badge')
debug = !@$badge @debug = null == @$badge
return if !debug return if !@debug
# Setup other DOM handlers if it's debug mode. # Setup other DOM handlers if it's debug mode.
@$status = document.getElementById('status') @$status = document.getElementById('status')
@ -26,15 +26,16 @@ class UI
@$input = document.getElementById('input') @$input = document.getElementById('input')
@$input.focus() @$input.focus()
@$input.onkeydown = (e) -> @$send.onclick() if 13 == e.keyCode # enter @$input.onkeydown = (e) =>
@$send.onclick() if 13 == e.keyCode # enter
# Status bar # Status bar
setStatus: (msg) => setStatus: (msg) =>
return if !debug return if !@debug
@$status.innerHTML = 'Status: ' + msg @$status.innerHTML = 'Status: ' + msg
setActive: (connected) => setActive: (connected) =>
if debug if @debug
@$msglog.className = if connected then 'active' else '' @$msglog.className = if connected then 'active' else ''
else else
@$badge.className = if connected then 'active' else '' @$badge.className = if connected then 'active' else ''
@ -55,7 +56,7 @@ class UI
@$input.focus() @$input.focus()
log: (msg) => log: (msg) =>
return if !debug return if !@debug
# Scroll to latest # Scroll to latest
@$msglog.value += msg + '\n' @$msglog.value += msg + '\n'
@$msglog.scrollTop = @$msglog.scrollHeight @$msglog.scrollTop = @$msglog.scrollHeight