Permalink
Commits on May 4, 2012
  1. Prepared release 0.26.0

    tj committed May 4, 2012
  2. Merge pull request #624 from chowey/mixin-hoist

    Mixin hoist
    tj committed May 4, 2012
  3. Block/includes work nicely together

    Fixes #579
    chowey committed May 4, 2012
  4. Test case

    chowey committed May 4, 2012
  5. tweak a test case

    tj committed May 4, 2012
  6. removed old fixtures

    tj committed May 4, 2012
Commits on May 3, 2012
  1. Make `include` hoist mixins too

    chowey committed May 3, 2012
Commits on May 2, 2012
Commits on May 1, 2012
  1. build

    tj committed May 1, 2012
  2. Added package.json component config

    tj committed May 1, 2012
  3. refactor parser slightly

    tj committed May 1, 2012
  4. Merge branch 'integration'

    tj committed May 1, 2012
  5. added block tag behaviour tests

    tj committed May 1, 2012
  6. Parse mixin call like a tag

    By extracting the tag-parser, we can apply it to mixins.  This makes mixin `block`s more robust and consistent with how tags work:
    
    The following both work now:
    
    ```
    +foo: p Hi!
    +foo.
      Hello
      World!
    ```
    chowey committed with tj Apr 29, 2012
Commits on Apr 29, 2012
  1. Merge pull request #616 from pgherveou/master

    add ; at the end of mixins declaration
    tj committed Apr 29, 2012
  2. added ;

    pgherveou committed Apr 29, 2012
  3. Revert "add ; at the end of mixins declaration"

    This reverts commit 2f34d86.
    pgherveou committed Apr 29, 2012
  4. Merge pull request #614 from chowey/block-fix

    Use explicit `block` notation
    tj committed Apr 29, 2012
  5. link to google group

    tj committed Apr 29, 2012
  6. Use explicit `block` notation

    Blocks should not be passed along to junior mixins automatically.  They should work just like normal in a mixin call's block:
    
    ```
    mixin bar
      block
    
    mixin foo
      +bar
        block
    
    +foo
      p Hello world!
    ```
    chowey committed Apr 29, 2012
Commits on Apr 27, 2012
  1. Merge pull request #608 from chowey/patch-block

    Patch block
    tj committed Apr 27, 2012
Commits on Apr 26, 2012
  1. Merge remote-tracking branch 'origin' into patch-block

    Conflicts:
    	lib/compiler.js
    	test/cases/mixin.blocks.jade
    chowey committed Apr 26, 2012
Commits on Apr 25, 2012
  1. Use `pp` for consistency

    chowey committed Apr 25, 2012
  2. Added `block` statement

    equivalent to != block
    tj committed Apr 25, 2012
  3. Changed: renamed `content` to `block`

    tj committed Apr 25, 2012
Commits on Apr 23, 2012
  1. Update test case

    (The "block" property automatically propogates up the chain through mixins.)
    chowey committed Apr 23, 2012
  2. Pass mixin blocks as `this`

    By using `Function.call`, we can pass mixin blocks without affecting arguments, which otherwise leads to weird bugs if optional arguments are being used in the mixin.
    
    This also makes the `block` variable true/null instead of returning the function itself, which is safer for users.  The function is instead available as `this.block`.
    chowey committed Apr 23, 2012
Commits on Apr 22, 2012
  1. Added test to show blocks from includes not overwritten

    Simple `make test` to see the new test fail.
    rdrey committed Apr 22, 2012