Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove build type differences from Main.coffee.

Browse Source
This commit is contained in:
ccd0 2016-04-12 14:28:49 -07:00
parent 4e9d6de07f
commit 4cfedf90d8
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -24,7 +24,7 @@ jshint_deps := .jshintrc node_modules/jshint/package.json
parts := 00 01 02 03 04 05 06 07 08 09 10 11 12 13 parts := 00 01 02 03 04 05 06 07 08 09 10 11 12 13
parts_type := 01 13 parts_type := 01
parts_common := $(filter-out $(parts_type),$(parts)) parts_common := $(filter-out $(parts_type),$(parts))
parts_crx := $(sort $(foreach i,$(parts_common),$(i)-common) $(foreach i,$(parts_type),$(i)-crx)) parts_crx := $(sort $(foreach i,$(parts_common),$(i)-common) $(foreach i,$(parts_type),$(i)-crx))
parts_userscript := $(sort $(foreach i,$(parts_common),$(i)-common) $(foreach i,$(parts_type),$(i)-userscript)) parts_userscript := $(sort $(foreach i,$(parts_common),$(i)-common) $(foreach i,$(parts_type),$(i)-userscript))

2
src/General/$.coffee
View File

@ -356,6 +356,8 @@ $.engine = do ->
return 'webkit' if /WebKit\//.test navigator.userAgent return 'webkit' if /WebKit\//.test navigator.userAgent
return 'gecko' if /Gecko\/|Goanna/.test navigator.userAgent # Goanna = Pale Moon 26+ return 'gecko' if /Gecko\/|Goanna/.test navigator.userAgent # Goanna = Pale Moon 26+
$.buildType = '<%= type %>';
try try
localStorage.getItem 'x' localStorage.getItem 'x'
$.hasStorage = true $.hasStorage = true

4
src/General/Main.coffee
View File

@ -358,7 +358,7 @@ Main =
textContent: "#{data.error.name or 'Error'}: #{data.error.message or 'see console for details'}" textContent: "#{data.error.name or 'Error'}: #{data.error.message or 'see console for details'}"
lines = data.error.stack?.match(/\d+(?=:\d+\)?$)/mg)?.join().replace(/^/, ' at ') or '' lines = data.error.stack?.match(/\d+(?=:\d+\)?$)/mg)?.join().replace(/^/, ' at ') or ''
context = $.el 'div', context = $.el 'div',
textContent: "(<%= meta.name %> <%= meta.fork %> v#{g.VERSION} <%= type %> on #{$.engine}#{lines})" textContent: "(<%= meta.name %> <%= meta.fork %> v#{g.VERSION} #{$.buildType} on #{$.engine}#{lines})"
[message, error, context] [message, error, context]
reportLink: (errors) -> reportLink: (errors) ->
@ -368,7 +368,7 @@ Main =
details = """ details = """
[Please describe the steps needed to reproduce this error.] [Please describe the steps needed to reproduce this error.]
Script: <%= meta.name %> <%= meta.fork %> v#{g.VERSION} <%= type %> Script: <%= meta.name %> <%= meta.fork %> v#{g.VERSION} #{$.buildType}
User agent: #{navigator.userAgent} User agent: #{navigator.userAgent}
URL: #{location.href} URL: #{location.href}