developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner 

Conflicts:
	app/views/admin/ad_banners/_ad_banner_tab.html.erb
This commit is contained in:
Christophe Vilayphiou 2012-04-24 14:43:30 +08:00
parent 33640de184 04688608f7
commit 51ee9a4bfa
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/ad_banner.rb
View File

@ -15,7 +15,7 @@ class AdBanner
FX_TYPES = ["blindX","blindY","blindZ","cover","curtainX","curtainY","fade","fadeZoom","growX","growY","scrollUp","scrollDown","scrollLeft","scrollRight","scrollHorz","scrollVert","shuffle","slideX","slideY","toss","turnUp","turnDown","turnLeft","turnRight","uncover","wipe","zoom"] FX_TYPES = ["blindX","blindY","blindZ","cover","curtainX","curtainY","fade","fadeZoom","growX","growY","scrollUp","scrollDown","scrollLeft","scrollRight","scrollHorz","scrollVert","shuffle","slideX","slideY","toss","turnUp","turnDown","turnLeft","turnRight","uncover","wipe","zoom"]
attr_writer :transition_sec attr_writer :transition_sec
def transition_sec def transition_sec
self.transition_msec/1000 self.transition_msec/1000 rescue nil
end end
def transition_sec=(sec) def transition_sec=(sec)