javascripts/shuriken/mixins.js in shuriken-0.1.3.1 vs javascripts/shuriken/mixins.js in shuriken-0.1.4
- old
+ new
@@ -3,22 +3,22 @@
var defineMixin, root;
root = this.getRootNS();
ns.mixins = {};
root.mixins = {};
root.withBase(function(base) {
- base.mixin = function mixin(mixins) {
+ base.mixin = function(mixins) {
return ns.mixin(this, mixins);
};
return base.mixin;
});
- defineMixin = function defineMixin(key, mixin) {
+ defineMixin = function(key, mixin) {
this.mixins[key] = mixin;
return this.mixins[key];
};
root.defineMixin = defineMixin;
ns.define = defineMixin;
- ns.lookupMixin = function lookupMixin(mixin) {
+ ns.lookupMixin = function(mixin) {
var _a, _b, _c;
if ((_a = typeof mixin) === "string") {
if ((typeof (_b = ns.mixins[mixin]) !== "undefined" && _b !== null)) {
return ns.mixins[mixin];
} else if ((typeof (_c = root.mixins[mixin]) !== "undefined" && _c !== null)) {
@@ -29,20 +29,20 @@
}
} else {
return mixin;
}
};
- ns.invokeMixin = function invokeMixin(scope, mixin) {
+ ns.invokeMixin = function(scope, mixin) {
var _a;
if ((_a = typeof mixin) === "string") {
return ns.invokeMixin(scope, ns.lookupMixin(mixin));
} else if (_a === "function") {
return mixin.call(scope, scope);
} else if (_a === "object") {
return $.extend(scope, mixin);
}
};
- ns.mixin = function mixin(scope, mixins) {
+ ns.mixin = function(scope, mixins) {
var _a, _b, _c, mixin;
if (!($.isArray(mixins))) {
mixins = [mixins];
}
_b = mixins;
\ No newline at end of file