From 0904e0a6182ead2aa3b5e121e8b80a7a751ee25f Mon Sep 17 00:00:00 2001 From: Renaud Pawlak Date: Tue, 2 May 2017 05:44:38 +0200 Subject: [PATCH] reverted $apply on JS Function object --- core-lib/es5/src/main/java/def/js/Function.java | 4 ++-- core-lib/es6/src/main/java/def/js/Function.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core-lib/es5/src/main/java/def/js/Function.java b/core-lib/es5/src/main/java/def/js/Function.java index 0fb08ffa..b7d776d7 100644 --- a/core-lib/es5/src/main/java/def/js/Function.java +++ b/core-lib/es5/src/main/java/def/js/Function.java @@ -8,7 +8,7 @@ public class Function extends def.js.Object { * @param thisArg The object to be used as the this object. * @param argArray A set of arguments to be passed to the function. */ - native public java.lang.Object $apply(java.lang.Object thisArg, java.lang.Object argArray); + native public java.lang.Object apply(java.lang.Object thisArg, java.lang.Object argArray); /** * Calls a method of an object, substituting another object for the current object. * @param thisArg The object to be used as the current object. @@ -37,7 +37,7 @@ public class Function extends def.js.Object { * @param thisArg The object to be used as the this object. * @param argArray A set of arguments to be passed to the function. */ - native public java.lang.Object $apply(java.lang.Object thisArg); + native public java.lang.Object apply(java.lang.Object thisArg); native public java.lang.Object caller(java.lang.Object... args); protected Function(){} } diff --git a/core-lib/es6/src/main/java/def/js/Function.java b/core-lib/es6/src/main/java/def/js/Function.java index 34bcb8fd..627d6f12 100644 --- a/core-lib/es6/src/main/java/def/js/Function.java +++ b/core-lib/es6/src/main/java/def/js/Function.java @@ -8,7 +8,7 @@ public class Function extends def.js.Object { * @param thisArg The object to be used as the this object. * @param argArray A set of arguments to be passed to the function. */ - native public java.lang.Object $apply(java.lang.Object thisArg, java.lang.Object argArray); + native public java.lang.Object apply(java.lang.Object thisArg, java.lang.Object argArray); /** * Calls a method of an object, substituting another object for the current object. * @param thisArg The object to be used as the current object. @@ -46,7 +46,7 @@ public class Function extends def.js.Object { * @param thisArg The object to be used as the this object. * @param argArray A set of arguments to be passed to the function. */ - native public java.lang.Object $apply(java.lang.Object thisArg); + native public java.lang.Object apply(java.lang.Object thisArg); native public java.lang.Object caller(java.lang.Object... args); protected Function(){} }