diff --git a/VERSION b/VERSION index 7ac93854..c8efa258 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-24 18:09:19) stable +Version 2.0.9 (2012-09-24 20:18:26) stable diff --git a/applications/admin/static/js/web2py.js b/applications/admin/static/js/web2py.js index 0abe1907..61f45e30 100644 --- a/applications/admin/static/js/web2py.js +++ b/applications/admin/static/js/web2py.js @@ -155,7 +155,7 @@ function web2py_component(action, target, timeout, times){ web2py_ajax_page('get', action, null, target); } }); } -function web2py_comet(url,onmessage,onopen,onclose) { +function web2py_websocket(url,onmessage,onopen,onclose) { if ("WebSocket" in window) { var ws = new WebSocket(url); ws.onopen = onopen?onopen:(function(){}); diff --git a/applications/examples/static/js/web2py.js b/applications/examples/static/js/web2py.js index 0abe1907..61f45e30 100644 --- a/applications/examples/static/js/web2py.js +++ b/applications/examples/static/js/web2py.js @@ -155,7 +155,7 @@ function web2py_component(action, target, timeout, times){ web2py_ajax_page('get', action, null, target); } }); } -function web2py_comet(url,onmessage,onopen,onclose) { +function web2py_websocket(url,onmessage,onopen,onclose) { if ("WebSocket" in window) { var ws = new WebSocket(url); ws.onopen = onopen?onopen:(function(){}); diff --git a/applications/examples/views/default/who.html b/applications/examples/views/default/who.html index cc0f4d17..efaec76b 100644 --- a/applications/examples/views/default/who.html +++ b/applications/examples/views/default/who.html @@ -70,6 +70,7 @@
  • Ian Reinhart Geiser (html helpers)
  • Ionel Anton (Romanian translation)
  • Jan Beilicke (markmin) +
  • Jeremy Dillworth
  • Jonathan Benn (is_url validator and tests)
  • Jonathan Lundell (multiple contributions)
  • Josh Goldfoot (xaml/html sanitizer) diff --git a/scripts/make_min_web2py.py b/scripts/make_min_web2py.py index b98bd4b0..4c3fec52 100644 --- a/scripts/make_min_web2py.py +++ b/scripts/make_min_web2py.py @@ -23,7 +23,7 @@ applications/welcome/controllers/default.py # files and folders to exclude from gluon folder (comment with # if needed) IGNORED = """ -gluon/contrib/comet_messaging.py +gluon/contrib/websocket_messaging.py gluon/contrib/feedparser.py gluon/contrib/generics.py gluon/contrib/gql.py