Skip to content

Commit

Permalink
New namespace for constants
Browse files Browse the repository at this point in the history
  • Loading branch information
soyjavi committed Feb 4, 2015
1 parent 1391975 commit 3f58eea
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 14 deletions.
18 changes: 11 additions & 7 deletions app.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,17 @@ Global namespace for Atoms.App
"use strict"

window.__ = Atoms.App =
version : "0.13.29"
Article : {}
Aside : {}
Dialog : {}
Entity : {}
Extension : {}
Url : null
version : "0.14.04"
Article : {}
Aside : {}
Dialog : {}
Entity : {}
Extension : {}
Url : null
Constants :
ANIMATION:
DURATION: 450
END : "webkitAnimationEnd MSAnimationEnd animationend"

Atoms.$ ->
Atoms.$(document.body).addClass "standalone" if navigator.standalone
4 changes: 2 additions & 2 deletions atom/li.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ class Atoms.Atom.Li extends Atoms.Class.Atom
if pixels > 80 and not @destroying
@destroying = true
@el.addClass "destroy"
setTimeout (=> @destroy()), 450
setTimeout (=> @destroy()), __.Constants.ANIMATION.DURATION

@el.bind "touchend", (event) =>
@el
.css "transition", "right 450ms"
.css "transition", "right #{__.Constants.ANIMATION.DURATION}ms"
.css "right", "0px"

_render: ->
Expand Down
2 changes: 1 addition & 1 deletion organism/aside.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class Atoms.Organism.Aside extends Atoms.Class.Organism

render: ->
super
for animation_end in Atoms.Core.Constants.ANIMATION.END.split " "
for animation_end in __.Constants.ANIMATION.END.split " "
@el.bind animation_end, @onAnimationEnd

show: ->
Expand Down
4 changes: 2 additions & 2 deletions organism/dialog.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class Atoms.Organism.Dialog extends Atoms.Class.Organism
Atoms.App.Dialog[@attributes.id?.toClassName() or @constructor.name] = @

do @render
for animation_end in Atoms.Core.Constants.ANIMATION.END.split " "
for animation_end in __.Constants.ANIMATION.END.split " "
@el.bind animation_end, @onAnimationEnd

# Publics
Expand All @@ -35,7 +35,7 @@ class Atoms.Organism.Dialog extends Atoms.Class.Organism
@el.addClass "show"
@trigger "show"
#@TODO: Hack for Firefox AnimationEnd listener fails
setTimeout (=> do @onAnimationEnd), 450
setTimeout (=> do @onAnimationEnd), __.Constants.ANIMATION.DURATION
__.Url.current()?.back()

hide: ->
Expand Down
2 changes: 1 addition & 1 deletion organism/dialog_loading.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class Atoms.Organism.Loading extends Atoms.Organism.Dialog
show: ->
@el.parent().addClass "active"
@el.addClass "show"
setTimeout (=> do @onAnimationEnd), 450
setTimeout (=> do @onAnimationEnd), __.Constants.ANIMATION.DURATION

hide: ->
@el.addClass "hide"
Expand Down
2 changes: 1 addition & 1 deletion organism/dialog_push.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class Atoms.Organism.Push extends Atoms.Organism.Dialog
@el.addClass "show"
@trigger "show"
#@TODO: Hack for Firefox AnimationEnd listener fails
setTimeout (=> do @onAnimationEnd), 450
setTimeout (=> do @onAnimationEnd), __.Constants.ANIMATION.DURATION

if attributes.timeout?
@id_timeout = setTimeout =>
Expand Down

0 comments on commit 3f58eea

Please sign in to comment.