From 2af8550f7e59818749517d57646057a865f55202 Mon Sep 17 00:00:00 2001 From: Lukas Olson Date: Wed, 11 May 2016 08:20:07 -0700 Subject: [PATCH 1/2] [notifier] Expose add() method to allow more customizable pop-ups --- src/ui/public/notify/notifier.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ui/public/notify/notifier.js b/src/ui/public/notify/notifier.js index a498f4ebbff0..081be670b926 100644 --- a/src/ui/public/notify/notifier.js +++ b/src/ui/public/notify/notifier.js @@ -81,7 +81,7 @@ function restartNotifTimer(notif, cb) { startNotifTimer(notif, cb); } -function add(notif, cb) { +Notifier.prototype.add = function (notif, cb) { _.set(notif, 'info.version', version); _.set(notif, 'info.buildNum', buildNum); @@ -117,7 +117,7 @@ function add(notif, cb) { notif.stacks = [notif.stack]; notifs.push(notif); return notif; -} +}; function formatInfo() { let info = []; @@ -271,7 +271,7 @@ Notifier.prototype._showFatal = function (err) { * @param {Error|String} err */ Notifier.prototype.error = function (err, cb) { - return add({ + return this.add({ type: 'danger', content: formatMsg(err, this.from), icon: 'warning', @@ -288,7 +288,7 @@ Notifier.prototype.error = function (err, cb) { * @return {[type]} [description] */ Notifier.prototype.warning = function (msg, cb) { - return add({ + return this.add({ type: 'warning', content: formatMsg(msg, this.from), icon: 'warning', @@ -304,7 +304,7 @@ Notifier.prototype.warning = function (msg, cb) { * @return {[type]} [description] */ Notifier.prototype.info = function (msg, cb) { - return add({ + return this.add({ type: 'info', content: formatMsg(msg, this.from), icon: 'info-circle', From f5599e965f2d7998cfb3f5a5d7d656d9035e66b3 Mon Sep 17 00:00:00 2001 From: Lukas Olson Date: Wed, 11 May 2016 08:35:21 -0700 Subject: [PATCH 2/2] [notifier] Keep add() method available outside of prototype --- src/ui/public/notify/notifier.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/ui/public/notify/notifier.js b/src/ui/public/notify/notifier.js index 081be670b926..7173ebab414b 100644 --- a/src/ui/public/notify/notifier.js +++ b/src/ui/public/notify/notifier.js @@ -81,7 +81,7 @@ function restartNotifTimer(notif, cb) { startNotifTimer(notif, cb); } -Notifier.prototype.add = function (notif, cb) { +function add(notif, cb) { _.set(notif, 'info.version', version); _.set(notif, 'info.buildNum', buildNum); @@ -117,7 +117,9 @@ Notifier.prototype.add = function (notif, cb) { notif.stacks = [notif.stack]; notifs.push(notif); return notif; -}; +} + +Notifier.prototype.add = add; function formatInfo() { let info = []; @@ -271,7 +273,7 @@ Notifier.prototype._showFatal = function (err) { * @param {Error|String} err */ Notifier.prototype.error = function (err, cb) { - return this.add({ + return add({ type: 'danger', content: formatMsg(err, this.from), icon: 'warning', @@ -288,7 +290,7 @@ Notifier.prototype.error = function (err, cb) { * @return {[type]} [description] */ Notifier.prototype.warning = function (msg, cb) { - return this.add({ + return add({ type: 'warning', content: formatMsg(msg, this.from), icon: 'warning', @@ -304,7 +306,7 @@ Notifier.prototype.warning = function (msg, cb) { * @return {[type]} [description] */ Notifier.prototype.info = function (msg, cb) { - return this.add({ + return add({ type: 'info', content: formatMsg(msg, this.from), icon: 'info-circle',