Commit 8ccc2712 authored by Aarni Koskela's avatar Aarni Koskela
Browse files

Fix a whole bunch of implicit globals

parent 34a6ad80
Loading
Loading
Loading
Loading
+16 −16
Original line number Diff line number Diff line
@@ -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

+2 −3
Original line number Diff line number Diff line
@@ -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 = []
+4 −4
Original line number Diff line number Diff line
@@ -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;
+1 −1
Original line number Diff line number Diff line
@@ -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)

+7 −7
Original line number Diff line number Diff line
@@ -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){
Loading