remove multi-line string support for my stupid coding
This commit is contained in:
@@ -3,7 +3,7 @@ module.exports = function(__runtime__, scope){
|
||||
ui.__id_cache__ = {};
|
||||
|
||||
ui.layout = function(xml){
|
||||
view = ui.inflate(activity, xml);
|
||||
view = ui.inflate(activity, xml.toString());
|
||||
ui.setContentView(view);
|
||||
}
|
||||
|
||||
@@ -14,6 +14,8 @@ module.exports = function(__runtime__, scope){
|
||||
}
|
||||
|
||||
ui.id = function(id){
|
||||
if(!ui.view)
|
||||
return null;
|
||||
var v = ui.view.getChildAt(0).id(id);
|
||||
if(v){
|
||||
v = decorate(v);
|
||||
@@ -67,7 +69,7 @@ module.exports = function(__runtime__, scope){
|
||||
ui[name] = value;
|
||||
},
|
||||
get: function(name, start) {
|
||||
if(!ui[name]){
|
||||
if(!ui[name] && ui.view){
|
||||
var cacheView = ui.__id_cache__[name];
|
||||
if(cacheView){
|
||||
return cacheView;
|
||||
|
||||
@@ -2,6 +2,7 @@ package com.stardust.autojs.engine;
|
||||
|
||||
import android.util.Log;
|
||||
|
||||
import com.stardust.autojs.engine.preprocess.MultiLinePreprocessor;
|
||||
import com.stardust.autojs.engine.preprocess.Preprocessor;
|
||||
import com.stardust.autojs.rhino_android.AndroidContextFactory;
|
||||
import com.stardust.autojs.rhino_android.RhinoAndroidHelper;
|
||||
@@ -17,11 +18,9 @@ import org.mozilla.javascript.ScriptableObject;
|
||||
import org.mozilla.javascript.commonjs.module.RequireBuilder;
|
||||
import org.mozilla.javascript.commonjs.module.provider.SoftCachingModuleScriptProvider;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.io.Reader;
|
||||
import java.io.StringReader;
|
||||
import java.net.URI;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@@ -35,7 +34,6 @@ import java.util.concurrent.ConcurrentHashMap;
|
||||
public class RhinoJavaScriptEngine implements ScriptEngine {
|
||||
|
||||
private static final String LOG_TAG = "RhinoJavaScriptEngine";
|
||||
private static final Preprocessor PREPROCESSOR = new MultiLinePreprocessor();
|
||||
|
||||
private static int contextCount = 0;
|
||||
private String[] mRequirePath = new String[0];
|
||||
@@ -69,8 +67,8 @@ public class RhinoJavaScriptEngine implements ScriptEngine {
|
||||
}
|
||||
}
|
||||
|
||||
private Reader preprocess(Reader script) throws IOException {
|
||||
return PREPROCESSOR.preprocess(script);
|
||||
protected Reader preprocess(Reader script) throws IOException {
|
||||
return script;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.stardust.autojs.engine;
|
||||
package com.stardust.autojs.engine.preprocess;
|
||||
|
||||
import android.support.annotation.VisibleForTesting;
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
package com.stardust.autojs.engine;
|
||||
|
||||
import com.stardust.autojs.engine.preprocess.MultiLinePreprocessor;
|
||||
|
||||
import org.junit.Test;
|
||||
|
||||
import java.io.Reader;
|
||||
import java.io.StringReader;
|
||||
|
||||
import static org.junit.Assert.*;
|
||||
import static com.stardust.autojs.engine.MultiLinePreprocessor.*;
|
||||
|
||||
/**
|
||||
* Created by Stardust on 2017/5/15.
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user