fixed error evaluating attributes in templates

antoniogarrote · Sep 9, 2011 · 38989b6 · 38989b6
1 parent ba0ec70
commit 38989b6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/build/output/knockout-latest.debug.js b/build/output/knockout-latest.debug.js
@@ -1321,10 +1321,11 @@ ko.exportSymbol('ko.jsonExpressionRewriting.insertPropertyReaderWritersIntoJson'
             function () {
 
 
-                var evaluatedBindings;
+                var evaluatedBindings, bindingsToBeEvaluated;
                 if(typeof(bindings) == 'function') {
                     viewModel['skonode'] = node;
-                    with(viewModel){ evaluatedBindings =  bindings() };
+                    bindingsToBeEvaluated = bindings;
+                    with(viewModel){ evaluatedBindings =  bindingsToBeEvaluated() };
                 } else {
                     evaluatedBindings = bindings;
                 }
@@ -2386,11 +2387,10 @@ sko.Class.check = function(resource) {
         sko.log("*** IS INSTANCE OF? "+p);
         if(sko.Class.isInstance(resource, p)) {
             sko.log("Y!");
-            //newClasses[p] = true;
-            resource.classes[p] = true;
             if(isFirstRun || resource.classes[p] == null) {
                 sko.Class.instance(p,resource)
             }
+            resource.classes[p] = true;
         } else {
             sko.log("N!");
             if(resource.classes[p] != null) {

diff --git a/build/output/knockout-latest.js b/build/output/knockout-latest.js
diff --git a/deps/sem_ko.js b/deps/sem_ko.js
@@ -77,11 +77,10 @@ sko.Class.check = function(resource) {
         sko.log("*** IS INSTANCE OF? "+p);
         if(sko.Class.isInstance(resource, p)) {
             sko.log("Y!");
-            //newClasses[p] = true;
-            resource.classes[p] = true;
             if(isFirstRun || resource.classes[p] == null) {
                 sko.Class.instance(p,resource)
             }
+            resource.classes[p] = true;
         } else {
             sko.log("N!");
             if(resource.classes[p] != null) {

diff --git a/src/binding/bindingAttributeSyntax.js b/src/binding/bindingAttributeSyntax.js
@@ -38,10 +38,11 @@
             function () {
 
 
-                var evaluatedBindings;
+                var evaluatedBindings, bindingsToBeEvaluated;
                 if(typeof(bindings) == 'function') {
                     viewModel['skonode'] = node;
-                    with(viewModel){ evaluatedBindings =  bindings() };
+                    bindingsToBeEvaluated = bindings;
+                    with(viewModel){ evaluatedBindings =  bindingsToBeEvaluated() };
                 } else {
                     evaluatedBindings = bindings;
                 }