Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Synced common stuff with master.

  • Loading branch information...
commit 82b7f6a599f71d64ddc69e55ebca178905e47267 1 parent 97c7ba2
Maurice Machado authored
Showing with 8 additions and 21 deletions.
  1. +6 −0 CHANGELOG.md
  2. +1 −1  Cakefile
  3. +0 −20 foo.coffee
  4. +1 −0  package.json
6 CHANGELOG.md
View
@@ -1,3 +1,9 @@
+**v0.2.0edge** (unreleased):
+
+ - Changed: using standard jquery from code.jquery.com instead of node-jquery. Updated to 1.6.4.
+ - Changed: updated sammy to 0.7.0.
+ - Fixed #80: Default layout is not being added correctly.
+
**v0.2.0** (2011-09-08):
- Changed: externals (`zappa {foo} ->`) are available at all scopes, shadow globals and root scope locals.
2  Cakefile
View
@@ -15,7 +15,7 @@ task 'docs', ->
task 'vendor', ->
run 'mkdir -p vendor && cd vendor && curl -OL http://code.jquery.com/jquery-1.6.4.min.js', ->
- run 'cd vendor && curl -OL http://raw.github.com/quirkey/sammy/v0.7.0/lib/min/sammy-0.7.0.min.js', ->
+ run 'cd vendor && curl -OL https://raw.github.com/quirkey/sammy/v0.7.0/lib/min/sammy-0.7.0.min.js', ->
run 'head -n 1 vendor/jquery*', ->
run 'head -n 3 vendor/sammy*'
20 foo.coffee
View
@@ -1,20 +0,0 @@
-require('./src/zappa') ->
- @enable 'default layout'
- @set databag: 'param'
-
- @get '/': ->
- @render 'index'
-
- @on connection: ->
- @emit welcome: {motd: 'data in the param!'}
-
- @client '/index.js': ->
- @connect()
-
- @on welcome: (d) ->
- console.log 'welcome:', d.motd
-
- @view index: ->
- @title = 'Crazy zappa experiment'
- @scripts = ['/socket.io/socket.io', '/zappa/zappa', '/index']
- p @foo
1  package.json
View
@@ -29,6 +29,7 @@
"Jae Kwon <jae@flywheelnetworks.com>",
"Yuya Nishiyama <nsy@ulz.nu>",
"Esa-Matti Suuronen <esa-matti@suuronen.org>",
+ "Ian Young <ian.greenleaf@gmail.com>",
"Isaac Wolkerstorfer <agnoster@gmail.com>",
"Jason King <jk@handle.it>",
"Stéphane Alnet <stephane@shimaore.net>",
Please sign in to comment.
Something went wrong with that request. Please try again.