mirror of
https://github.com/kbparagua/paloma
synced 2023-03-27 23:21:17 -04:00
Merge pull request #80 from kbparagua/bugfix/rendering-true
Bugfix/rendering true
This commit is contained in:
commit
481dafb545
4 changed files with 6 additions and 2 deletions
|
@ -1,3 +1,6 @@
|
|||
## 4.2.0
|
||||
* https://github.com/kbparagua/paloma/pull/75 - Explicitly insert hook in view.
|
||||
|
||||
## 4.1.2
|
||||
* https://github.com/kbparagua/paloma/issues/73 - Fix `js false` issue.
|
||||
|
||||
|
|
|
@ -113,7 +113,7 @@ module Paloma
|
|||
# will execute the tracked Paloma requests.
|
||||
#
|
||||
def insert_paloma_hook
|
||||
return true if self.paloma.has_no_request?
|
||||
return nil if self.paloma.has_no_request?
|
||||
|
||||
hook = view_context.render(
|
||||
:partial => 'paloma/hook',
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
Gem::Specification.new do |s|
|
||||
s.name = 'paloma'
|
||||
s.version = '4.1.2'
|
||||
s.version = '4.2.0'
|
||||
s.summary = "Provides an easy way to execute page-specific javascript for Rails."
|
||||
s.description = "Page-specific javascript for Rails done right"
|
||||
s.authors = ['Karl Paragua']
|
||||
|
|
|
@ -8,6 +8,7 @@ class MainController < ApplicationController
|
|||
|
||||
# Override controller
|
||||
def show
|
||||
js false
|
||||
js 'OtherMain', :x => 1
|
||||
render :inline => 'Main#show', :layout => 'application'
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue