Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Bump muffin for CS 1.4

  • Loading branch information...
commit 7a3912a59a7ae03cd4ea27f24052eee165d10b90 1 parent 4cb0371
@airhorns airhorns authored
View
1  Cakefile
@@ -28,6 +28,7 @@ pipedExec = do ->
running = false
callback(code)
+
task 'build', 'compile Batman.js and all the tools', (options) ->
files = glob.sync('./src/**/*').concat(glob.sync('./tests/run.coffee'))
muffin.run
View
18 lib/batman.js
@@ -7,8 +7,8 @@
mixins = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
return (function(func, args, ctor) {
ctor.prototype = func.prototype;
- var child = new ctor, result = func.apply(child, args), t = typeof result;
- return t == "object" || t == "function" ? result || child : child;
+ var child = new ctor, result = func.apply(child, args);
+ return Object(result) === result ? result : child;
})(Batman.Object, mixins, function(){});
};
@@ -3335,7 +3335,7 @@
if (!name) {
continue;
}
- bindings.push((names = name.split('-')).length > 1 ? [names[0], names.slice(1, names.length + 1 || 9e9).join('-'), attribute.value] : [name, void 0, attribute.value]);
+ bindings.push((names = name.split('-')).length > 1 ? [names[0], names.slice(1, +names.length + 1 || 9e9).join('-'), attribute.value] : [name, void 0, attribute.value]);
}
_ref3 = bindings.sort(this._sortBindings);
for (_l = 0, _len3 = _ref3.length; _l < _len3; _l++) {
@@ -9069,8 +9069,8 @@
this.base.registerAsMutableSource();
return (function(func, args, ctor) {
ctor.prototype = func.prototype;
- var child = new ctor, result = func.apply(child, args), t = typeof result;
- return t == "object" || t == "function" ? result || child : child;
+ var child = new ctor, result = func.apply(child, args);
+ return Object(result) === result ? result : child;
})(Batman.Set, this._storage, function(){}).merge(other).sortedBy(this.key, this.order);
};
@@ -10585,8 +10585,8 @@
if (options != null ? options.as : void 0) {
return (function(func, args, ctor) {
ctor.prototype = func.prototype;
- var child = new ctor, result = func.apply(child, args), t = typeof result;
- return t == "object" || t == "function" ? result || child : child;
+ var child = new ctor, result = func.apply(child, args);
+ return Object(result) === result ? result : child;
})(Batman.PolymorphicHasManyAssociation, arguments, function(){});
}
HasManyAssociation.__super__.constructor.apply(this, arguments);
@@ -10964,8 +10964,8 @@
delete options.polymorphic;
return (function(func, args, ctor) {
ctor.prototype = func.prototype;
- var child = new ctor, result = func.apply(child, args), t = typeof result;
- return t == "object" || t == "function" ? result || child : child;
+ var child = new ctor, result = func.apply(child, args);
+ return Object(result) === result ? result : child;
})(Batman.PolymorphicBelongsToAssociation, arguments, function(){});
}
BelongsToAssociation.__super__.constructor.apply(this, arguments);
View
18 lib/dist/batman.node.js
@@ -7,8 +7,8 @@
mixins = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
return (function(func, args, ctor) {
ctor.prototype = func.prototype;
- var child = new ctor, result = func.apply(child, args), t = typeof result;
- return t == "object" || t == "function" ? result || child : child;
+ var child = new ctor, result = func.apply(child, args);
+ return Object(result) === result ? result : child;
})(Batman.Object, mixins, function(){});
};
@@ -3335,7 +3335,7 @@
if (!name) {
continue;
}
- bindings.push((names = name.split('-')).length > 1 ? [names[0], names.slice(1, names.length + 1 || 9e9).join('-'), attribute.value] : [name, void 0, attribute.value]);
+ bindings.push((names = name.split('-')).length > 1 ? [names[0], names.slice(1, +names.length + 1 || 9e9).join('-'), attribute.value] : [name, void 0, attribute.value]);
}
_ref3 = bindings.sort(this._sortBindings);
for (_l = 0, _len3 = _ref3.length; _l < _len3; _l++) {
@@ -9069,8 +9069,8 @@
this.base.registerAsMutableSource();
return (function(func, args, ctor) {
ctor.prototype = func.prototype;
- var child = new ctor, result = func.apply(child, args), t = typeof result;
- return t == "object" || t == "function" ? result || child : child;
+ var child = new ctor, result = func.apply(child, args);
+ return Object(result) === result ? result : child;
})(Batman.Set, this._storage, function(){}).merge(other).sortedBy(this.key, this.order);
};
@@ -10585,8 +10585,8 @@
if (options != null ? options.as : void 0) {
return (function(func, args, ctor) {
ctor.prototype = func.prototype;
- var child = new ctor, result = func.apply(child, args), t = typeof result;
- return t == "object" || t == "function" ? result || child : child;
+ var child = new ctor, result = func.apply(child, args);
+ return Object(result) === result ? result : child;
})(Batman.PolymorphicHasManyAssociation, arguments, function(){});
}
HasManyAssociation.__super__.constructor.apply(this, arguments);
@@ -10964,8 +10964,8 @@
delete options.polymorphic;
return (function(func, args, ctor) {
ctor.prototype = func.prototype;
- var child = new ctor, result = func.apply(child, args), t = typeof result;
- return t == "object" || t == "function" ? result || child : child;
+ var child = new ctor, result = func.apply(child, args);
+ return Object(result) === result ? result : child;
})(Batman.PolymorphicBelongsToAssociation, arguments, function(){});
}
BelongsToAssociation.__super__.constructor.apply(this, arguments);
View
2  package.json
@@ -29,7 +29,7 @@
"docco": "~>0.3.0",
"glob": "~>3.0.1",
"q": "~>0.8.0",
- "muffin": "~>0.6.2",
+ "muffin": "~>0.7.0",
"uglify-js": "1.2.5",
"temp": "~>0.4.0",
"qqunit": "~>0.5.0",
Please sign in to comment.
Something went wrong with that request. Please try again.