diff --git a/javascript/old_six_prompt.js b/javascript/old_six_prompt.js index b42da58..2f8ca54 100644 --- a/javascript/old_six_prompt.js +++ b/javascript/old_six_prompt.js @@ -49,13 +49,51 @@ function CreateEle(type,parentDom,css,html){ return dom } + function addPrompt(e) { + let dom=e.target; + let str= e.target.dataset.sixoldtit + + let elementprompt =e.target.dataset.pageindex==1 ? Elements.imgpromt : Elements.txtpromt + dom.classList.toggle("active") + toggleNavCss(dom) + ishas=false; + for (const item of dom.classList) { + if(item=='active'){ + ishas=true + } + } + if(!ishas){ + + if(elementprompt.value.includes(str+':')){ + const teststr=`${str},|\\(${str}:\\d+\\.\\d+\\),` + const regex =new RegExp(teststr); + console.log(regex.test(elementprompt.value)); + elementprompt.value= elementprompt.value.replace(regex,''); + + } + else{ + elementprompt.value= elementprompt.value.replace(str+',',''); + } + return + } + + InserttextToTextArea(elementprompt,str) + +} + + function addNPrompt(e) { - let elementprompt = e.target.dataset.pageindex==1 ? Elements.imgnpromt : Elements.txtnpromt + let elementprompt = e.target.dataset.pageindex==1 ? Elements.imgnpromt : Elements.txtnpromt elementprompt.focus(); document.execCommand('insertText', false, e.target.dataset.sixoldtit + ',') } +function InserttextToTextArea(inputelem,val){ + inputelem.value+=val+',' + updateInput(inputelem) +} + function getParentBycss(obj,css) { let parent=obj @@ -90,40 +128,6 @@ function toggleNavCss(dom){ } -function addPrompt(e) { - let dom=e.target; - let str= e.target.dataset.sixoldtit - - let elementprompt =e.target.dataset.pageindex==1 ? Elements.imgpromt : Elements.txtpromt - dom.classList.toggle("active") - toggleNavCss(dom) - ishas=false; - for (const item of dom.classList) { - if(item=='active'){ - ishas=true - } - } - if(!ishas){ - - if(elementprompt.value.includes(str+':')){ - const teststr=`${str},|\\(${str}:\\d+\\.\\d+\\),` - const regex =new RegExp(teststr); - console.log(regex.test(elementprompt.value)); - elementprompt.value= elementprompt.value.replace(regex,''); - - } - else{ - elementprompt.value= elementprompt.value.replace(str+',',''); - - } - return - } - str=str+',' - elementprompt.focus(); - document.execCommand('insertText', false,str) - - -} @@ -416,8 +420,6 @@ onUiLoaded(async => { elementprompt.value='' elementprompt.focus(); let str=Elements.RdtxtAreasEn[index].value - // console.log(str); - // document.execCommand('selectAll', false); document.execCommand('insertText', false,str); }) }) @@ -425,7 +427,7 @@ onUiLoaded(async => { loadCustomUI() - + }) @@ -440,3 +442,6 @@ onUiLoaded(async => { + + + diff --git a/scripts/__pycache__/old_six_prompt.cpython-310.pyc b/scripts/__pycache__/old_six_prompt.cpython-310.pyc index 9c03b3a..6d34ec6 100644 Binary files a/scripts/__pycache__/old_six_prompt.cpython-310.pyc and b/scripts/__pycache__/old_six_prompt.cpython-310.pyc differ diff --git a/scripts/old_six_prompt.py b/scripts/old_six_prompt.py index b3a72ad..32acf08 100644 --- a/scripts/old_six_prompt.py +++ b/scripts/old_six_prompt.py @@ -42,7 +42,11 @@ class Script(scripts.Script): rdlist=loadRandomList() json= LoadTagsFile() randomIndex=0 + txtprompt=None + def after_component(self, component, **kwargs): + if(component.elem_id=="txt2img_prompt" or component.elem_id=="img2img_prompt"): + self.txtprompt=component def title(self): return "Old_Six" @@ -97,7 +101,8 @@ class Script(scripts.Script): return [btnreload] - + # def process(self, p, *args): + # pass