fixed size->length caveat

benmarch · Jun 24, 2015 · 33c177f · 33c177f
1 parent dafb431
commit 33c177f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/dist/spel2js.js b/dist/spel2js.js
@@ -1327,7 +1327,7 @@ Stack.prototype.search = function (el) {
             }
 
             //size() -> length
-            if (methodName === 'size' && args.length === 0) {
+            if (methodName === 'size' && Array.isArray(context)) {
                 return context.length;
             }
 
@@ -1958,7 +1958,7 @@ Stack.prototype.search = function (el) {
 
                 //handle conversion of Java properties to JavaScript properties
                 //this might cause problems, I'll look into alternatives
-                if (propertyName === 'size') {
+                if (propertyName === 'size' && Array.isArray(context)) {
                     return context.length;
                 }
 

diff --git a/dist/spel2js.min.js b/dist/spel2js.min.js
diff --git a/src/ast/MethodReference.js b/src/ast/MethodReference.js
@@ -53,7 +53,7 @@
             }
 
             //size() -> length
-            if (methodName === 'size' && args.length === 0) {
+            if (methodName === 'size' && Array.isArray(context)) {
                 return context.length;
             }
 

diff --git a/src/ast/PropertyReference.js b/src/ast/PropertyReference.js
@@ -28,8 +28,7 @@
                 }
 
                 //handle conversion of Java properties to JavaScript properties
-                //this might cause problems, I'll look into alternatives
-                if (propertyName === 'size') {
+                if (propertyName === 'size' && Array.isArray(context)) {
                     return context.length;
                 }