summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorDavisLWebb <davislwebb@ymail.com>2014-04-27 23:45:07 -0400
committerDavisLWebb <davislwebb@ymail.com>2014-04-27 23:45:07 -0400
commit7a3fe845d568f6eab1e7a55239daed3685797c2e (patch)
tree18f84996ddf5c02af9d7fc1c829d85d6c62a2f18 /app/assets
parentd38f6fa6262803f3c6380a43f32de4889fcacaec (diff)
parent1c37ae521e29a5e0869aba52d324ed0cd4a830a6 (diff)
Merge branch 'master' of https://github.com/LukeShu/Leaguer
Conflicts: app/views/tournaments/_form.html.erb
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/application/layout.js.coffee21
-rw-r--r--app/assets/stylesheets/custom.css.scss4
2 files changed, 25 insertions, 0 deletions
diff --git a/app/assets/javascripts/application/layout.js.coffee b/app/assets/javascripts/application/layout.js.coffee
new file mode 100644
index 0000000..da0bc67
--- /dev/null
+++ b/app/assets/javascripts/application/layout.js.coffee
@@ -0,0 +1,21 @@
+json_url = "/alerts.json"
+
+page_visited = false
+starting_size = 0
+update = (alerts) ->
+ if !page_visited
+ starting_size = alerts.length
+ page_visited = true
+
+ if alerts.length > starting_size
+ $("#alerts-ajax").css("display", "inline");
+ return
+
+ setTimeout (->
+ $.ajax(url: json_url).done update
+ return
+ ), 2000
+
+# Now kick off the whole process
+window.onload = ->
+ $.ajax(url: json_url).done update \ No newline at end of file
diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss
index 9e9e63a..b274a0d 100644
--- a/app/assets/stylesheets/custom.css.scss
+++ b/app/assets/stylesheets/custom.css.scss
@@ -24,6 +24,10 @@ header > nav {
}
}
+#alerts-ajax {
+ display: none;
+}
+
.btn-custom-orange {
color: white;
background-color: rgb(255, 69, 0);