fix merge conflicts

This commit is contained in:
bolkhovsky
2014-06-24 00:19:26 +04:00
+17
View File
@@ -581,4 +581,21 @@ function test_misc() {
}
}
}
interface KnockoutBindingHandlers {
allBindingsAccessorTest: KnockoutBindingHandler;
}
function test_allBindingsAccessor() {
ko.bindingHandlers.allBindingsAccessorTest = {
init: (element: any, valueAccessor: () => any, allBindingsAccessor: KnockoutAllBindingsAccessor, viewModel: any, bindingContext: KnockoutBindingContext) => {
var allBindings = allBindingsAccessor();
var myBinding = allBindingsAccessor.get("myBindingName");
},
update: (element: any, valueAccessor: () => any, allBindingsAccessor: KnockoutAllBindingsAccessor, viewModel: any, bindingContext: KnockoutBindingContext) => {
var allBindings = allBindingsAccessor();
var myBinding = allBindingsAccessor.get("myBindingName");
}
};
}