Skip to content

Commit

Permalink
Merge pull request #2271 from sul-dlss/unnecessary-semi
Browse files Browse the repository at this point in the history
Remove unnecessary semi-colins
  • Loading branch information
jcoyne authored Dec 13, 2024
2 parents d870690 + 82f1b76 commit 654870f
Show file tree
Hide file tree
Showing 39 changed files with 774 additions and 473 deletions.
26 changes: 13 additions & 13 deletions app/javascript/3d.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
"use strict";
"use strict"

import "controllers";
import "controllers"

import EmbedThis from "src/modules/embed_this";
import PopupPanels from "src/modules/popup_panels";
import ModelViewer from "src/modules/model_viewer";
import { trackView } from "src/modules/metrics";
import EmbedThis from "src/modules/embed_this"
import PopupPanels from "src/modules/popup_panels"
import ModelViewer from "src/modules/model_viewer"
import { trackView } from "src/modules/metrics"

import "@google/model-viewer";
import "@google/model-viewer"

document.addEventListener("DOMContentLoaded", () => {
document.getElementById("sul-embed-object").hidden = false;
ModelViewer.init();
PopupPanels.init();
EmbedThis.init();
trackView();
});
document.getElementById("sul-embed-object").hidden = false
ModelViewer.init()
PopupPanels.init()
EmbedThis.init()
trackView()
})
4 changes: 2 additions & 2 deletions app/javascript/controllers/companion_window_controller.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Controller } from "@hotwired/stimulus"
import EmbedThis from 'src/modules/embed_this';
import EmbedThis from 'src/modules/embed_this'

