buddy lib for tests, replace disposeBindings with unbindAll
This commit is contained in:
-59
@@ -1,59 +0,0 @@
|
||||
package ;
|
||||
class Main {
|
||||
|
||||
static function main() {
|
||||
trace("tada");
|
||||
|
||||
bindx.BindSignal.BindSignalProvider.register();
|
||||
|
||||
var v = new Value();
|
||||
var s = {t:0};
|
||||
|
||||
bindx.Bind.bindx(v.str, function (from, to) {trace('str changed from $from to $to');});
|
||||
v.strChanged.add(function (from, to) {trace('str changed from $from to $to');});
|
||||
v.str = "12";
|
||||
bindx.Bind.bindx(v.int, function (a, b) { trace(b); });
|
||||
var unbind = bindx.Bind.bindTo(v.int, s.t);
|
||||
v.int = 10;
|
||||
trace(s.t);
|
||||
unbind();
|
||||
v.int = 12;
|
||||
trace(s.t);
|
||||
trace(v.str);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@:bindable
|
||||
class Value implements bindx.IBindable {
|
||||
|
||||
public function new() {
|
||||
}
|
||||
|
||||
@:bindable(lazySignal=true, inlineSignalGetter=false, inlineSetter=true)
|
||||
public var str:String;
|
||||
|
||||
@:bindable(force=true, inlineSetter=true)
|
||||
public var int(default, set):Int;
|
||||
|
||||
private var noBindPrivate:Int;
|
||||
|
||||
function set_int(v):Int {
|
||||
|
||||
if (v < 0) {
|
||||
int = 0;
|
||||
toStringChanged.dispatch();
|
||||
intChanged.dispatch(v, int);
|
||||
return int;
|
||||
}
|
||||
|
||||
intChanged.dispatch(int, int = v);
|
||||
toStringChanged.dispatch();
|
||||
return v;
|
||||
}
|
||||
|
||||
@:bindable()
|
||||
public function toString() {
|
||||
return str + int;
|
||||
}
|
||||
}
|
||||
+4
-4
@@ -30,8 +30,8 @@ class Bind {
|
||||
return internalNotify(field, oldValue, newValue);
|
||||
}
|
||||
|
||||
@:noUsing macro static public function disposeBindings(object:ExprOf<IBindable>):Expr {
|
||||
return internalDisposeBindings(object);
|
||||
@:noUsing macro static public function unbindAll(object:ExprOf<IBindable>):Expr {
|
||||
return internalUnbindAll(object);
|
||||
}
|
||||
|
||||
#if macro
|
||||
@@ -54,12 +54,12 @@ class Bind {
|
||||
return BindMacros.bindingSignalProvider.getClassFieldChangedExpr(fieldData.e, fieldData.field, oldValue, newValue);
|
||||
}
|
||||
|
||||
public static function internalDisposeBindings(object:ExprOf<IBindable>):Expr {
|
||||
public static function internalUnbindAll(object:ExprOf<IBindable>):Expr {
|
||||
var type = Context.typeof(object).follow();
|
||||
if (!isBindable(type.getClass())) {
|
||||
Context.error('\'${object.toString()}\' must be bindx.IBindable', object.pos);
|
||||
}
|
||||
return BindMacros.bindingSignalProvider.getDisposeBindingsExpr(object, type);
|
||||
return BindMacros.bindingSignalProvider.getUnbindAllExpr(object, type);
|
||||
}
|
||||
|
||||
public static function checkField(field:Expr):{e:Expr, field:ClassField} {
|
||||
|
||||
@@ -88,14 +88,15 @@ class BindSignalProvider implements IBindingSignalProvider {
|
||||
return dispatchSignal(expr, field.name, args, hasLazy(field.bindableMeta()));
|
||||
}
|
||||
|
||||
public function getDisposeBindingsExpr(expr:ExprOf<IBindable>, type:Type):Expr {
|
||||
public function getUnbindAllExpr(expr:ExprOf<IBindable>, type:Type):Expr {
|
||||
return macro {
|
||||
var meta = haxe.rtti.Meta.getFields(std.Type.getClass($expr));
|
||||
if (meta != null) for (m in std.Reflect.fields(meta)) {
|
||||
var data:Dynamic<String> = std.Reflect.field(meta, m);
|
||||
if (std.Reflect.hasField(data, $v{BIND_SIGNAL_META})) {
|
||||
var signal:bindx.BindSignal.Signal<Dynamic> = cast Reflect.field($expr, m);
|
||||
if (signal != null) signal.dispose();
|
||||
if (signal != null)
|
||||
signal.removeAll();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -195,7 +196,7 @@ class Signal<T> {
|
||||
|
||||
var listeners:Array<T>;
|
||||
|
||||
var lock = 0;
|
||||
var lock:Int = 0;
|
||||
|
||||
public function new() {
|
||||
removeAll();
|
||||
@@ -203,10 +204,7 @@ class Signal<T> {
|
||||
|
||||
public inline function removeAll() {
|
||||
listeners = [];
|
||||
}
|
||||
|
||||
public inline function dispose() {
|
||||
listeners = null;
|
||||
lock = 0;
|
||||
}
|
||||
|
||||
public function add(listener:T):Void {
|
||||
|
||||
@@ -12,6 +12,6 @@ interface IBindingSignalProvider {
|
||||
function getClassFieldBindToExpr(expr:Expr, field:ClassField, target:Expr):Expr;
|
||||
function getClassFieldUnbindExpr(expr:Expr, field:ClassField, listener:Expr):Expr;
|
||||
function getClassFieldChangedExpr(expr:Expr, field:ClassField, oldValue:Expr, newValue:Expr):Expr;
|
||||
function getDisposeBindingsExpr(expr:ExprOf<IBindable>, type:Type):Expr;
|
||||
function getUnbindAllExpr(expr:ExprOf<IBindable>, type:Type):Expr;
|
||||
#end
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user