forked from External/greenlight
		
	dynamically select websocket protocol
This commit is contained in:
		@@ -6,7 +6,11 @@
 | 
				
			|||||||
//= require_tree ./channels
 | 
					//= require_tree ./channels
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(function() {
 | 
					(function() {
 | 
				
			||||||
 | 
					  var protocol = (window.location.protocol === "https:" ? "wss://" : "ws://");
 | 
				
			||||||
 | 
					  var host = window.GreenLight.WEBSOCKET_HOST || window.location.host + window.GreenLight.RELATIVE_ROOT;
 | 
				
			||||||
 | 
					  var url = protocol + host + '/cable';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  this.App || (this.App = {});
 | 
					  this.App || (this.App = {});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  App.cable = ActionCable.createConsumer();
 | 
					  App.cable = ActionCable.createConsumer(url);
 | 
				
			||||||
}).call(this);
 | 
					}).call(this);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -18,6 +18,12 @@ class ApplicationController < ActionController::Base
 | 
				
			|||||||
  end
 | 
					  end
 | 
				
			||||||
  helper_method :user_name_limit
 | 
					  helper_method :user_name_limit
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  # Relative root helper (when deploying to subdirectory).
 | 
				
			||||||
 | 
					  def relative_root
 | 
				
			||||||
 | 
					    Rails.configuration.relative_url_root || ""
 | 
				
			||||||
 | 
					  end
 | 
				
			||||||
 | 
					  helper_method :relative_root
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # Determines if the BigBlueButton endpoint is configured (or set to default).
 | 
					  # Determines if the BigBlueButton endpoint is configured (or set to default).
 | 
				
			||||||
  def bigbluebutton_endpoint_default?
 | 
					  def bigbluebutton_endpoint_default?
 | 
				
			||||||
    return false if loadbalanced_configuration?
 | 
					    return false if loadbalanced_configuration?
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,6 +6,13 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
 | 
					    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    <!-- Global javascript variables and helpers. -->
 | 
				
			||||||
 | 
					    <script type="text/javascript">
 | 
				
			||||||
 | 
					      window.GreenLight = {};
 | 
				
			||||||
 | 
					      window.GreenLight.WEBSOCKET_HOST = "<%= ENV['WEBSOCKET_HOST'] %>"
 | 
				
			||||||
 | 
					      window.GreenLight.RELATIVE_ROOT = "<%= relative_root %>"
 | 
				
			||||||
 | 
					    </script>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
 | 
					    <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
 | 
				
			||||||
    <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
 | 
					    <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
 | 
				
			||||||
  </head>
 | 
					  </head>
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user