export default class extends Controller {
// TODO: accessability and transcript should move to a controller just for media.
Expand All @@ -9,7 +9,7 @@ export default class extends Controller {
this.element.hidden = false
// Open the drawer on load
this.openLeftDrawer()
EmbedThis.init();
EmbedThis.init()
}

toggleLeft() {
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/controllers/content_list_controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export default class extends Controller {
// Show a different media file when the user selects it in the list
// Sends an event that tells the MediaWrapperController to display the selected media.
showMedia(evt) {
evt.preventDefault();
evt.preventDefault()
const event = new CustomEvent('thumbnail-clicked', { detail: { index: evt.params.index } })
window.dispatchEvent(event)

Expand Down
10 changes: 5 additions & 5 deletions app/javascript/controllers/file_auth_controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export default class extends Controller {
window.addEventListener("message", (event) => {
this.iframe.remove()
console.debug("Post message", event.data)
if (event.origin !== "https://stacks.stanford.edu" && event.origin !== "https://sul-stacks-stage.stanford.edu") return;
if (event.origin !== "https://stacks.stanford.edu" && event.origin !== "https://sul-stacks-stage.stanford.edu") return
if (event.data.type === "AuthAccessTokenError2") {
this.displayAccessTokenError(event.data)
} else {
Expand Down Expand Up @@ -225,15 +225,15 @@ export default class extends Controller {
// This method is triggered by stimulus reflex when the user clicks the login button rendered by `loginNeeded`
login(evt) {
this.loginPanelTarget.hidden = true
const windowReference = window.open(evt.params.url);
let loginStart = Date.now();
const windowReference = window.open(evt.params.url)
let loginStart = Date.now()
console.debug("window reference", windowReference)
let checkWindow = setInterval(() => {
console.debug("in interval", (Date.now() - loginStart))
if ((Date.now() - loginStart) < 30000 &&
(!windowReference || !windowReference.closed)) return;
(!windowReference || !windowReference.closed)) return

clearInterval(checkWindow);
clearInterval(checkWindow)
// once the window is closed we can initiate the token request
this.afterLoginWindowClosed(evt.params.messageid)
}, 500)
Expand Down
6 changes: 3 additions & 3 deletions app/javascript/controllers/fullscreen_controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ export default class extends Controller {
this.areaTarget.requestFullscreen().catch((err) => {
alert(
`Error attempting to enable fullscreen mode: ${err.message} (${err.name})`,
);
});
)
})
} else {
document.exitFullscreen();
document.exitFullscreen()
}
}
}
4 changes: 2 additions & 2 deletions app/javascript/controllers/iiif_metadata_controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ export default class extends Controller {
const node = new DOMParser().parseFromString(record, "text/html").body.firstChild
if ('target' in node) {
// Set all elements owning target to target=_blank
node.setAttribute('target', '_blank');
node.setAttribute('target', '_blank')
// Prevent https://www.owasp.org/index.php/Reverse_Tabnabbing
node.setAttribute('rel', 'noopener noreferrer');
node.setAttribute('rel', 'noopener noreferrer')
return `<dd>${node.outerHTML}</dd>`
} else {
return `<dd>${record}</dd>`
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/controllers/media_player_controller.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Controller } from "@hotwired/stimulus"
import videojs from 'video.js';
import videojs from 'video.js'

export default class extends Controller {
initializeVideoJSPlayer() {
Expand Down
14 changes: 7 additions & 7 deletions app/javascript/controllers/media_tag_controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export default class extends Controller {
}

if(typeof(completeCallback) === 'function') {
completeCallback(result.authResponse);
completeCallback(result.authResponse)
}
}

Expand All @@ -55,17 +55,17 @@ export default class extends Controller {

// Open the login window in a new window and then poll to see if the auth credentials are now active.
logIn(event) {
const windowReference = window.open(event.params.loginService);
this.loginStart = Date.now();
const windowReference = window.open(event.params.loginService)
this.loginStart = Date.now()
var checkWindow = setInterval(() => {
if ((Date.now() - this.loginStart) < 30000 &&
(!windowReference || !windowReference.closed)) return;
(!windowReference || !windowReference.closed)) return
this.validateMedia((authResponse) => {
if(authResponse.status === 'success') {
clearInterval(checkWindow);
clearInterval(checkWindow)
}
});
return;
})
return
}, 500)
}
}
4 changes: 2 additions & 2 deletions app/javascript/controllers/media_wrapper_controller.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Controller } from "@hotwired/stimulus"
import videojs from 'video.js';
import videojs from 'video.js'

export default class extends Controller {
static targets = [ ]
Expand All @@ -11,7 +11,7 @@ export default class extends Controller {
toggleVisibility(event) {
const index = event.detail.index
this.element.hidden = this.indexValue !== index
this.pauseAllMedia();
this.pauseAllMedia()
}

pauseAllMedia() {
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/controllers/osd_controller.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Controller } from "@hotwired/stimulus"
import OpenSeadragon from 'openseadragon';
import OpenSeadragon from 'openseadragon'

export default class extends Controller {
static values = {
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/controllers/transcript_controller.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Controller } from "@hotwired/stimulus"
import videojs from 'video.js';
import videojs from 'video.js'

// This is tightly coupled to VideoJS's tracks implementation, because VideoJS removes the tracks from the
// native player when it initializes. This depends on the media_tag_controller.js emitting a custom media-loaded
Expand Down
8 changes: 4 additions & 4 deletions app/javascript/document.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import "controllers";
import { trackView } from "src/modules/metrics";
import "controllers"
import { trackView } from "src/modules/metrics"

document.addEventListener("DOMContentLoaded", () => {
trackView();
});
trackView()
})
12 changes: 6 additions & 6 deletions app/javascript/file.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import EmbedThis from 'src/modules/embed_this';
import PopupPanels from 'src/modules/popup_panels';
import { trackView } from 'src/modules/metrics';
import EmbedThis from 'src/modules/embed_this'
import PopupPanels from 'src/modules/popup_panels'
import { trackView } from 'src/modules/metrics'
import "file_controllers"

document.addEventListener('DOMContentLoaded', () => {
document.getElementById('sul-embed-object').hidden = false
PopupPanels.init();
EmbedThis.init();
trackView();
PopupPanels.init()
EmbedThis.init()
trackView()
})
10 changes: 5 additions & 5 deletions app/javascript/file_controllers/download_all_controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ import { Controller } from "@hotwired/stimulus"

export default class extends Controller {
download(event) {
const el = event.target;
const el = event.target
if (el.localName == 'button') {
el.disabled = true;
el.innerText = " Initializing download...";
el.disabled = true
el.innerText = " Initializing download..."

// replace the anchor tag with the button to prevent further clicks
const a = el.parentElement;
a.replaceWith(el);
const a = el.parentElement
a.replaceWith(el)
}
}
}
28 changes: 14 additions & 14 deletions app/javascript/file_controllers/tree_controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,65 +111,65 @@ export default class extends Controller {
case event.key === 'Enter' && this.isBranch(event.target):
event.preventDefault()
this.toggle(event)
break;
break
case event.key === 'Enter' && this.isLeaf(event.target):
// Perform the default action (download the file)
const downloadElement = this.downloadElement(event.target)
if(!downloadElement) break;
if(!downloadElement) break

event.preventDefault()
downloadElement.click()
break;
break
case event.key === 'ArrowRight' && this.isClosedBranch(event.target):
// When a closed node, opens the node
event.preventDefault()
this.toggle(event)
break;
break
case event.key === 'ArrowRight' && this.isOpenBranch(event.target):
// When an open node, moves focus to the first child node
event.preventDefault()
event.target.nextElementSibling.focus()
break;
break
case event.key === 'ArrowLeft' && this.isOpenBranch(event.target):
// When an open node, closes the node
event.preventDefault()
this.toggle(event)
break;
break
case event.key === 'ArrowLeft' && event.target.getAttribute('aria-level') > 1:
// When a closed node, moves focus to the node's parent node
const parentBranchRowElement = this.parentBranchRowElement(event.target)
if(!parentBranchRowElement) break;
if(!parentBranchRowElement) break

event.preventDefault()
parentBranchRowElement.focus()
break;
break
case event.key === 'ArrowUp':
// Move to the previous node without opening or closing
const previousRowElement = this.previousBranchRowElement(event.target)
if(!previousRowElement) break;
if(!previousRowElement) break

event.preventDefault()
previousRowElement.focus()
break;
break
case event.key === 'ArrowDown':
// Move to the next node without opening or closing
const nextRowElement = this.nextBranchRowElement(event.target)
if(!nextRowElement) break;
if(!nextRowElement) break

event.preventDefault()
nextRowElement.focus()
break;
break
case event.key === 'Home':
// Move to the first node without opening or closing
event.preventDefault()
this.visibleRows[0].focus()
break;
break
case event.key === 'End':
// Move to the last node without opening or closing
event.preventDefault()
const rowElements = this.visibleRows
rowElements[rowElements.length - 1].focus()
break;
break
}
}

Expand Down
24 changes: 12 additions & 12 deletions app/javascript/geo.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import EmbedThis from "../src/modules/embed_this";
import PopupPanels from "../src/modules/popup_panels";
import GeoViewer from "../src/modules/geo_viewer";
import { trackView } from "../src/modules/metrics";
import EmbedThis from "../src/modules/embed_this"
import PopupPanels from "../src/modules/popup_panels"
import GeoViewer from "../src/modules/geo_viewer"
import { trackView } from "../src/modules/metrics"

import "leaflet";
import "../../../vendor/assets/javascripts/Leaflet.Control.Custom";
import "leaflet"
import "../../../vendor/assets/javascripts/Leaflet.Control.Custom"

document.addEventListener("DOMContentLoaded", () => {
document.getElementById("sul-embed-object").hidden = false;
GeoViewer.init();
PopupPanels.init();
EmbedThis.init();
trackView();
});
document.getElementById("sul-embed-object").hidden = false
GeoViewer.init()
PopupPanels.init()
EmbedThis.init()
trackView()
})
8 changes: 4 additions & 4 deletions app/javascript/media.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import "controllers";
import { trackView } from "src/modules/metrics";
import "controllers"
import { trackView } from "src/modules/metrics"

