Skip to content

Commit

Permalink
[FIX] TypeScript Typings + Fix SASS version number, see twbs/bootstra…
Browse files Browse the repository at this point in the history
  • Loading branch information
SamBrishes committed Nov 6, 2022
1 parent 381baba commit fe30725
Show file tree
Hide file tree
Showing 9 changed files with 107 additions and 251 deletions.
149 changes: 77 additions & 72 deletions assets/js/newshub.min.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions assets/js/newshub.min.js.map

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Expand Up @@ -29,6 +29,7 @@
},
"devDependencies": {
"esbuild": "^0.15.13",
"esbuild-sass-plugin": "^2.4.0"
"esbuild-sass-plugin": "^2.4.0",
"sass": ">1.40 <1.56"
}
}
8 changes: 4 additions & 4 deletions resources/ts/components/bootstrap.ts
Expand Up @@ -11,7 +11,7 @@ function invokeBootstrapDropdown(element)
if (element === event.target || element.contains(event.target)) {
event.preventDefault();

let instance = Bootstrap.Dropdown.getOrCreateInstance(element, {
let instance = window['Bootstrap'].Dropdown.getOrCreateInstance(element, {
autoClose: true
});

Expand All @@ -22,7 +22,7 @@ function invokeBootstrapDropdown(element)
// Toggle Dropdown
instance.toggle();
} else {
let instance = Bootstrap.Dropdown.getInstance(element, {
let instance = window['Bootstrap'].Dropdown.getInstance(element, {
autoClose: true
});

Expand All @@ -42,7 +42,7 @@ function invokeBootstrapTooltip(element)
if (element.hasAttribute('data-rat-init')) {
return;
}
new Bootstrap.Tooltip(element);
new window['Bootstrap'].Tooltip(element);
element.dataset.ratInit = '1';
}

Expand All @@ -55,7 +55,7 @@ function invokeBootstrapPopover(element)
if (element.hasAttribute('data-rat-init')) {
return;
}
new Bootstrap.Popover(element);
new window['Bootstrap'].Popover(element);
element.dataset.ratInit = '1';
}

Expand Down
4 changes: 2 additions & 2 deletions resources/ts/components/color-picker.ts
Expand Up @@ -7,10 +7,10 @@ import ready from '../utilities/ready';
*/
function invokeColorPicker(element)
{
const defaultScheme = window.newshub.defaultScheme;
const defaultScheme = window['newshub'].defaultScheme;

function onLoad() {
query('[data-newshub-toggle="color-picker"]').map(el => {
query('[data-newshub-toggle="color-picker"]').map((el: HTMLInputElement) => {
let style = localStorage.getItem('newshub-color-scheme') || defaultScheme;
if(style === 'light') {
el.checked = false;
Expand Down
6 changes: 6 additions & 0 deletions resources/ts/components/lightbox.ts
@@ -1,6 +1,12 @@
import query from '../utilities/query';
import ready from '../utilities/ready';


/**
* @todo To be replaced
*/


/**
* Invoke Scroll-To-Top Button
* @param {*} element
Expand Down
20 changes: 10 additions & 10 deletions resources/ts/components/navbar.ts
Expand Up @@ -135,10 +135,10 @@ class Navbar {
}

// Subnav Toggler
Array.from(this.root.querySelectorAll('.navbar-subnav-toggler')).map(el => {
Array.from(this.root.querySelectorAll('.navbar-subnav-toggler')).map((el: HTMLElement) => {
el.addEventListener('click', this.toggleSubMenu.bind(this, el));
});
Array.from(this.root.querySelectorAll('.nav-title')).map(el => {
Array.from(this.root.querySelectorAll('.nav-title')).map((el: HTMLElement) => {
let toggler = el.parentElement.querySelector('.navbar-subnav-toggler');
if (toggler) {
el.addEventListener('click', this.toggleSubMenu.bind(this, toggler));
Expand Down Expand Up @@ -289,13 +289,13 @@ class Navbar {
onResize(event) {

// Close SubMenus
Array.from(this.root.querySelectorAll('.nav-item.item-open')).map(el => {
Array.from(this.root.querySelectorAll('.nav-item.item-open')).map((el: HTMLElement) => {
this.closeSubMenu(el, el.querySelector('.navbar-subnav-toggler'));
});

// Close Menu
if (this.root.classList.contains('header-menu-active')) {
this.toggleMenu();
this.toggleMenu(null);
}
}

Expand All @@ -322,13 +322,13 @@ class Navbar {
}

// Close SubMenus
Array.from(this.root.querySelectorAll('.nav-item.item-open')).map(el => {
Array.from(this.root.querySelectorAll('.nav-item.item-open')).map((el: HTMLElement) => {
this.closeSubMenu(el, el.querySelector('.navbar-subnav-toggler'));
});

// Close Menu
if (this.root.classList.contains('header-menu-active')) {
this.toggleMenu();
this.toggleMenu(null);
}
}

Expand Down Expand Up @@ -387,13 +387,13 @@ class Navbar {
*/
closeMenu() {
if (this.style === 'sticky') {
setTimeout(() => { this.stickyNavbar(); }, 250); // Check Sticky Navbar Position after menu has been closed.
setTimeout(() => { this.stickyNavbar(null); }, 250); // Check Sticky Navbar Position after menu has been closed.
} else if (this.style === 'slide') {
this.root.style.removeProperty('height');
}

// Close SubMenus
Array.from(this.root.querySelectorAll('.nav-item.item-open')).map(el => {
Array.from(this.root.querySelectorAll('.nav-item.item-open')).map((el: HTMLElement) => {
this.closeSubMenu(el, el.querySelector('.navbar-subnav-toggler'));
});

Expand Down Expand Up @@ -467,7 +467,7 @@ class Navbar {
*/
closeSubMenu(item, button) {
if (item.classList.contains('master-menu') && this.style === 'sticky') {
setTimeout(() => { this.stickyNavbar(); }, 250); // Check Sticky Navbar Position after menu has been closed.
setTimeout(() => { this.stickyNavbar(null); }, 250); // Check Sticky Navbar Position after menu has been closed.
}

const subnav = item.querySelector('.navbar-subnav,.navbar-subnav-master');
Expand All @@ -485,7 +485,7 @@ class Navbar {
}

if (document.activeElement === button || document.activeElement === item) {
document.activeElement.blur();
(document.activeElement as HTMLButtonElement).blur();
}
}

Expand Down
156 changes: 0 additions & 156 deletions resources/ts/components/old-keen-slider.ts

This file was deleted.

0 comments on commit fe30725

Please sign in to comment.