Skip to content

Jquery4 #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
paulhiggs wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Jquery4 #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
833d109
import jQuery 4.0.0 (instead of 3.7.1)
paulhiggs Apr 21, 2026
1cef284
Revert "import jQuery 4.0.0 (instead of 3.7.1)"
paulhiggs Apr 21, 2026
4fc596e
import jQuery 4.0.0 (instead of 3.7.1)
paulhiggs Apr 21, 2026
368034c
:eq() pseudo-class is deprecated (since jQuery 3.4) so use .eq() meth…
paulhiggs Apr 21, 2026
a157075
.click() handler is deprecate (since jQuery 3.3) so use .on(click,fun…
paulhiggs Apr 21, 2026
bd30ea8
load language strings from codifie defintiions as reading from local …
paulhiggs Apr 21, 2026
1b97831
Merge branch 'DVBProject:master' into jquery4
paulhiggs May 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<script type="text/javascript" src="../identifiers.js"></script>
<script type="text/javascript" src="../namespaces.js"></script>
<script type="text/javascript" src="dvbi.js"></script>
<script type="text/javascript" src="../jquery-3.7.1.min.js"></script>
<script type="text/javascript" src="../jquery-4.0.0.min.js"></script>

<!-- Bootstrap -->
<link href="css/bootstrap-4.3.1.css" rel="stylesheet">
Expand Down
4 changes: 2 additions & 2 deletions frontend/android/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
Expand All @@ -7,7 +7,7 @@
<meta name="theme-color" content="#0098f4" />
<title>DVB-I RefApp</title>

<script type="text/javascript" src="../../jquery-3.7.1.min.js"></script>
<script type="text/javascript" src="../../jquery-4.0.0.min.js"></script>

<!-- Bootstrap -->
<link href="styles/bootstrap-4.3.1.css" rel="stylesheet" />
Expand Down
4 changes: 2 additions & 2 deletions frontend/android/js/channel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ Channel.prototype.updateChannelInfo = function () {
);
}
}
info.click(function () {
info.on("click", function () {
openProgramInfo(now);
});
}
Expand Down Expand Up @@ -451,7 +451,7 @@ Channel.prototype.updateChannelInfo = function () {
);
}
}
info.click(function () {
info.on("click", function () {
openProgramInfo(next);
});
}
Expand Down
3 changes: 2 additions & 1 deletion frontend/android/player.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<meta name="theme-color" content="#0098f4" />
<title>DVB-I RefApp</title>

<script type="text/javascript" src="../../jquery-3.7.1.min.js"></script>
<script type="text/javascript" src="../../jquery-4.0.0.min.js"></script>

<!-- Bootstrap -->
<link href="styles/bootstrap-4.3.1.css" rel="stylesheet" />
Expand Down Expand Up @@ -40,6 +40,7 @@
<script src="../CSmaps.js"></script>
<script src="../dvbi-common.js"></script>
<script src="../localstorage.js"></script>
<script src="../i18n/translations.js"></script>
<script src="../i18n/i18n.js"></script>
</head>
<body style="margin: 0px" class="player">
Expand Down
8 changes: 4 additions & 4 deletions frontend/android_apk/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ tasks.register('copyFiles', Copy) {
from new File("$projectDir/../../../")
into "${layout.projectDirectory}/src/main/assets/"
include 'identifiers.js'
include 'jquery-3.7.1.min.js'
include 'jquery-4.0.0.min.js'
include 'namespaces.js'
include 'frontend/i18n/**'
include 'frontend/*.js'
Expand Down Expand Up @@ -63,15 +63,15 @@ dependencies {
implementation 'com.google.code.gson:gson:2.8.7'

implementation 'androidx.tvprovider:tvprovider:1.1.0-alpha01'

implementation("com.squareup.okhttp3:okhttp:4.9.0")
implementation("androidx.security:security-crypto:1.1.0-alpha03")
implementation 'androidx.recyclerview:recyclerview:' + project.ext.jetpackVersion // (344 KB) https://mvnrepository.com/artifact/androidx.recyclerview/recyclerview?repo=google

implementation "androidx.constraintlayout:constraintlayout:2.1.0"
implementation "androidx.tvprovider:tvprovider:"
implementation 'pub.devrel:easypermissions:3.0.0'

// Minimal version for suitest is 25.2.0, you can use any higher.
debugImplementation 'org.java-websocket:Java-WebSocket:1.5.1'
}
}
2 changes: 1 addition & 1 deletion frontend/android_apk/app/src/main/assets/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
frontend/**
identifiers.js
jquery-3.7.1.min.js
jquery-4.0.0.min.js
namespaces.js
26 changes: 10 additions & 16 deletions frontend/hbbtv/alertDialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ function showAlertDialog(q1, q2, buttons, _checked, _focused, callback, cancel)
lastvisible = buttonElems[Math.min(buttonElems.length - 1, firstvisibleIdx + alertDialog.visibleItems - 1)];
lastvisible.addClass("lastvisible");

var scrolltop = $(".dialogButton:eq(" + alertDialog.focused + ")").outerHeight(true) * firstvisibleIdx;
var scrolltop = $(".dialogButton").eq(alertDialog.focused).outerHeight(true) * firstvisibleIdx;
$("#dialogWrapper").scrollTop(scrolltop);
}
//handleAlertDialogArrows();
Expand All @@ -124,21 +124,18 @@ function navigateAlertDialog(keyCode) {
case VK_DOWN:
case VK_UP:
if (keyCode == VK_UP && alertDialog.focused) {
if ($(".dialogButton:eq(" + alertDialog.focused + ")").hasClass("firstvisible") && alertDialog.focused > 0) {
if ($(".dialogButton").eq(alertDialog.focused).hasClass("firstvisible") && alertDialog.focused > 0) {
animating = true;
$(".dialogButton:eq(" + alertDialog.focused + ")").removeClass("firstvisible");
$(".dialogButton:eq(" + alertDialog.focused + ")")
.prev()
.addClass("firstvisible");
$(".dialogButton").eq(alertDialog.focused).removeClass("firstvisible");
$(".dialogButton").eq(alertDialog.focused).prev().addClass("firstvisible");
var lastvisible = $(".dialogButton.lastvisible");
lastvisible.removeClass("lastvisible");
lastvisible.prev().addClass("lastvisible");
animating = true;
$("#dialogWrapper").animate(
{
scrollTop:
$("#dialogWrapper").scrollTop() -
$(".dialogButton:eq(" + alertDialog.focused + ")").outerHeight(true),
$("#dialogWrapper").scrollTop() - $(".dialogButton").eq(alertDialog.focused).outerHeight(true),
},
{
duration: 250,
Expand All @@ -156,23 +153,20 @@ function navigateAlertDialog(keyCode) {
alertDialog.focused--;
} else if (keyCode == VK_DOWN && alertDialog.focused < alertDialog.options - 1) {
if (
$(".dialogButton:eq(" + alertDialog.focused + ")").hasClass("lastvisible") &&
$(".dialogButton").eq(alertDialog.focused).hasClass("lastvisible") &&
alertDialog.focused + 1 < alertDialog.options
) {
animating = true;
$(".dialogButton:eq(" + alertDialog.focused + ")").removeClass("lastvisible");
$(".dialogButton:eq(" + alertDialog.focused + ")")
.next()
.addClass("lastvisible");
$(".dialogButton").eq(alertDialog.focused).removeClass("lastvisible");
$(".dialogButton").eq(alertDialog.focused).next().addClass("lastvisible");
var firstvisible = $(".dialogButton.firstvisible");
firstvisible.removeClass("firstvisible");
firstvisible.next().addClass("firstvisible");
animating = true;
$("#dialogWrapper").animate(
{
scrollTop:
$("#dialogWrapper").scrollTop() +
$(".dialogButton:eq(" + alertDialog.focused + ")").outerHeight(true),
$("#dialogWrapper").scrollTop() + $(".dialogButton").eq(alertDialog.focused).outerHeight(true),
},
{
duration: 250,
Expand All @@ -190,7 +184,7 @@ function navigateAlertDialog(keyCode) {
alertDialog.focused++;
}
$(".dialogButton.focused").removeClass("focused");
$(".dialogButton:eq(" + alertDialog.focused + ")").addClass("focused");
$(".dialogButton").eq(alertDialog.focused).addClass("focused");
break;

case VK_ENTER:
Expand Down
29 changes: 10 additions & 19 deletions frontend/hbbtv/dialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ function showDialog(q, buttons, _checked, _focused, callback, cancel, keyHandler
lastvisible = buttonElems[0].children[Math.min(buttonElems.length - 1, firstvisibleIdx + dialog.visibleItems - 1)];
lastvisible.addClass("lastvisible");

var scrolltop = $(".dialogButton:eq(" + dialog.focused + ")").outerHeight(true) * firstvisibleIdx;
var scrolltop = $(".dialogButton").eq(dialog.focused).outerHeight(true) * firstvisibleIdx;
$("#dialogWrapper").scrollTop(scrolltop);
}
if (!header) {
Expand Down Expand Up @@ -120,20 +120,17 @@ function navigateDialog(keyCode) {
case VK_DOWN:
case VK_UP:
if (keyCode == VK_UP && dialog.focused) {
if ($(".dialogButton:eq(" + dialog.focused + ")").hasClass("firstvisible") && dialog.focused > 0) {
if ($(".dialogButton").eq(dialog.focused).hasClass("firstvisible") && dialog.focused > 0) {
animating = true;
$(".dialogButton:eq(" + dialog.focused + ")").removeClass("firstvisible");
$(".dialogButton:eq(" + dialog.focused + ")")
.prev()
.addClass("firstvisible");
$(".dialogButton").eq(dialog.focused).removeClass("firstvisible");
$(".dialogButton").eq(dialog.focused).prev().addClass("firstvisible");
var lastvisible = $(".dialogButton.lastvisible");
lastvisible.removeClass("lastvisible");
lastvisible.prev().addClass("lastvisible");
animating = true;
$("#dialogWrapper").animate(
{
scrollTop:
$("#dialogWrapper").scrollTop() - $(".dialogButton:eq(" + dialog.focused + ")").outerHeight(true),
scrollTop: $("#dialogWrapper").scrollTop() - $(".dialogButton").eq(dialog.focused).outerHeight(true),
},
{
duration: 250,
Expand All @@ -150,23 +147,17 @@ function navigateDialog(keyCode) {
}
dialog.focused--;
} else if (keyCode == VK_DOWN && dialog.focused < dialog.options - 1) {
if (
$(".dialogButton:eq(" + dialog.focused + ")").hasClass("lastvisible") &&
dialog.focused + 1 < dialog.options
) {
if ($(".dialogButton").eq(dialog.focused).hasClass("lastvisible") && dialog.focused + 1 < dialog.options) {
animating = true;
$(".dialogButton:eq(" + dialog.focused + ")").removeClass("lastvisible");
$(".dialogButton:eq(" + dialog.focused + ")")
.next()
.addClass("lastvisible");
$(".dialogButton").eq(dialog.focused).removeClass("lastvisible");
$(".dialogButton").eq(dialog.focused).next().addClass("lastvisible");
var firstvisible = $(".dialogButton.firstvisible");
firstvisible.removeClass("firstvisible");
firstvisible.next().addClass("firstvisible");
animating = true;
$("#dialogWrapper").animate(
{
scrollTop:
$("#dialogWrapper").scrollTop() + $(".dialogButton:eq(" + dialog.focused + ")").outerHeight(true),
scrollTop: $("#dialogWrapper").scrollTop() + $(".dialogButton").eq(dialog.focused).outerHeight(true),
},
{
duration: 250,
Expand All @@ -184,7 +175,7 @@ function navigateDialog(keyCode) {
dialog.focused++;
}
$(".dialogButton.focused").removeClass("focused");
$(".dialogButton:eq(" + dialog.focused + ")").addClass("focused");
$(".dialogButton").eq(dialog.focused).addClass("focused");
break;

case VK_ENTER:
Expand Down
5 changes: 3 additions & 2 deletions frontend/hbbtv/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<link rel="stylesheet" href="CommonUI/dialog.css" />
<link rel="stylesheet" href="launcher/chinfo.css" />
<link rel="stylesheet" href="epg/epg.css" />
<script src="../../jquery-3.7.1.min.js"></script>
<script src="../../jquery-4.0.0.min.js"></script>
<script type="text/javascript" src="../../identifiers.js"></script>
<script type="text/javascript" src="../../namespaces.js"></script>
<script type="text/javascript" src="../channel-common.js"></script>
Expand All @@ -34,6 +34,7 @@
<script type="text/javascript" src="buttonbar.js"></script>
<script type="text/javascript" src="alertDialog.js"></script>
<script type="text/javascript" src="dialog.js"></script>
<script type="text/javascript" src="../i18n/translations.js"></script>
<script type="text/javascript" src="../i18n/i18n.js"></script>
<script type="text/javascript" src="launcher/videoplayer_basic.js"></script>
<script type="text/javascript" src="launcher/videoplayer_html5.js"></script>
Expand All @@ -42,7 +43,7 @@
<script type="text/javascript" src="dialog.js"></script>
<script type="text/javascript" src="main.js"></script>
</head>
<body id="body" onload="onLoad();">
<body id="body" onload="onLoad()">
<div style="visibility: hidden; width: 0px; height: 0px">
<object
id="appmgr"
Expand Down
113 changes: 0 additions & 113 deletions frontend/i18n/de.json
View file
Open in desktop

This file was deleted.

Loading