From 0c940ee666d9e9d6283ffa7f376c93b7e7c55ebc Mon Sep 17 00:00:00 2001 From: uu59 Date: Thu, 20 Nov 2014 17:12:08 +0900 Subject: [PATCH] Rename alert -> notification --- app/assets/javascripts/{alert.js => notification.js} | 4 ++-- app/assets/stylesheets/common.css.scss | 2 +- app/views/shared/vue/_notification.html.erb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename app/assets/javascripts/{alert.js => notification.js} (93%) diff --git a/app/assets/javascripts/alert.js b/app/assets/javascripts/notification.js similarity index 93% rename from app/assets/javascripts/alert.js rename to app/assets/javascripts/notification.js index c03045a..7d946bd 100644 --- a/app/assets/javascripts/alert.js +++ b/app/assets/javascripts/notification.js @@ -4,10 +4,10 @@ var POLLING_URL = "/polling/alerts"; $(function(){ - if($('#alert').length === 0) return; + if($('#vue-notification').length === 0) return; var alert = new Vue({ - el: "#alert", + el: "#vue-notification", data: { "alerts": [] }, diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index ee5b9c0..b60b47f 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -40,7 +40,7 @@ label { -#alert { +#vue-notification { .nothing { padding: 1em 0; } diff --git a/app/views/shared/vue/_notification.html.erb b/app/views/shared/vue/_notification.html.erb index 9922c67..dfe5081 100644 --- a/app/views/shared/vue/_notification.html.erb +++ b/app/views/shared/vue/_notification.html.erb @@ -1,5 +1,5 @@ -