|
|
@@ -4440,10 +4440,11 @@ function initCallbackEditor()
|
|
|
|
|
|
model.callTip.installCallTipOnce(ui.callback, ns_list);
|
|
|
if(model.callTip.installPane(ui.callback, ns_list))return [];
|
|
|
-
|
|
|
+
|
|
|
if(!(ret = model.callTip.getPredefineNS(ns_list)))
|
|
|
{
|
|
|
ns_list = model.callTip.preThisNS(ns_list);
|
|
|
+
|
|
|
ret = model.getNamespaceList(ui.forms.value, ns_list);
|
|
|
|
|
|
if(ns_list.length == 1)
|
|
|
@@ -4456,12 +4457,19 @@ function initCallbackEditor()
|
|
|
varLocalList = varLocalList.filter(item=>{
|
|
|
return item.indexOf(ns) == 0;
|
|
|
});
|
|
|
-
|
|
|
- ret = ret.concat(varLocalList);
|
|
|
+
|
|
|
+ if(ret)
|
|
|
+ {
|
|
|
+ ret = ret.concat(varLocalList);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ ret = varLocalList;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if(model.callTip.installGlobalVarCallTipOnce(ui.callback, ret, ns_list))return [];
|
|
|
+ if(ret && model.callTip.installGlobalVarCallTipOnce(ui.callback, ret, ns_list))return [];
|
|
|
}
|
|
|
|
|
|
/*
|