1
0
Fork 0
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:
Karl Bryan Paragua 2015-08-28 12:16:52 +08:00
commit 481dafb545
4 changed files with 6 additions and 2 deletions

View file

@ -1,3 +1,6 @@
## 4.2.0
* https://github.com/kbparagua/paloma/pull/75 - Explicitly insert hook in view.
## 4.1.2 ## 4.1.2
* https://github.com/kbparagua/paloma/issues/73 - Fix `js false` issue. * https://github.com/kbparagua/paloma/issues/73 - Fix `js false` issue.

View file

@ -113,7 +113,7 @@ module Paloma
# will execute the tracked Paloma requests. # will execute the tracked Paloma requests.
# #
def insert_paloma_hook def insert_paloma_hook
return true if self.paloma.has_no_request? return nil if self.paloma.has_no_request?
hook = view_context.render( hook = view_context.render(
:partial => 'paloma/hook', :partial => 'paloma/hook',

View file

@ -1,6 +1,6 @@
Gem::Specification.new do |s| Gem::Specification.new do |s|
s.name = 'paloma' 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.summary = "Provides an easy way to execute page-specific javascript for Rails."
s.description = "Page-specific javascript for Rails done right" s.description = "Page-specific javascript for Rails done right"
s.authors = ['Karl Paragua'] s.authors = ['Karl Paragua']

View file

@ -8,6 +8,7 @@ class MainController < ApplicationController
# Override controller # Override controller
def show def show
js false
js 'OtherMain', :x => 1 js 'OtherMain', :x => 1
render :inline => 'Main#show', :layout => 'application' render :inline => 'Main#show', :layout => 'application'
end end