document.addEventListener("DOMContentLoaded", () => {
trackView();
});
trackView()
})
24 changes: 12 additions & 12 deletions app/javascript/packs/geo.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import EmbedThis from "../src/modules/embed_this";
import PopupPanels from "../src/modules/popup_panels";
import GeoViewer from "../src/modules/geo_viewer";
import { trackView } from "../src/modules/metrics";
import EmbedThis from "../src/modules/embed_this"
import PopupPanels from "../src/modules/popup_panels"
import GeoViewer from "../src/modules/geo_viewer"
import { trackView } from "../src/modules/metrics"

import "leaflet";
import "../../../vendor/assets/javascripts/Leaflet.Control.Custom";
import "leaflet"
import "../../../vendor/assets/javascripts/Leaflet.Control.Custom"

document.addEventListener("DOMContentLoaded", () => {
document.getElementById("sul-embed-object").hidden = false;
GeoViewer.init();
PopupPanels.init();
EmbedThis.init();
trackView();
});
document.getElementById("sul-embed-object").hidden = false
GeoViewer.init()
PopupPanels.init()
EmbedThis.init()
trackView()
})
12 changes: 6 additions & 6 deletions app/javascript/packs/m3.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import M3Viewer from "../src/modules/m3_viewer.js";
import { trackView } from "../src/modules/metrics.js";
import M3Viewer from "../src/modules/m3_viewer.js"
import { trackView } from "../src/modules/metrics.js"

document.getElementById("sul-embed-object").hidden = false;
M3Viewer.init();
document.getElementById("sul-embed-object").hidden = false
M3Viewer.init()

document.addEventListener("DOMContentLoaded", () => {
trackView();
});
trackView()
})
Loading

0 comments on commit 654870f

Please sign in to comment.