Permalink
Browse files

Merge branch 'master' of git://github.com/jfromaniello/bean into 0.5-wip

Conflicts:
	src/bean.js
  • Loading branch information...
2 parents e19ef86 + 2407fe2 commit 07c876fa33b0464337fac856a5c5dd5ff195b816 @rvagg rvagg committed Aug 29, 2012
Showing with 6 additions and 6 deletions.
  1. +3 −3 .npmignore
  2. +1 −1 package.json
  3. +2 −2 src/bean.js
View
@@ -1,3 +1,3 @@
-node_modules
-*.swp
-benchmark
+node_modules/
+tests/benchmark/
+integration/
View
@@ -1,7 +1,7 @@
{
"name": "bean"
, "description": "an events api for javascript"
- , "version": "0.4.11-1"
+ , "version": "1.0.0a1"
, "homepage": "https://github.com/fat/bean"
, "authors": [
"Jacob Thornton <@fat>"
View
@@ -1,5 +1,5 @@
!(function (name, context, definition) {
- if (typeof module != 'undefined') module.exports = definition(name, context);
+ if (typeof module != 'undefined' && module.exports) module.exports = definition(name, context);
else if (typeof define == 'function' && typeof define.amd == 'object') define(definition);
else context[name] = definition(name, context);
}('bean', this, function (name, context) {
@@ -728,4 +728,4 @@
setSelectorEngine()
return bean
-}));
+}));

0 comments on commit 07c876f

Please sign in to comment.