From a9637598a68574815d48a48ba107acd8d35f67b3 Mon Sep 17 00:00:00 2001 From: Taylor Hanayik Date: Wed, 29 Mar 2017 13:36:14 -0400 Subject: [PATCH] updates for releasing --- app.js | 2 +- core.js | 8 +++++++- package.json | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app.js b/app.js index dae1f55..0068e8b 100644 --- a/app.js +++ b/app.js @@ -123,7 +123,7 @@ autoUpdater.on('update-not-available', function(){ autoUpdater.on('update-downloaded', function(){ console.log('update downloaded') const updateNotification = notifier.notify('', { - message: "Update available!", + message: "Update downloaded!", buttons: ['Install', 'Cancel'], duration: 20000, icon: path.join(__dirname, 'icon.png') diff --git a/core.js b/core.js index 1b24b77..5f6b993 100644 --- a/core.js +++ b/core.js @@ -247,6 +247,10 @@ function clearScreen() { content.removeChild(content.lastChild) } +function clearAllTimeouts() { + clearTimeout(trialTimeoutID) +} + // show text instructions on screen @@ -496,12 +500,14 @@ function showNextTrial() { clearTimeout(trialTimeoutID) closeNav() clearScreen() - t = t += 1 + t += 1 tReal = t-1 picNum.value = t if (tReal >= maxTrials) { clearScreen() rec.stopRec() + clearAllTimeouts() + openNav() return false } var img = document.createElement("img") diff --git a/package.json b/package.json index 85a1bb8..82f1e4f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "PNT", - "version": "1.2.5", + "version": "1.3.0", "description": "The PNT is a 175-item picture naming test developed in the Language and Aphasia Lab of MRRI for the psycholinguistic exploration of lexical access in nonaphasic and aphasic speakers (Roach et al., 1996).", "main": "app.js", "scripts": {