From 4cfedf90d8dac90b0af1c7d9940b1a6a4bf1bbd3 Mon Sep 17 00:00:00 2001 From: ccd0 Date: Tue, 12 Apr 2016 14:28:49 -0700 Subject: [PATCH] Remove build type differences from Main.coffee. --- Makefile | 2 +- src/General/$.coffee | 2 ++ src/General/Main.coffee | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 2aa99035b..72d8c7239 100644 --- a/Makefile +++ b/Makefile @@ -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_type := 01 13 +parts_type := 01 parts_common := $(filter-out $(parts_type),$(parts)) 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)) diff --git a/src/General/$.coffee b/src/General/$.coffee index 7d462ce42..29b9d1616 100644 --- a/src/General/$.coffee +++ b/src/General/$.coffee @@ -356,6 +356,8 @@ $.engine = do -> return 'webkit' if /WebKit\//.test navigator.userAgent return 'gecko' if /Gecko\/|Goanna/.test navigator.userAgent # Goanna = Pale Moon 26+ +$.buildType = '<%= type %>'; + try localStorage.getItem 'x' $.hasStorage = true diff --git a/src/General/Main.coffee b/src/General/Main.coffee index 44aef4c32..0feaca120 100644 --- a/src/General/Main.coffee +++ b/src/General/Main.coffee @@ -358,7 +358,7 @@ Main = 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 '' 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] reportLink: (errors) -> @@ -368,7 +368,7 @@ Main = details = """ [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} URL: #{location.href}