Browse Source

eslint related file edits

AUTOMATIC 2 năm trước cách đây
mục cha
commit
57b75f4a03

+ 1 - 1
extensions-builtin/prompt-bracket-checker/javascript/prompt-bracket-checker.js

@@ -5,7 +5,7 @@
 
 
 function checkBrackets(textArea, counterElt) {
 function checkBrackets(textArea, counterElt) {
     var counts = {};
     var counts = {};
-    (textArea.value.match(/[(){}\[\]]/g) || []).forEach(bracket => {
+    (textArea.value.match(/[(){}[\]]/g) || []).forEach(bracket => {
         counts[bracket] = (counts[bracket] || 0) + 1;
         counts[bracket] = (counts[bracket] || 0) + 1;
     });
     });
     var errors = [];
     var errors = [];

+ 7 - 7
javascript/aspectRatioOverlay.js

@@ -50,21 +50,21 @@ function dimensionChange(e, is_width, is_height) {
         var scaledx = targetElement.naturalWidth * viewportscale;
         var scaledx = targetElement.naturalWidth * viewportscale;
         var scaledy = targetElement.naturalHeight * viewportscale;
         var scaledy = targetElement.naturalHeight * viewportscale;
 
 
-        var cleintRectTop    = (viewportOffset.top + window.scrollY);
-        var cleintRectLeft   = (viewportOffset.left + window.scrollX);
-        var cleintRectCentreY = cleintRectTop  + (targetElement.clientHeight / 2);
+        var cleintRectTop = (viewportOffset.top + window.scrollY);
+        var cleintRectLeft = (viewportOffset.left + window.scrollX);
+        var cleintRectCentreY = cleintRectTop + (targetElement.clientHeight / 2);
         var cleintRectCentreX = cleintRectLeft + (targetElement.clientWidth / 2);
         var cleintRectCentreX = cleintRectLeft + (targetElement.clientWidth / 2);
 
 
         var arscale = Math.min(scaledx / currentWidth, scaledy / currentHeight);
         var arscale = Math.min(scaledx / currentWidth, scaledy / currentHeight);
         var arscaledx = currentWidth * arscale;
         var arscaledx = currentWidth * arscale;
         var arscaledy = currentHeight * arscale;
         var arscaledy = currentHeight * arscale;
 
 
-        var arRectTop    = cleintRectCentreY - (arscaledy / 2);
-        var arRectLeft   = cleintRectCentreX - (arscaledx / 2);
-        var arRectWidth  = arscaledx;
+        var arRectTop = cleintRectCentreY - (arscaledy / 2);
+        var arRectLeft = cleintRectCentreX - (arscaledx / 2);
+        var arRectWidth = arscaledx;
         var arRectHeight = arscaledy;
         var arRectHeight = arscaledy;
 
 
-        arPreviewRect.style.top  = arRectTop + 'px';
+        arPreviewRect.style.top = arRectTop + 'px';
         arPreviewRect.style.left = arRectLeft + 'px';
         arPreviewRect.style.left = arRectLeft + 'px';
         arPreviewRect.style.width = arRectWidth + 'px';
         arPreviewRect.style.width = arRectWidth + 'px';
         arPreviewRect.style.height = arRectHeight + 'px';
         arPreviewRect.style.height = arRectHeight + 'px';

+ 5 - 5
javascript/contextMenus.js

@@ -1,5 +1,5 @@
 
 
-contextMenuInit = function() {
+var contextMenuInit = function() {
     let eventListenerApplied = false;
     let eventListenerApplied = false;
     let menuSpecs = new Map();
     let menuSpecs = new Map();
 
 
@@ -126,10 +126,10 @@ contextMenuInit = function() {
     return [appendContextMenuOption, removeContextMenuOption, addContextMenuEventListener];
     return [appendContextMenuOption, removeContextMenuOption, addContextMenuEventListener];
 };
 };
 
 
-initResponse = contextMenuInit();
-appendContextMenuOption     = initResponse[0];
-removeContextMenuOption     = initResponse[1];
-addContextMenuEventListener = initResponse[2];
+var initResponse = contextMenuInit();
+var appendContextMenuOption = initResponse[0];
+var removeContextMenuOption = initResponse[1];
+var addContextMenuEventListener = initResponse[2];
 
 
 (function() {
 (function() {
     //Start example Context Menu Items
     //Start example Context Menu Items

+ 2 - 2
javascript/extraNetworks.js

@@ -63,8 +63,8 @@ function setupExtraNetworks() {
 
 
 onUiLoaded(setupExtraNetworks);
 onUiLoaded(setupExtraNetworks);
 
 
-var re_extranet   =    /<([^:]+:[^:]+):[\d\.]+>/;
-var re_extranet_g = /\s+<([^:]+:[^:]+):[\d\.]+>/g;
+var re_extranet = /<([^:]+:[^:]+):[\d.]+>/;
+var re_extranet_g = /\s+<([^:]+:[^:]+):[\d.]+>/g;
 
 
 function tryToRemoveExtraNetworkFromPrompt(textarea, text) {
 function tryToRemoveExtraNetworkFromPrompt(textarea, text) {
     var m = text.match(re_extranet);
     var m = text.match(re_extranet);

+ 1 - 1
javascript/generationParams.js

@@ -10,7 +10,7 @@ onUiUpdate(function() {
     }
     }
     if (!modal) {
     if (!modal) {
         modal = gradioApp().getElementById('lightboxModal');
         modal = gradioApp().getElementById('lightboxModal');
-        modalObserver.observe(modal,  { attributes: true, attributeFilter: ['style'] });
+        modalObserver.observe(modal, {attributes: true, attributeFilter: ['style']});
     }
     }
 });
 });
 
 

+ 2 - 2
javascript/hints.js

@@ -1,6 +1,6 @@
 // mouseover tooltips for various UI elements
 // mouseover tooltips for various UI elements
 
 
-titles = {
+var titles = {
     "Sampling steps": "How many times to improve the generated image iteratively; higher values take longer; very low values can produce bad results",
     "Sampling steps": "How many times to improve the generated image iteratively; higher values take longer; very low values can produce bad results",
     "Sampling method": "Which algorithm to use to produce the image",
     "Sampling method": "Which algorithm to use to produce the image",
     "GFPGAN": "Restore low quality faces using GFPGAN neural network",
     "GFPGAN": "Restore low quality faces using GFPGAN neural network",
@@ -118,7 +118,7 @@ titles = {
 
 
 onUiUpdate(function() {
 onUiUpdate(function() {
     gradioApp().querySelectorAll('span, button, select, p').forEach(function(span) {
     gradioApp().querySelectorAll('span, button, select, p').forEach(function(span) {
-        if (span.title) return;  // already has a title
+        if (span.title) return; // already has a title
 
 
         let tooltip = localization[titles[span.textContent]] || titles[span.textContent];
         let tooltip = localization[titles[span.textContent]] || titles[span.textContent];
 
 

+ 0 - 1
javascript/imageMaskFix.js

@@ -5,7 +5,6 @@
 function imageMaskResize() {
 function imageMaskResize() {
     const canvases = gradioApp().querySelectorAll('#img2maskimg .touch-none canvas');
     const canvases = gradioApp().querySelectorAll('#img2maskimg .touch-none canvas');
     if (!canvases.length) {
     if (!canvases.length) {
-        canvases_fixed = false; // TODO: this is unused..?
         window.removeEventListener('resize', imageMaskResize);
         window.removeEventListener('resize', imageMaskResize);
         return;
         return;
     }
     }

+ 1 - 6
javascript/imageviewer.js

@@ -37,6 +37,7 @@ function updateOnBackgroundChange() {
         if (currentButton?.children?.length > 0 && modalImage.src != currentButton.children[0].src) {
         if (currentButton?.children?.length > 0 && modalImage.src != currentButton.children[0].src) {
             modalImage.src = currentButton.children[0].src;
             modalImage.src = currentButton.children[0].src;
             if (modalImage.style.display === 'none') {
             if (modalImage.style.display === 'none') {
+                const modal = gradioApp().getElementById("lightboxModal");
                 modal.style.setProperty('background-image', `url(${modalImage.src})`);
                 modal.style.setProperty('background-image', `url(${modalImage.src})`);
             }
             }
         }
         }
@@ -169,12 +170,6 @@ function modalTileImageToggle(event) {
     event.stopPropagation();
     event.stopPropagation();
 }
 }
 
 
-function galleryImageHandler(e) {
-    //if (e && e.parentElement.tagName == 'BUTTON') {
-    e.onclick = showGalleryImage;
-    //}
-}
-
 onUiUpdate(function() {
 onUiUpdate(function() {
     var fullImg_preview = gradioApp().querySelectorAll('.gradio-gallery > div > img');
     var fullImg_preview = gradioApp().querySelectorAll('.gradio-gallery > div > img');
     if (fullImg_preview != null) {
     if (fullImg_preview != null) {

+ 14 - 15
javascript/localization.js

@@ -1,10 +1,9 @@
 
 
 // localization = {} -- the dict with translations is created by the backend
 // localization = {} -- the dict with translations is created by the backend
 
 
-ignore_ids_for_localization = {
+var ignore_ids_for_localization = {
     setting_sd_hypernetwork: 'OPTION',
     setting_sd_hypernetwork: 'OPTION',
     setting_sd_model_checkpoint: 'OPTION',
     setting_sd_model_checkpoint: 'OPTION',
-    setting_realesrgan_enabled_models: 'OPTION',
     modelmerger_primary_model_name: 'OPTION',
     modelmerger_primary_model_name: 'OPTION',
     modelmerger_secondary_model_name: 'OPTION',
     modelmerger_secondary_model_name: 'OPTION',
     modelmerger_tertiary_model_name: 'OPTION',
     modelmerger_tertiary_model_name: 'OPTION',
@@ -19,11 +18,11 @@ ignore_ids_for_localization = {
     extras_upscaler_2: 'SPAN',
     extras_upscaler_2: 'SPAN',
 };
 };
 
 
-re_num = /^[\.\d]+$/;
-re_emoji = /[\p{Extended_Pictographic}\u{1F3FB}-\u{1F3FF}\u{1F9B0}-\u{1F9B3}]/u;
+var re_num = /^[.\d]+$/;
+var re_emoji = /[\p{Extended_Pictographic}\u{1F3FB}-\u{1F3FF}\u{1F9B0}-\u{1F9B3}]/u;
 
 
-original_lines = {};
-translated_lines = {};
+var original_lines = {};
+var translated_lines = {};
 
 
 function hasLocalization() {
 function hasLocalization() {
     return window.localization && Object.keys(window.localization).length > 0;
     return window.localization && Object.keys(window.localization).length > 0;
@@ -31,7 +30,7 @@ function hasLocalization() {
 
 
 function textNodesUnder(el) {
 function textNodesUnder(el) {
     var n, a = [], walk = document.createTreeWalker(el, NodeFilter.SHOW_TEXT, null, false);
     var n, a = [], walk = document.createTreeWalker(el, NodeFilter.SHOW_TEXT, null, false);
-    while (n = walk.nextNode()) a.push(n);
+    while ((n = walk.nextNode())) a.push(n);
     return a;
     return a;
 }
 }
 
 
@@ -64,7 +63,7 @@ function getTranslation(text) {
         original_lines[text] = 1;
         original_lines[text] = 1;
     }
     }
 
 
-    tl = localization[text];
+    var tl = localization[text];
     if (tl !== undefined) {
     if (tl !== undefined) {
         translated_lines[tl] = 1;
         translated_lines[tl] = 1;
     }
     }
@@ -77,7 +76,7 @@ function processTextNode(node) {
 
 
     if (!canBeTranslated(node, text)) return;
     if (!canBeTranslated(node, text)) return;
 
 
-    tl = getTranslation(text);
+    var tl = getTranslation(text);
     if (tl !== undefined) {
     if (tl !== undefined) {
         node.textContent = tl;
         node.textContent = tl;
     }
     }
@@ -90,14 +89,14 @@ function processNode(node) {
     }
     }
 
 
     if (node.title) {
     if (node.title) {
-        tl = getTranslation(node.title);
+        let tl = getTranslation(node.title);
         if (tl !== undefined) {
         if (tl !== undefined) {
             node.title = tl;
             node.title = tl;
         }
         }
     }
     }
 
 
     if (node.placeholder) {
     if (node.placeholder) {
-        tl = getTranslation(node.placeholder);
+        let tl = getTranslation(node.placeholder);
         if (tl !== undefined) {
         if (tl !== undefined) {
             node.placeholder = tl;
             node.placeholder = tl;
         }
         }
@@ -157,21 +156,21 @@ document.addEventListener("DOMContentLoaded", function() {
 
 
     processNode(gradioApp());
     processNode(gradioApp());
 
 
-    if (localization.rtl) {  // if the language is from right to left,
+    if (localization.rtl) { // if the language is from right to left,
         (new MutationObserver((mutations, observer) => { // wait for the style to load
         (new MutationObserver((mutations, observer) => { // wait for the style to load
             mutations.forEach(mutation => {
             mutations.forEach(mutation => {
                 mutation.addedNodes.forEach(node => {
                 mutation.addedNodes.forEach(node => {
                     if (node.tagName === 'STYLE') {
                     if (node.tagName === 'STYLE') {
                         observer.disconnect();
                         observer.disconnect();
 
 
-                        for (const x of node.sheet.rules) {  // find all rtl media rules
+                        for (const x of node.sheet.rules) { // find all rtl media rules
                             if (Array.from(x.media || []).includes('rtl')) {
                             if (Array.from(x.media || []).includes('rtl')) {
-                                x.media.appendMedium('all');  // enable them
+                                x.media.appendMedium('all'); // enable them
                             }
                             }
                         }
                         }
                     }
                     }
                 });
                 });
             });
             });
-        })).observe(gradioApp(), { childList: true });
+        })).observe(gradioApp(), {childList: true});
     }
     }
 });
 });

+ 2 - 2
javascript/progressbar.js

@@ -53,7 +53,7 @@ function setTitle(progress) {
     }
     }
 
 
     if (document.title != title) {
     if (document.title != title) {
-        document.title =  title;
+        document.title = title;
     }
     }
 }
 }
 
 
@@ -144,7 +144,7 @@ function requestProgress(id_task, progressbarContainer, gallery, atEnd, onProgre
 
 
 
 
             if (res.live_preview && gallery) {
             if (res.live_preview && gallery) {
-                var rect = gallery.getBoundingClientRect();
+                rect = gallery.getBoundingClientRect();
                 if (rect.width) {
                 if (rect.width) {
                     livePreview.style.width = rect.width + "px";
                     livePreview.style.width = rect.width + "px";
                     livePreview.style.height = rect.height + "px";
                     livePreview.style.height = rect.height + "px";

+ 8 - 14
javascript/ui.js

@@ -99,13 +99,6 @@ function switch_to_inpaint_sketch() {
     return args_to_array(arguments);
     return args_to_array(arguments);
 }
 }
 
 
-function switch_to_inpaint() {
-    gradioApp().querySelector('#tabs').querySelectorAll('button')[1].click();
-    gradioApp().getElementById('mode_img2img').querySelectorAll('button')[2].click();
-
-    return args_to_array(arguments);
-}
-
 function switch_to_extras() {
 function switch_to_extras() {
     gradioApp().querySelector('#tabs').querySelectorAll('button')[2].click();
     gradioApp().querySelector('#tabs').querySelectorAll('button')[2].click();
 
 
@@ -172,7 +165,6 @@ function showRestoreProgressButton(tabname, show) {
 }
 }
 
 
 function submit() {
 function submit() {
-    rememberGallerySelection('txt2img_gallery');
     showSubmitButtons('txt2img', false);
     showSubmitButtons('txt2img', false);
 
 
     var id = randomId();
     var id = randomId();
@@ -192,7 +184,6 @@ function submit() {
 }
 }
 
 
 function submit_img2img() {
 function submit_img2img() {
-    rememberGallerySelection('img2img_gallery');
     showSubmitButtons('img2img', false);
     showSubmitButtons('img2img', false);
 
 
     var id = randomId();
     var id = randomId();
@@ -273,7 +264,7 @@ function confirm_clear_prompt(prompt, negative_prompt) {
 }
 }
 
 
 
 
-promptTokecountUpdateFuncs = {};
+var promptTokecountUpdateFuncs = {};
 
 
 function recalculatePromptTokens(name) {
 function recalculatePromptTokens(name) {
     if (promptTokecountUpdateFuncs[name]) {
     if (promptTokecountUpdateFuncs[name]) {
@@ -304,7 +295,8 @@ onUiUpdate(function() {
     var textarea = json_elem.querySelector('textarea');
     var textarea = json_elem.querySelector('textarea');
     var jsdata = textarea.value;
     var jsdata = textarea.value;
     opts = JSON.parse(jsdata);
     opts = JSON.parse(jsdata);
-    executeCallbacks(optionsChangedCallbacks);
+
+    executeCallbacks(optionsChangedCallbacks); /*global optionsChangedCallbacks*/
 
 
     Object.defineProperty(textarea, 'value', {
     Object.defineProperty(textarea, 'value', {
         set: function(newValue) {
         set: function(newValue) {
@@ -390,7 +382,9 @@ function update_txt2img_tokens(...args) {
 }
 }
 
 
 function update_img2img_tokens(...args) {
 function update_img2img_tokens(...args) {
-    update_token_counter("img2img_token_button");
+    update_token_counter(
+        "img2img_token_button"
+    );
     if (args.length == 2) {
     if (args.length == 2) {
         return args[0];
         return args[0];
     }
     }
@@ -423,7 +417,7 @@ function restart_reload() {
 // Simulate an `input` DOM event for Gradio Textbox component. Needed after you edit its contents in javascript, otherwise your edits
 // Simulate an `input` DOM event for Gradio Textbox component. Needed after you edit its contents in javascript, otherwise your edits
 // will only visible on web page and not sent to python.
 // will only visible on web page and not sent to python.
 function updateInput(target) {
 function updateInput(target) {
-    let e = new Event("input", { bubbles: true });
+    let e = new Event("input", {bubbles: true});
     Object.defineProperty(e, "target", {value: target});
     Object.defineProperty(e, "target", {value: target});
     target.dispatchEvent(e);
     target.dispatchEvent(e);
 }
 }
@@ -435,7 +429,7 @@ function selectCheckpoint(name) {
     gradioApp().getElementById('change_checkpoint').click();
     gradioApp().getElementById('change_checkpoint').click();
 }
 }
 
 
-function currentImg2imgSourceResolution(_, _, scaleBy) {
+function currentImg2imgSourceResolution(w, h, scaleBy) {
     var img = gradioApp().querySelector('#mode_img2img > div[style="display: block;"] img');
     var img = gradioApp().querySelector('#mode_img2img > div[style="display: block;"] img');
     return img ? [img.naturalWidth, img.naturalHeight, scaleBy] : [0, 0, scaleBy];
     return img ? [img.naturalWidth, img.naturalHeight, scaleBy] : [0, 0, scaleBy];
 }
 }

+ 3 - 3
javascript/ui_settings_hints.js

@@ -1,6 +1,6 @@
 // various hints and extra info for the settings tab
 // various hints and extra info for the settings tab
 
 
-settingsHintsSetup = false;
+var settingsHintsSetup = false;
 
 
 onOptionsChanged(function() {
 onOptionsChanged(function() {
     if (settingsHintsSetup) return;
     if (settingsHintsSetup) return;
@@ -30,7 +30,7 @@ onOptionsChanged(function() {
             span.parentElement.insertBefore(document.createTextNode('\xa0'), span);
             span.parentElement.insertBefore(document.createTextNode('\xa0'), span);
         }
         }
         if (commentAfter) {
         if (commentAfter) {
-            var comment = document.createElement('DIV');
+            comment = document.createElement('DIV');
             comment.className = 'settings-comment';
             comment.className = 'settings-comment';
             comment.innerHTML = commentAfter;
             comment.innerHTML = commentAfter;
             span.parentElement.insertBefore(comment, span.nextSibling);
             span.parentElement.insertBefore(comment, span.nextSibling);
@@ -50,7 +50,7 @@ function settingsHintsShowQuicksettings() {
             td.textContent = obj.name;
             td.textContent = obj.name;
             tr.appendChild(td);
             tr.appendChild(td);
 
 
-            var td = document.createElement('td');
+            td = document.createElement('td');
             td.textContent = obj.label;
             td.textContent = obj.label;
             tr.appendChild(td);
             tr.appendChild(td);
 
 

+ 8 - 8
script.js

@@ -18,11 +18,11 @@ function get_uiCurrentTabContent() {
     return gradioApp().querySelector('.tabitem[id^=tab_]:not([style*="display: none"])');
     return gradioApp().querySelector('.tabitem[id^=tab_]:not([style*="display: none"])');
 }
 }
 
 
-uiUpdateCallbacks = [];
-uiLoadedCallbacks = [];
-uiTabChangeCallbacks = [];
-optionsChangedCallbacks = [];
-let uiCurrentTab = null;
+var uiUpdateCallbacks = [];
+var uiLoadedCallbacks = [];
+var uiTabChangeCallbacks = [];
+var optionsChangedCallbacks = [];
+var uiCurrentTab = null;
 
 
 function onUiUpdate(callback) {
 function onUiUpdate(callback) {
     uiUpdateCallbacks.push(callback);
     uiUpdateCallbacks.push(callback);
@@ -66,7 +66,7 @@ document.addEventListener("DOMContentLoaded", function() {
             executeCallbacks(uiTabChangeCallbacks);
             executeCallbacks(uiTabChangeCallbacks);
         }
         }
     });
     });
-    mutationObserver.observe(gradioApp(), { childList: true, subtree: true });
+    mutationObserver.observe(gradioApp(), {childList: true, subtree: true});
 });
 });
 
 
 /**
 /**
@@ -80,7 +80,7 @@ document.addEventListener('keydown', function(e) {
         if ((e.keyCode == 13 && (e.metaKey || e.ctrlKey || e.altKey))) handled = true;
         if ((e.keyCode == 13 && (e.metaKey || e.ctrlKey || e.altKey))) handled = true;
     }
     }
     if (handled) {
     if (handled) {
-        button = get_uiCurrentTabContent().querySelector('button[id$=_generate]');
+        var button = get_uiCurrentTabContent().querySelector('button[id$=_generate]');
         if (button) {
         if (button) {
             button.click();
             button.click();
         }
         }
@@ -97,7 +97,7 @@ function uiElementIsVisible(el) {
         return false;
         return false;
     }
     }
 
 
-    while (isVisible = el.closest('.tabitem')?.style.display !== 'none') {
+    while ((isVisible = el.closest('.tabitem')?.style.display) !== 'none') {
         if (!isVisible) {
         if (!isVisible) {
             return false;
             return false;
         } else if (el.parentElement) {
         } else if (el.parentElement) {