Fix a whole bunch of implicit globals

13 files changed, 60 insertions, 62 deletions

diff --git a/javascript/aspectRatioOverlay.js b/javascript/aspectRatioOverlay.js
index a8278cca..10ac81c7 100644
--- a/javascript/aspectRatioOverlay.js
+++ b/javascript/aspectRatioOverlay.js
@@ -45,27 +45,27 @@ function dimensionChange(e, is_width, is_height){
 

 		var viewportOffset = targetElement.getBoundingClientRect();

 

-		viewportscale = Math.min(  targetElement.clientWidth/targetElement.naturalWidth, targetElement.clientHeight/targetElement.naturalHeight )

+		var viewportscale = Math.min(  targetElement.clientWidth/targetElement.naturalWidth, targetElement.clientHeight/targetElement.naturalHeight )

 

-		scaledx = targetElement.naturalWidth*viewportscale

-		scaledy = targetElement.naturalHeight*viewportscale

+		var scaledx = targetElement.naturalWidth*viewportscale

+		var scaledy = targetElement.naturalHeight*viewportscale

 

-		cleintRectTop    = (viewportOffset.top+window.scrollY)

-		cleintRectLeft   = (viewportOffset.left+window.scrollX)

-		cleintRectCentreY = cleintRectTop  + (targetElement.clientHeight/2)

-		cleintRectCentreX = cleintRectLeft + (targetElement.clientWidth/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)

 

-		viewRectTop    = cleintRectCentreY-(scaledy/2)

-		viewRectLeft   = cleintRectCentreX-(scaledx/2)

-		arRectWidth  = scaledx

-		arRectHeight = scaledy

+		var viewRectTop    = cleintRectCentreY-(scaledy/2)  // TODO: unused?

+		var viewRectLeft   = cleintRectCentreX-(scaledx/2)  // TODO: unused?

+		var arRectWidth  = scaledx

+		var arRectHeight = scaledy

 

-		arscale = Math.min(  arRectWidth/currentWidth, arRectHeight/currentHeight )

-		arscaledx = currentWidth*arscale

-		arscaledy = currentHeight*arscale

+		var arscale = Math.min(  arRectWidth/currentWidth, arRectHeight/currentHeight )

+		var arscaledx = currentWidth*arscale

+		var arscaledy = currentHeight*arscale

 

-		arRectTop    = cleintRectCentreY-(arscaledy/2)

-		arRectLeft   = cleintRectCentreX-(arscaledx/2)

+		var arRectTop    = cleintRectCentreY-(arscaledy/2)

+		var arRectLeft   = cleintRectCentreX-(arscaledx/2)

 		arRectWidth  = arscaledx

 		arRectHeight = arscaledy

 

diff --git a/javascript/contextMenus.js b/javascript/contextMenus.js
index 9468c107..5107e524 100644
--- a/javascript/contextMenus.js
+++ b/javascript/contextMenus.js
@@ -16,8 +16,7 @@ contextMenuInit = function(){
       oldMenu.remove()

     }

 

-    let tabButton = uiCurrentTab

-    let baseStyle = window.getComputedStyle(tabButton)

+    let baseStyle = window.getComputedStyle(uiCurrentTab)

 

     const contextMenu = document.createElement('nav')

     contextMenu.id = "context-menu"

@@ -63,7 +62,7 @@ contextMenuInit = function(){
 

   function appendContextMenuOption(targetElementSelector,entryName,entryFunction){

 

-    currentItems = menuSpecs.get(targetElementSelector)

+    var currentItems = menuSpecs.get(targetElementSelector)

 

     if(!currentItems){

       currentItems = []

diff --git a/javascript/edit-attention.js b/javascript/edit-attention.js
index 588c7b77..d2c2f190 100644
--- a/javascript/edit-attention.js
+++ b/javascript/edit-attention.js
@@ -69,8 +69,8 @@ function keyupEditAttention(event){
 

 	event.preventDefault();

 

-    closeCharacter = ')'

-    delta = opts.keyedit_precision_attention

+    var closeCharacter = ')'

+    var delta = opts.keyedit_precision_attention

 

     if (selectionStart > 0 && text[selectionStart - 1] == '<'){

         closeCharacter = '>'

@@ -91,8 +91,8 @@ function keyupEditAttention(event){
         selectionEnd += 1;

     }

 

-	end = text.slice(selectionEnd + 1).indexOf(closeCharacter) + 1;

-	weight = parseFloat(text.slice(selectionEnd + 1, selectionEnd + 1 + end));

+	var end = text.slice(selectionEnd + 1).indexOf(closeCharacter) + 1;

+	var weight = parseFloat(text.slice(selectionEnd + 1, selectionEnd + 1 + end));

 	if (isNaN(weight)) return;

 

 	weight += isPlus ? delta : -delta;

diff --git a/javascript/extensions.js b/javascript/extensions.js
index 3c2f995a..872259af 100644
--- a/javascript/extensions.js
+++ b/javascript/extensions.js
@@ -41,7 +41,7 @@ function install_extension_from_index(button, url){
     button.disabled = "disabled"

     button.value = "Installing..."

 

-    textarea = gradioApp().querySelector('#extension_to_install textarea')

+    var textarea = gradioApp().querySelector('#extension_to_install textarea')

     textarea.value = url

     updateInput(textarea)

 

diff --git a/javascript/extraNetworks.js b/javascript/extraNetworks.js
index 25322138..963d5b02 100644
--- a/javascript/extraNetworks.js
+++ b/javascript/extraNetworks.js
@@ -11,10 +11,10 @@ function setupExtraNetworksForTab(tabname){
     tabs.appendChild(refresh)

 

     search.addEventListener("input", function(evt){

-        searchTerm = search.value.toLowerCase()

+        var searchTerm = search.value.toLowerCase()

 

         gradioApp().querySelectorAll('#'+tabname+'_extra_tabs div.card').forEach(function(elem){

-            text = elem.querySelector('.name').textContent.toLowerCase() + " " + elem.querySelector('.search_term').textContent.toLowerCase()

+            var text = elem.querySelector('.name').textContent.toLowerCase() + " " + elem.querySelector('.search_term').textContent.toLowerCase()

             elem.style.display = text.indexOf(searchTerm) == -1 ? "none" : ""

         })

     });

@@ -96,9 +96,9 @@ function saveCardPreview(event, tabname, filename){
 }

 

 function extraNetworksSearchButton(tabs_id, event){

-    searchTextarea = gradioApp().querySelector("#" + tabs_id + ' > div > textarea')

-    button = event.target

-    text = button.classList.contains("search-all") ? "" : button.textContent.trim()

+    var searchTextarea = gradioApp().querySelector("#" + tabs_id + ' > div > textarea')

+    var button = event.target

+    var text = button.classList.contains("search-all") ? "" : button.textContent.trim()

 

     searchTextarea.value = text

     updateInput(searchTextarea)

@@ -133,7 +133,7 @@ function popup(contents){
 }

 

 function extraNetworksShowMetadata(text){

-    elem = document.createElement('pre')

+    var elem = document.createElement('pre')

     elem.classList.add('popup-metadata');

     elem.textContent = text;

 

@@ -165,7 +165,7 @@ function requestGet(url, data, handler, errorHandler){
 }

 

 function extraNetworksRequestMetadata(event, extraPage, cardName){

-    showError = function(){ extraNetworksShowMetadata("there was an error getting metadata"); }

+    var showError = function(){ extraNetworksShowMetadata("there was an error getting metadata"); }

 

     requestGet("./sd_extra_networks/metadata", {"page": extraPage, "item": cardName}, function(data){

         if(data && data.metadata){

diff --git a/javascript/generationParams.js b/javascript/generationParams.js
index 1266a266..ef64ee2e 100644
--- a/javascript/generationParams.js
+++ b/javascript/generationParams.js
@@ -23,7 +23,7 @@ let modalObserver = new MutationObserver(function(mutations) {
 });
 
 function attachGalleryListeners(tab_name) {
-	gallery = gradioApp().querySelector('#'+tab_name+'_gallery')
+	var gallery = gradioApp().querySelector('#'+tab_name+'_gallery')
 	gallery?.addEventListener('click', () => gradioApp().getElementById(tab_name+"_generation_info_button").click());
 	gallery?.addEventListener('keydown', (e) => {
 		if (e.keyCode == 37 || e.keyCode == 39) // left or right arrow
diff --git a/javascript/hires_fix.js b/javascript/hires_fix.js
index ba175301..48196be4 100644
--- a/javascript/hires_fix.js
+++ b/javascript/hires_fix.js
@@ -4,9 +4,9 @@ function onCalcResolutionHires(enable, width, height, hr_scale, hr_resize_x, hr_
         elem.classList.toggle('inactive', !!inactive)

     }

 

-    hrUpscaleBy = gradioApp().getElementById('txt2img_hr_scale')

-    hrResizeX = gradioApp().getElementById('txt2img_hr_resize_x')

-    hrResizeY = gradioApp().getElementById('txt2img_hr_resize_y')

+    var hrUpscaleBy = gradioApp().getElementById('txt2img_hr_scale')

+    var hrResizeX = gradioApp().getElementById('txt2img_hr_resize_x')

+    var hrResizeY = gradioApp().getElementById('txt2img_hr_resize_y')

 

     gradioApp().getElementById('txt2img_hires_fix_row2').style.display = opts.use_old_hires_fix_width_height ? "none" : ""

 

diff --git a/javascript/imageMaskFix.js b/javascript/imageMaskFix.js
index 6a82928e..bd0be627 100644
--- a/javascript/imageMaskFix.js
+++ b/javascript/imageMaskFix.js
@@ -5,7 +5,7 @@
 function imageMaskResize() {
     const canvases = gradioApp().querySelectorAll('#img2maskimg .touch-none canvas');
     if ( ! canvases.length ) {
-    canvases_fixed = false;
+    canvases_fixed = false; // TODO: this is unused..?
     window.removeEventListener( 'resize', imageMaskResize );
     return;
     }
diff --git a/javascript/imageviewer.js b/javascript/imageviewer.js
index f364a2a1..32066ab8 100644
--- a/javascript/imageviewer.js
+++ b/javascript/imageviewer.js
@@ -57,7 +57,7 @@ function modalImageSwitch(offset) {
         })
 
         if (result != -1) {
-            nextButton = galleryButtons[negmod((result + offset), galleryButtons.length)]
+            var nextButton = galleryButtons[negmod((result + offset), galleryButtons.length)]
             nextButton.click()
             const modalImage = gradioApp().getElementById("modalImage");
             const modal = gradioApp().getElementById("lightboxModal");
@@ -148,7 +148,7 @@ function modalZoomSet(modalImage, enable) {
 }
 
 function modalZoomToggle(event) {
-    modalImage = gradioApp().getElementById("modalImage");
+    var modalImage = gradioApp().getElementById("modalImage");
     modalZoomSet(modalImage, !modalImage.classList.contains('modalImageFullscreen'))
     event.stopPropagation()
 }
@@ -175,7 +175,7 @@ function galleryImageHandler(e) {
 }
 
 onUiUpdate(function() {
-    fullImg_preview = gradioApp().querySelectorAll('.gradio-gallery > div > img')
+    var fullImg_preview = gradioApp().querySelectorAll('.gradio-gallery > div > img')
     if (fullImg_preview != null) {
         fullImg_preview.forEach(setupImageForLightbox);
     }
diff --git a/javascript/localization.js b/javascript/localization.js
index 1a5a1dbb..e1ffa271 100644
--- a/javascript/localization.js
+++ b/javascript/localization.js
@@ -35,11 +35,11 @@ function canBeTranslated(node, text){
     if(! text) return false;

     if(! node.parentElement) return false;

 

-    parentType = node.parentElement.nodeName

+    var parentType = node.parentElement.nodeName

     if(parentType=='SCRIPT' || parentType=='STYLE' || parentType=='TEXTAREA') return false;

 

     if (parentType=='OPTION' || parentType=='SPAN'){

-        pnode = node

+        var pnode = node

         for(var level=0; level<4; level++){

             pnode = pnode.parentElement

             if(! pnode) break;

@@ -69,7 +69,7 @@ function getTranslation(text){
 }

 

 function processTextNode(node){

-    text = node.textContent.trim()

+    var text = node.textContent.trim()

 

     if(! canBeTranslated(node, text)) return

 

@@ -105,7 +105,7 @@ function processNode(node){
 }

 

 function dumpTranslations(){

-    dumped = {}

+    var dumped = {}

     if (localization.rtl) {

         dumped.rtl = true

     }

@@ -151,7 +151,7 @@ document.addEventListener("DOMContentLoaded", function() {
 })

 

 function download_localization() {

-    text = JSON.stringify(dumpTranslations(), null, 4)

+    var text = JSON.stringify(dumpTranslations(), null, 4)

 

     var element = document.createElement('a');

     element.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(text));

diff --git a/javascript/notification.js b/javascript/notification.js
index 8ddd4c5d..a40de7c3 100644
--- a/javascript/notification.js
+++ b/javascript/notification.js
@@ -2,7 +2,7 @@
 
 let lastHeadImg = null;
 
-notificationButton = null
+let notificationButton = null;
 
 onUiUpdate(function(){
     if(notificationButton == null){
diff --git a/javascript/progressbar.js b/javascript/progressbar.js
index 23bbf298..7b853a40 100644
--- a/javascript/progressbar.js
+++ b/javascript/progressbar.js
@@ -10,7 +10,6 @@ function getGallerySelectedIndex(id_gallery){
 
 function request(url, data, handler, errorHandler){
     var xhr = new XMLHttpRequest();
-    var url = url;
     xhr.open("POST", url, true);
     xhr.setRequestHeader("Content-Type", "application/json");
     xhr.onreadystatechange = function () {
@@ -107,7 +106,7 @@ function requestProgress(id_task, progressbarContainer, gallery, atEnd, onProgre
                 divProgress.style.width = rect.width + "px";
             }
 
-            progressText = ""
+            let progressText = ""
 
             divInner.style.width = ((res.progress || 0) * 100.0) + '%'
             divInner.style.background = res.progress ? "" : "transparent"
diff --git a/javascript/ui.js b/javascript/ui.js
index e14b33f5..fed96f98 100644
--- a/javascript/ui.js
+++ b/javascript/ui.js
@@ -1,7 +1,7 @@
 // various functions for interaction with ui.py not large enough to warrant putting them in separate files
 
 function set_theme(theme){
-    gradioURL = window.location.href
+    var gradioURL = window.location.href
     if (!gradioURL.includes('?__theme=')) {
       window.location.replace(gradioURL + '?__theme=' + theme);
     }
@@ -47,7 +47,7 @@ function extract_image_from_gallery(gallery){
         return [gallery[0]];
     }
 
-    index = selected_gallery_index()
+    var index = selected_gallery_index()
 
     if (index < 0 || index >= gallery.length){
         // Use the first image in the gallery as the default
@@ -58,7 +58,7 @@ function extract_image_from_gallery(gallery){
 }
 
 function args_to_array(args){
-    res = []
+    var res = []
     for(var i=0;i<args.length;i++){
         res.push(args[i])
     }
@@ -138,7 +138,7 @@ function get_img2img_tab_index() {
 }
 
 function create_submit_args(args){
-    res = []
+    var res = []
     for(var i=0;i<args.length;i++){
         res.push(args[i])
     }
@@ -160,7 +160,7 @@ function showSubmitButtons(tabname, show){
 }
 
 function showRestoreProgressButton(tabname, show){
-    button = gradioApp().getElementById(tabname + "_restore_progress")
+    var button = gradioApp().getElementById(tabname + "_restore_progress")
     if(! button) return
 
     button.style.display = show ? "flex" : "none"
@@ -208,7 +208,7 @@ function submit_img2img(){
 }
 
 function restoreProgressTxt2img(x){
-    id = localStorage.getItem("txt2img_task_id")
+    var id = localStorage.getItem("txt2img_task_id")
 
     if(id) {
         requestProgress(id, gradioApp().getElementById('txt2img_gallery_container'), gradioApp().getElementById('txt2img_gallery'), function(){
@@ -219,7 +219,7 @@ function restoreProgressTxt2img(x){
     return [id]
 }
 function restoreProgressImg2img(x){
-    id = localStorage.getItem("img2img_task_id")
+    var id = localStorage.getItem("img2img_task_id")
 
     if(id) {
         requestProgress(id, gradioApp().getElementById('img2img_gallery_container'), gradioApp().getElementById('img2img_gallery'), function(){
@@ -248,7 +248,7 @@ function modelmerger(){
 
 
 function ask_for_style_name(_, prompt_text, negative_prompt_text) {
-    name_ = prompt('Style name:')
+    var name_ = prompt('Style name:')
     return [name_, prompt_text, negative_prompt_text]
 }
 
@@ -283,11 +283,11 @@ function recalculate_prompts_img2img(){
 }
 
 
-opts = {}
+var opts = {}
 onUiUpdate(function(){
 	if(Object.keys(opts).length != 0) return;
 
-	json_elem = gradioApp().getElementById('settings_json')
+	var json_elem = gradioApp().getElementById('settings_json')
 	if(json_elem == null) return;
 
     var textarea = json_elem.querySelector('textarea')
@@ -336,8 +336,8 @@ onUiUpdate(function(){
     registerTextarea('img2img_prompt', 'img2img_token_counter', 'img2img_token_button')
     registerTextarea('img2img_neg_prompt', 'img2img_negative_token_counter', 'img2img_negative_token_button')
 
-    show_all_pages = gradioApp().getElementById('settings_show_all_pages')
-    settings_tabs = gradioApp().querySelector('#settings div')
+    var show_all_pages = gradioApp().getElementById('settings_show_all_pages')
+    var settings_tabs = gradioApp().querySelector('#settings div')
     if(show_all_pages && settings_tabs){
         settings_tabs.appendChild(show_all_pages)
         show_all_pages.onclick = function(){
@@ -349,9 +349,9 @@ onUiUpdate(function(){
 })
 
 onOptionsChanged(function(){
-    elem = gradioApp().getElementById('sd_checkpoint_hash')
-    sd_checkpoint_hash = opts.sd_checkpoint_hash || ""
-    shorthash = sd_checkpoint_hash.substr(0,10)
+    var elem = gradioApp().getElementById('sd_checkpoint_hash')
+    var sd_checkpoint_hash = opts.sd_checkpoint_hash || ""
+    var shorthash = sd_checkpoint_hash.substr(0,10)
 
 	if(elem && elem.textContent != shorthash){
 	    elem.textContent = shorthash