tt/AutoJs6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix https://github.com/hyb1996/Auto.js/issues/446

Browse Source
This commit is contained in:
hyb1996
2019-01-22 10:25:06 +08:00
parent e28adc4931
commit 1865ac8d0e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
autojs/src/main/assets/modules/__dialogs__.js
View File

@@ -155,7 +155,7 @@ module.exports = function(__runtime__, scope){
builder.input(wrapNonNullString(properties.inputHint), wrapNonNullString(properties.inputPrefill), builder.input(wrapNonNullString(properties.inputHint), wrapNonNullString(properties.inputPrefill),
function(dialog, input){ function(dialog, input){
input = input.toString(); input = input.toString();
dialog.emit("input_change", dialog, input); builder.dialog.emit("input_change", builder.dialog, input);
}) })
.alwaysCallInputCallback(); .alwaysCallInputCallback();
} }
@@ -163,23 +163,23 @@ module.exports = function(__runtime__, scope){
var itemsSelectMode = properties.itemsSelectMode; var itemsSelectMode = properties.itemsSelectMode;
if(itemsSelectMode == undefined || itemsSelectMode == 'select'){ if(itemsSelectMode == undefined || itemsSelectMode == 'select'){
builder.itemsCallback(function(dialog, view, position, text){ builder.itemsCallback(function(dialog, view, position, text){
dialog.emit("item_select", position, text.toString(), dialog); builder.dialog.emit("item_select", position, text.toString(), builder.dialog);
}); });
}else if(itemsSelectMode == 'single'){ }else if(itemsSelectMode == 'single'){
builder.itemsCallbackSingleChoice(properties.itemsSelectedIndex == undefined ? -1 : properties.itemsSelectedIndex, builder.itemsCallbackSingleChoice(properties.itemsSelectedIndex == undefined ? -1 : properties.itemsSelectedIndex,
function(dialog, view, which, text){ function(dialog, view, which, text){
dialog.emit("single_choice", which, text.toString(), dialog); builder.dialog.emit("single_choice", which, text.toString(), builder.dialog);
return true; return true;
}); });
}else if(itemsSelectMode == 'multi'){ }else if(itemsSelectMode == 'multi'){
builder.itemsCallbackMultiChoice(properties.itemsSelectedIndex == undefined ? null : properties.itemsSelectedIndex, builder.itemsCallbackMultiChoice(properties.itemsSelectedIndex == undefined ? null : properties.itemsSelectedIndex,
function(dialog, view, indices, texts){ function(dialog, view, indices, texts){
dialog.emit("multi_choice", toJsArray(indices, (l, i)=> parseInt(l.get(i)), builder.dialog.emit("multi_choice", toJsArray(indices, (l, i)=> parseInt(l.get(i)),
toJsArray(texts, (l, i)=> l.get(i).toString())), dialog); toJsArray(texts, (l, i)=> l.get(i).toString())), builder.dialog);
return true; return true;
}); });
}else{ }else{
throw new Error("unknown itemsSelecteMode " + itemsSelectMode); throw new Error("unknown itemsSelectMode " + itemsSelectMode);
} }
} }
if(properties.progress != undefined){ if(properties.progress != undefined){