Merge dfb32e0 into 21ef582

rbCAS · Sep 10, 2014 · 3c087d7 · 3c087d7
2 parents 21ef582 + dfb32e0
commit 3c087d7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/app/assets/javascripts/casino/application.js b/app/assets/javascripts/casino/application.js
@@ -1 +1,10 @@
 // Place all the behaviors and hooks related to the matching controller here.
+(function(win) {
+  if(!win.CASino) {
+    win.CASino = { baseUrl: '/' };
+  }
+
+  win.CASino.url = function(path) {
+    return win.CASino.baseUrl + path;
+  }
+})(this);
diff --git a/app/assets/javascripts/casino/sessions.js b/app/assets/javascripts/casino/sessions.js
@@ -1,5 +1,5 @@
 (function(win, doc) {
-  var url = '/login',
+  var url = win.CASino.url('login'),
       cookie_regex = /(^|;)\s*tgt=/,
       ready_bound = false;
 
@@ -8,7 +8,6 @@
         service = serviceEl ? serviceEl.getAttribute('value') : null;
 
     if(cookie_regex.test(doc.cookie)) {
-      url = '/login';
       if(service) {
         url += '?service=' + encodeURIComponent(service);
       }

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -4,6 +4,7 @@
   <title><%= CASino.config.frontend[:sso_name] %></title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
   <%= stylesheet_link_tag    "application", :media => "all" %>
+  <%= javascript_tag         "window.CASino = { baseUrl: '#{root_path}' };" %>
   <%= javascript_include_tag "application" %>
   <%= csrf_meta_tags %>
   <%= favicon_link_tag 'favicon.png', type: 'image/png' %>

diff --git a/config/routes.rb b/config/routes.rb
@@ -26,7 +26,7 @@
     end
   end
 
-  root to: redirect('/login')
+  root to: redirect('login')
 
   # The priority is based upon order of creation:
   # first created -> highest priority.