Fix issue knockout#71 (minified version behaves differently from unmi…

…nified version)
inquus · Apr 27, 2011 · 666c396 · 666c396
1 parent 50ef0bd
commit 666c396
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/build/output/knockout-latest.debug.js b/build/output/knockout-latest.debug.js
@@ -161,9 +161,13 @@ ko.utils = new (function () {
         },
 
         evalWithinScope: function (expression, scope) {
+            // Always do the evaling within a "new Function" to block access to parent scope
             if (scope === undefined)
                 return (new Function("return " + expression))();
-            with (scope) { return eval("(" + expression + ")"); }
+
+            // Ensure "expression" is flattened into a source code string *before* it runs, otherwise
+            // the variable name "expression" itself will clash with a subproperty called "expression"
+            return (new Function("sc", "with(sc) { return (" + expression + ") }"))(scope);
         },
 
         domNodeIsContainedBy: function (node, containedByNode) {

diff --git a/build/output/knockout-latest.js b/build/output/knockout-latest.js
diff --git a/src/utils.js b/src/utils.js
@@ -145,9 +145,13 @@ ko.utils = new (function () {
         },
 
         evalWithinScope: function (expression, scope) {
+            // Always do the evaling within a "new Function" to block access to parent scope
             if (scope === undefined)
                 return (new Function("return " + expression))();
-            with (scope) { return eval("(" + expression + ")"); }
+
+            // Ensure "expression" is flattened into a source code string *before* it runs, otherwise
+            // the variable name "expression" itself will clash with a subproperty called "expression"
+            return (new Function("sc", "with(sc) { return (" + expression + ") }"))(scope);
         },
 
         domNodeIsContainedBy: function (node, containedByNode) {