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:
commit
51ee9a4bfa
|
@ -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"]
|
||||
attr_writer :transition_sec
|
||||
def transition_sec
|
||||
self.transition_msec/1000
|
||||
self.transition_msec/1000 rescue nil
|
||||
end
|
||||
|
||||
def transition_sec=(sec)
|
||||
|
|
Reference in New Issue