Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fixed olives-server + updated emily

  • Loading branch information...
commit 89d687aba41dc4fc3ca7035abb06b8e7f93d97cd 1 parent 81b49f8
@podefr podefr authored
Showing with 5 additions and 7 deletions.
  1. +3 −5 olives-server.js
  2. +2 −2 package.json
View
8 olives-server.js
@@ -1,16 +1,12 @@
/**
* @license Olives http://flams.github.com/olives
* The MIT License (MIT)
- * Copyright (c) 2012 Olivier Scherrer <pode.fr@gmail.com> - Olivier Wietrich <olivier.wietrich@gmail.com>
+ * Copyright (c) 2012-2013 Olivier Scherrer <pode.fr@gmail.com> - Olivier Wietrich <olivier.wietrich@gmail.com>
*/
-
var requirejs = require("requirejs"),
emily = require("emily"),
isConnected = false;
-exports.handlers = emily.handlers;
-exports.config = emily.config;
-
exports.registerSocketIO = function (io) {
if (isConnected) {
@@ -61,6 +57,8 @@ exports.registerSocketIO = function (io) {
};
+exports.handlers = emily.handlers;
+
exports.requirejs = requirejs;
View
4 package.json
@@ -1,7 +1,7 @@
{
"name": "olives",
"description": "A JS Framework for creating realtime and scalable web applications. Based on Emily.js and socket.io",
- "version": "1.3.0",
+ "version": "1.3.1",
"homepage": "http://flams.github.com/olives/",
"licenses": [{
"type":"MIT",
@@ -19,7 +19,7 @@
],
"dependencies": {
"requirejs": ">=2.0.4",
- "emily": ">=1.3.0",
+ "emily": ">=1.3.2",
"socket.io": ">=0.9.6"
},
"keywords": ["framework", "web", "realtime", "UI", "MVC", "scalable", "AMD/commonJS"],
Please sign in to comment.
Something went wrong with that request. Please try again.