Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rstacruz/jquery.transit
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: annam/jquery.transit
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Aug 29, 2012

  1. multiple transition() on one element with no queue 

    The problem was that on every transition() call, the css property "transition" got overwritten.

for example:

$(elm).transition({ opacity: 1, duration: 400, easing: 'ease', queue: false })
$(elm).transition({ rotate: 30, duration: 300, easing: 'in', queue: false })

would result in element css: "transition: rotate 300 ease-in"

i now merge the properties to generate the css: "transition: opacity 400ms ease, rotate 300ms ease-in"

also "unmerge" function allows to remove a property from the string (the whole string used to be cleared) when finished transitioning.

this also allows for the hardcoded "transition" properties on the element to be maintained, if we are transitioning some other property.
    @annam
    annam committed Aug 29, 2012
    Configuration menu
    Copy the full SHA
    304cde2 View commit details
    Browse the repository at this point in the history
Loading