rdcms_tour 0.0.2 → 0.0.3

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: de2a8633d83106c1f162c11b2711e82979ff4f29
4
- data.tar.gz: bb77e6c8bcea96ad9d2ea828ff45b64498a6649e
3
+ metadata.gz: d674175ba63e1a3340dee2ee46639fc986f5562d
4
+ data.tar.gz: 487f924fdb8c643df2c49fcc6371ec79eae7d1d4
5
5
  SHA512:
6
- metadata.gz: 15f5457f2785acd08e3b86fcd1a807c85c836bc566d6b561efdadb781207b2f48f952216b232e96c278cfe3affc118c171a439c20b0e7eda7982dd893134e2c8
7
- data.tar.gz: 59a484dfda57c071271ed449898c5456598bcc323278fe1f1b4e73ce5ea468867a879cbe9186f42087c2079b53c5e98c066310feb446742f3ce0a1b91bccf0cb
6
+ metadata.gz: 207b9643b34f7da4d4019de5bd0dfb41d70f2fcb6848fdf5a0f0a02f4d2aa97e424f985d4906cd47c2088498fdaa2425b9db7b87d7a4bfba7497f51b23ca04ff
7
+ data.tar.gz: 1dcc7ad3813d27c6fd3322b8da7122b077fc6f4a7125100274fd137a8e892f3fdbd347606a4e17af7c4b15cd93d282dcd25c670d2f674746c14739adea54284a
@@ -3,6 +3,8 @@ class MarcationsController < ApplicationController
3
3
  load_and_authorize_resource
4
4
  respond_to :html, :json, :js
5
5
 
6
+ layout :disable_layout_for_xhr
7
+
6
8
  # GET /marcations
7
9
  # GET /marcations.json
8
10
  def index
@@ -64,7 +66,12 @@ class MarcationsController < ApplicationController
64
66
  end
65
67
 
66
68
  private
69
+
67
70
  def load_tour
68
71
  @tour = Tour.find params[:tour_id]
69
72
  end
73
+
74
+ def disable_layout_for_xhr
75
+ (request.xhr?) ? false : "application"
76
+ end
70
77
  end
@@ -12,7 +12,7 @@ class ToursController < ApplicationController
12
12
  @tour.visit! :by => request.try(:remote_ip)
13
13
 
14
14
  respond_with @tour do |format|
15
- format.html { render layout: 'full_screen' }
15
+ format.html { render layout: ((request.xhr?) ? false : 'full_screen') }
16
16
  end
17
17
  end
18
18
  end
@@ -1,3 +1,3 @@
1
1
  module RdcmsTour
2
- VERSION = "0.0.2"
2
+ VERSION = "0.0.3"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rdcms_tour
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.2
4
+ version: 0.0.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Gullit Miranda
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-08-13 00:00:00.000000000 Z
11
+ date: 2013-08-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler