From b3fada8fac5bfe5369ccc01cd1d28cff7dd91e33 Mon Sep 17 00:00:00 2001 From: FelisCatus Date: Fri, 19 Dec 2014 21:27:17 +0800 Subject: [PATCH] Attach last error message when using the Report Issue link. --- omega-target-chromium-extension/background.coffee | 1 + .../omega_target_web_basics.coffee | 2 ++ .../overlay/js/background_preload.js | 1 + omega-web/src/coffee/popup_basics.coffee | 8 +++++++- 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/omega-target-chromium-extension/background.coffee b/omega-target-chromium-extension/background.coffee index df602ca..cfa489a 100644 --- a/omega-target-chromium-extension/background.coffee +++ b/omega-target-chromium-extension/background.coffee @@ -10,6 +10,7 @@ Log.log = (args...) -> Log.error = (args...) -> console.error(args...) content = args.map(Log.str.bind(Log)).join(' ') + localStorage['logLastError'] = content localStorage['log'] += 'ERROR: ' + content + '\n' unhandledPromises = [] diff --git a/omega-target-chromium-extension/omega_target_web_basics.coffee b/omega-target-chromium-extension/omega_target_web_basics.coffee index 8df338c..cb4b397 100644 --- a/omega-target-chromium-extension/omega_target_web_basics.coffee +++ b/omega-target-chromium-extension/omega_target_web_basics.coffee @@ -1,6 +1,8 @@ window.OmegaTargetWebBasics = getLog: (callback) -> callback(localStorage['log'] || '') + getError: (callback) -> + callback(localStorage['logLastError'] || '') getEnv: (callback) -> extensionVersion = chrome.runtime.getManifest().version callback({ diff --git a/omega-target-chromium-extension/overlay/js/background_preload.js b/omega-target-chromium-extension/overlay/js/background_preload.js index aed9f90..d9b27c2 100644 --- a/omega-target-chromium-extension/overlay/js/background_preload.js +++ b/omega-target-chromium-extension/overlay/js/background_preload.js @@ -1,2 +1,3 @@ window.UglifyJS_NoUnsafeEval = true localStorage['log'] = '' +localStorage['logLastError'] = '' diff --git a/omega-web/src/coffee/popup_basics.coffee b/omega-web/src/coffee/popup_basics.coffee index 911dbce..c610c2e 100644 --- a/omega-web/src/coffee/popup_basics.coffee +++ b/omega-web/src/coffee/popup_basics.coffee @@ -15,4 +15,10 @@ window.OmegaTargetWebBasics.getEnv (env) -> SwitchyOmega #{env.projectVersion} #{env.userAgent} """ - document.querySelector('.report-issue').href = url + encodeURIComponent(body) + link = document.querySelector('.report-issue') + link.href = url + encodeURIComponent(body) + window.OmegaTargetWebBasics.getError (err) -> + return unless err + body += "\n```\n#{err}\n```" + final_url = url + encodeURIComponent(body) + link.href = final_url.substr(0, 2000) # Limit URL up to 2000 chars.