From 08d3d907f4c87f97d66959d864d451067e7f616f Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Tue, 24 Apr 2012 13:12:46 +0200 Subject: [PATCH] Fixes wording/mapping of noty nameing. --- app/assets/javascripts/app/controllers/login.js.coffee | 2 +- app/assets/javascripts/app/controllers/notify.js.coffee | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/app/controllers/login.js.coffee b/app/assets/javascripts/app/controllers/login.js.coffee index 2e5417427..ab2bceeeb 100644 --- a/app/assets/javascripts/app/controllers/login.js.coffee +++ b/app/assets/javascripts/app/controllers/login.js.coffee @@ -114,7 +114,7 @@ class Index extends App.Controller # add notify Spine.trigger 'notify:removeall' Spine.trigger 'notify', { - type: 'warning', + type: 'error', msg: 'Wrong Username and Password combination.', } diff --git a/app/assets/javascripts/app/controllers/notify.js.coffee b/app/assets/javascripts/app/controllers/notify.js.coffee index ed0d60a86..172b10be0 100644 --- a/app/assets/javascripts/app/controllers/notify.js.coffee +++ b/app/assets/javascripts/app/controllers/notify.js.coffee @@ -20,9 +20,11 @@ class App.Notify extends Spine.Controller # notify = App.view('notify')(data: data) # @append( notify ) - # match noty naming + # map noty naming if data['type'] is 'info' data['type'] = 'information' + if data['type'] is 'warning' + data['type'] = 'alert' $.noty.closeAll() $('#notify').noty(