guy 7 years ago
parent
commit
5a3de388ab
  1. 62
      dist/fix/fix.compact.js

62
dist/fix/fix.compact.js vendored

@ -2,13 +2,13 @@
function initWatch (vm, watch) {
vm._watchers || (vm._watchers = []);
for (var key in watch) {
var handler = watch[key]
var handler = watch[key];
if (BI.isArray(handler)) {
for (var i = 0; i < handler.length; i++) {
vm._watchers.push(createWatcher(vm, key, handler[i]))
vm._watchers.push(createWatcher(vm, key, handler[i]));
}
} else {
vm._watchers.push(createWatcher(vm, key, handler))
vm._watchers.push(createWatcher(vm, key, handler));
}
}
}
@ -16,29 +16,29 @@
function createWatcher (vm, keyOrFn, handler) {
return Fix.watch(vm.model, keyOrFn, _.bind(handler, vm), {
store: vm.store
})
});
}
var target = null
const targetStack = []
var target = null;
const targetStack = [];
function pushTarget (_target) {
if (target) targetStack.push(target)
Fix.Model.target = target = _target
if (target) targetStack.push(target);
Fix.Model.target = target = _target;
}
function popTarget () {
Fix.Model.target = target = targetStack.pop()
Fix.Model.target = target = targetStack.pop();
}
var oldWatch = Fix.watch;
Fix.watch = function (model, expOrFn, cb, options) {
if (BI.isPlainObject(cb)) {
options = cb
cb = cb.handler
options = cb;
cb = cb.handler;
}
if (typeof cb === 'string') {
cb = model[cb]
if (typeof cb === "string") {
cb = model[cb];
}
return oldWatch.call(this, model, expOrFn, function () {
pushTarget(options.store);
@ -46,13 +46,10 @@
popTarget();
return res;
}, options);
}
};
var _init = BI.Widget.prototype._init;
BI.Widget.prototype._init = function () {
var needPop = false;
if (window.Fix && this._store) {
var p = this.options.element;
function findStore (widget) {
var p = widget;
while (p) {
if (p.store) {
break;
@ -60,7 +57,17 @@
p = p._parent || (p.options && p.options.element);
}
if (p) {
pushTarget(p.store);
return p.store;
}
}
var _init = BI.Widget.prototype._init;
BI.Widget.prototype._init = function () {
var needPop = false;
if (window.Fix && this._store) {
var store = findStore(this.options.element);
if (store) {
pushTarget(store);
needPop = true;
}
this.store = this._store();
@ -87,33 +94,34 @@
unwatches = BI.isArray(unwatches) ? unwatches : [unwatches];
BI.each(unwatches, function (j, unwatch) {
unwatch();
})
});
});
this._watchers && (this._watchers = []);
this.store && (this.store._parent = null, this.store = null);
}
};
_.each(["_mount", "populate"], function (name) {
var old = BI.Widget.prototype[name];
old && (BI.Widget.prototype[name] = function () {
this.store && pushTarget(this.store);
var store = findStore(this);
store && pushTarget(store);
var res = old.apply(this, arguments);
this.store && popTarget();
store && popTarget();
return res;
});
})
});
_.each(["each", "map", "reduce", "reduceRight", "find", "filter", "reject", "every", "all", "some", "any", "max", "min",
"sortBy", "groupBy", "indexBy", "countBy", "partition",
"keys", "allKeys", "values", "pairs", "invert",
"mapObject", "findKey", "pick", "omit", "tap"], function (name) {
var old = BI[name]
var old = BI[name];
BI[name] = function (obj, fn) {
return typeof fn === "function" ? old(obj, function (key, value) {
if (!(key in Fix.$$skipArray)) {
return fn.apply(this, arguments);
}
}) : old.apply(this, arguments);
}
};
});
}());
Loading…
Cancel
Save