diff --git a/.eslintrc.js b/.eslintrc similarity index 96% rename from .eslintrc.js rename to .eslintrc index cbe661bc5..cd3fe4987 100644 --- a/.eslintrc.js +++ b/.eslintrc @@ -1,4 +1,4 @@ -module.exports = { +{ "env": { "browser": true, "es6": true @@ -26,4 +26,4 @@ module.exports = { "always" ] } -}; \ No newline at end of file +} \ No newline at end of file diff --git a/.hound.yml b/.hound.yml index 5607bac3a..c74b4a197 100644 --- a/.hound.yml +++ b/.hound.yml @@ -2,5 +2,5 @@ jshint: config_file: .jshintrc eslint: enabled: true - config_file: .eslintrc.js + config_file: .eslintrc ignore_file: .eslintignore \ No newline at end of file diff --git a/runtime/js/.eslintrc.js b/runtime/js/.eslintrc similarity index 99% rename from runtime/js/.eslintrc.js rename to runtime/js/.eslintrc index 882ea7487..b7eaf225a 100644 --- a/runtime/js/.eslintrc.js +++ b/runtime/js/.eslintrc @@ -1,4 +1,4 @@ -module.exports = { +{ "env": { "browser": true, "es6": true @@ -277,4 +277,4 @@ module.exports = { "never" ] } -}; \ No newline at end of file +} \ No newline at end of file diff --git a/runtime/js/src/calls.js b/runtime/js/src/calls.js index 770bd4592..b330037b9 100644 --- a/runtime/js/src/calls.js +++ b/runtime/js/src/calls.js @@ -99,16 +99,17 @@ export function Callback(incomingMessage) { try { message = JSON.parse(incomingMessage); } catch (e) { - Debug('Invalid JSON passed to callback: ' + e.message); - Debug('Message: ' + incomingMessage); - return; + const error = `Invalid JSON passed to callback: ${e.message}. Message: ${incomingMessage}`; + Debug(error); + throw new Error(error); } var callbackID = message.callbackid; var callbackData = callbacks[callbackID]; if (!callbackData) { // eslint-disable-next-line - console.error(`Callback '${callbackID}' not registed!!!`); - return; + const error = `Callback '${callbackID}' not registed!!!`; + console.error(error); + throw new Error(error); } clearTimeout(callbackData.timeoutHandle); diff --git a/runtime/js/src/ipc.js b/runtime/js/src/ipc.js index e8a01718a..c35023cb5 100644 --- a/runtime/js/src/ipc.js +++ b/runtime/js/src/ipc.js @@ -13,6 +13,7 @@ function Invoke(message) { if (window && window.external && window.external.invoke) { window.external.invoke(message); } else { + //eslint-disable-line console.log(`[No external.invoke] ${message}`); } } diff --git a/runtime/js/src/main.js b/runtime/js/src/main.js index fd736221e..10efe11fb 100644 --- a/runtime/js/src/main.js +++ b/runtime/js/src/main.js @@ -20,24 +20,24 @@ window.backend = {}; // Setup internal calls var internal = { - NewBinding, - Callback, - Notify, - AddScript, - InjectCSS -} + NewBinding, + Callback, + Notify, + AddScript, + InjectCSS +}; // Setup runtime structure var runtime = { - Log, - Events: { - On, - Emit, - Heartbeat, - Acknowledge, - }, - _: internal, -} + Log, + Events: { + On, + Emit, + Heartbeat, + Acknowledge, + }, + _: internal, +}; // Augment global Object.assign(window.wails, runtime);