From e024609008dfd853245e95e4901cee3a23e01d16 Mon Sep 17 00:00:00 2001 From: bretto36 Date: Thu, 16 Jun 2016 20:28:12 -0400 Subject: [PATCH] Updated js --- package.json | 2 +- public/assets/javascript/app-public.js | 3 ++- public/assets/javascript/app.js | 3 ++- public/assets/javascript/backend.js | 4 +++- public/assets/javascript/frontend.js | 4 +++- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 9610b6b1..c63509c6 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ }, "devDependencies": { "grunt": "^0.4.5", - "grunt-contrib-concat": "^0.5.0", + "grunt-contrib-concat": "^0.5.1", "grunt-contrib-less": "^0.12.0", "grunt-contrib-uglify": "^0.6.0", "grunt-contrib-watch": "^0.6.1", diff --git a/public/assets/javascript/app-public.js b/public/assets/javascript/app-public.js index 4e84a41e..75afd4c0 100644 --- a/public/assets/javascript/app-public.js +++ b/public/assets/javascript/app-public.js @@ -219,7 +219,8 @@ function showFormError($formElement, message) { */ function showMessage(message) { humane.log(message, { - timeout: 2500 + timeoutAfterMove: 3000, + waitForMove: true }); } diff --git a/public/assets/javascript/app.js b/public/assets/javascript/app.js index bf7c19b9..bfd1473f 100644 --- a/public/assets/javascript/app.js +++ b/public/assets/javascript/app.js @@ -518,7 +518,8 @@ function replaceUrlParam(url, paramName, paramValue) { */ function showMessage(message) { humane.log(message, { - timeout: 3500 + timeoutAfterMove: 3000, + waitForMove: true }); } diff --git a/public/assets/javascript/backend.js b/public/assets/javascript/backend.js index 20666cc3..33559a5e 100644 --- a/public/assets/javascript/backend.js +++ b/public/assets/javascript/backend.js @@ -9498,7 +9498,9 @@ function replaceUrlParam(url, paramName, paramValue) { */ function showMessage(message) { humane.log(message, { - timeout: 3500 + //timeout: 60000, + timeoutAfterMove: 2500, + waitForMove: true }); } diff --git a/public/assets/javascript/frontend.js b/public/assets/javascript/frontend.js index 442f3233..1c2a3bd8 100644 --- a/public/assets/javascript/frontend.js +++ b/public/assets/javascript/frontend.js @@ -4122,7 +4122,9 @@ function showFormError($formElement, message) { */ function showMessage(message) { humane.log(message, { - timeout: 2500 + timeout: 60000, + timeoutAfterMove: 2500, + waitForMove: true }); }