aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable/app/assets/javascripts/action_cable
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2016-02-01 04:31:03 +1030
committerMatthew Draper <matthew@trebex.net>2016-02-01 05:03:03 +1030
commitd6f2000a67cc63aa67414c75ce77de671824ec52 (patch)
tree86ddb70130bc3d40fb0a9aeb125108f47b8e07b1 /actioncable/app/assets/javascripts/action_cable
parentca9603fc35d123d1c8490096dc0447a91f3e3c18 (diff)
downloadrails-d6f2000a67cc63aa67414c75ce77de671824ec52.tar.gz
rails-d6f2000a67cc63aa67414c75ce77de671824ec52.tar.bz2
rails-d6f2000a67cc63aa67414c75ce77de671824ec52.zip
Wrangle the asset build into something that sounds more general
Diffstat (limited to 'actioncable/app/assets/javascripts/action_cable')
-rw-r--r--actioncable/app/assets/javascripts/action_cable/connection.coffee (renamed from actioncable/app/assets/javascripts/action_cable/source/connection.coffee)0
-rw-r--r--actioncable/app/assets/javascripts/action_cable/connection_monitor.coffee (renamed from actioncable/app/assets/javascripts/action_cable/source/connection_monitor.coffee)0
-rw-r--r--actioncable/app/assets/javascripts/action_cable/consumer.coffee (renamed from actioncable/app/assets/javascripts/action_cable/source/consumer.coffee)0
-rw-r--r--actioncable/app/assets/javascripts/action_cable/index.js1
-rw-r--r--actioncable/app/assets/javascripts/action_cable/source/index.coffee.erb23
-rw-r--r--actioncable/app/assets/javascripts/action_cable/subscription.coffee (renamed from actioncable/app/assets/javascripts/action_cable/source/subscription.coffee)0
-rw-r--r--actioncable/app/assets/javascripts/action_cable/subscriptions.coffee (renamed from actioncable/app/assets/javascripts/action_cable/source/subscriptions.coffee)0
7 files changed, 0 insertions, 24 deletions
diff --git a/actioncable/app/assets/javascripts/action_cable/source/connection.coffee b/actioncable/app/assets/javascripts/action_cable/connection.coffee
index fbd7dbd35b..fbd7dbd35b 100644
--- a/actioncable/app/assets/javascripts/action_cable/source/connection.coffee
+++ b/actioncable/app/assets/javascripts/action_cable/connection.coffee
diff --git a/actioncable/app/assets/javascripts/action_cable/source/connection_monitor.coffee b/actioncable/app/assets/javascripts/action_cable/connection_monitor.coffee
index 99b9a1c6d5..99b9a1c6d5 100644
--- a/actioncable/app/assets/javascripts/action_cable/source/connection_monitor.coffee
+++ b/actioncable/app/assets/javascripts/action_cable/connection_monitor.coffee
diff --git a/actioncable/app/assets/javascripts/action_cable/source/consumer.coffee b/actioncable/app/assets/javascripts/action_cable/consumer.coffee
index 717c0641a9..717c0641a9 100644
--- a/actioncable/app/assets/javascripts/action_cable/source/consumer.coffee
+++ b/actioncable/app/assets/javascripts/action_cable/consumer.coffee
diff --git a/actioncable/app/assets/javascripts/action_cable/index.js b/actioncable/app/assets/javascripts/action_cable/index.js
deleted file mode 100644
index e97870c3b0..0000000000
--- a/actioncable/app/assets/javascripts/action_cable/index.js
+++ /dev/null
@@ -1 +0,0 @@
-//= require_tree ./source
diff --git a/actioncable/app/assets/javascripts/action_cable/source/index.coffee.erb b/actioncable/app/assets/javascripts/action_cable/source/index.coffee.erb
deleted file mode 100644
index f4615b7502..0000000000
--- a/actioncable/app/assets/javascripts/action_cable/source/index.coffee.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-#= require_self
-#= require ./consumer
-
-@ActionCable =
- INTERNAL: <%= ActionCable::INTERNAL.to_json %>
-
- createConsumer: (url = @getConfig("url")) ->
- new ActionCable.Consumer @createWebSocketURL(url)
-
- getConfig: (name) ->
- element = document.head.querySelector("meta[name='action-cable-#{name}']")
- element?.getAttribute("content")
-
- createWebSocketURL: (url) ->
- if url and not /^wss?:/i.test(url)
- a = document.createElement("a")
- a.href = url
- # Fix populating Location properties in IE. Otherwise, protocol will be blank.
- a.href = a.href
- a.protocol = a.protocol.replace("http", "ws")
- a.href
- else
- url
diff --git a/actioncable/app/assets/javascripts/action_cable/source/subscription.coffee b/actioncable/app/assets/javascripts/action_cable/subscription.coffee
index 339d676933..339d676933 100644
--- a/actioncable/app/assets/javascripts/action_cable/source/subscription.coffee
+++ b/actioncable/app/assets/javascripts/action_cable/subscription.coffee
diff --git a/actioncable/app/assets/javascripts/action_cable/source/subscriptions.coffee b/actioncable/app/assets/javascripts/action_cable/subscriptions.coffee
index ae041ffa2b..ae041ffa2b 100644
--- a/actioncable/app/assets/javascripts/action_cable/source/subscriptions.coffee
+++ b/actioncable/app/assets/javascripts/action_cable/subscriptions.coffee