adding the other core changes from knockout#286 :

* Chrome sometimes appends a newline to innerText but not to textContent; so textContent is better in Chrome * Calling the init and update function on the object means we can use 'this' in the functions.
olachan · Jan 23, 2012 · 30d0576 · 30d0576
1 parent 0b39c9d
commit 30d0576
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/spec/runner.html b/spec/runner.html
@@ -39,7 +39,7 @@
                 JSSpec.DSL.Subject.prototype.should_be.call({ target: cleanedHtml }, expectedHtml);
             };
             JSSpec.DSL.Subject.prototype.should_contain_text = function (expectedText) {
-            	var actualText = 'innerText' in this.target ? this.target.innerText : this.target.textContent;
+                var actualText = 'textContent' in this.target ? this.target.textContent : this.target.innerText;
                 var cleanedActualText = actualText.replace(/\r\n/g, "\n");
                 JSSpec.DSL.Subject.prototype.should_be.call({ target: cleanedActualText }, expectedText);
             };

diff --git a/src/binding/bindingAttributeSyntax.js b/src/binding/bindingAttributeSyntax.js
@@ -99,8 +99,7 @@
                                 validateThatBindingIsAllowedForVirtualElements(bindingKey);
 
                             if (binding && typeof binding["init"] == "function") {
-                                var handlerInitFn = binding["init"];
-                                var initResult = handlerInitFn(node, makeValueAccessor(bindingKey), parsedBindingsAccessor, viewModel, bindingContextInstance);
+                                var initResult = binding["init"](node, makeValueAccessor(bindingKey), parsedBindingsAccessor, viewModel, bindingContextInstance);
 
                                 // If this binding handler claims to control descendant bindings, make a note of this
                                 if (initResult && initResult['controlsDescendantBindings']) {
@@ -118,8 +117,7 @@
                         for (var bindingKey in parsedBindings) {
                             var binding = ko.bindingHandlers[bindingKey];
                             if (binding && typeof binding["update"] == "function") {
-                                var handlerUpdateFn = binding["update"];
-                                handlerUpdateFn(node, makeValueAccessor(bindingKey), parsedBindingsAccessor, viewModel, bindingContextInstance);
+                                binding["update"](node, makeValueAccessor(bindingKey), parsedBindingsAccessor, viewModel, bindingContextInstance);
                             }
                         }
                     }