Skip to content

Commit

Permalink
Merge pull request #3605 from sbwalker/dev
Browse files Browse the repository at this point in the history 
synchronize static assets with .NET MAUI project
  • Loading branch information
@sbwalker
sbwalker authored Jan 2, 2024
2 parents 6e74215 + d35ef2d commit 588327f
Show file tree
Hide file tree
Showing 2 changed files with 82 additions and 62 deletions.
15 changes: 15 additions & 0 deletions Oqtane.Maui/wwwroot/css/app.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,3 +213,18 @@ app {
right: 0.75rem;
top: 0.5rem;
}

/* Oqtane Control Styles */

/* Pager */
.app-pager-pointer {
cursor: pointer;
}

.app-sort-th {
cursor: pointer;
}

.app-fas {
margin-left: 5px;
}
129 changes: 67 additions & 62 deletions Oqtane.Maui/wwwroot/js/interop.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,8 @@ Oqtane.Interop = {
document.title = title;
}
},
includeMeta: function (id, attribute, name, content, key) {
var meta;
if (id !== "" && key === "id") {
meta = document.getElementById(id);
}
else {
meta = document.querySelector("meta[" + attribute + "=\"" + CSS.escape(name) + "\"]");
}
includeMeta: function (id, attribute, name, content) {
var meta = document.querySelector("meta[" + attribute + "=\"" + CSS.escape(name) + "\"]");
if (meta === null) {
meta = document.createElement("meta");
meta.setAttribute(attribute, name);
Expand Down Expand Up @@ -119,13 +113,26 @@ Oqtane.Interop = {
this.includeLink(links[i].id, links[i].rel, links[i].href, links[i].type, links[i].integrity, links[i].crossorigin, links[i].insertbefore);
}
},
includeScript: function (id, src, integrity, crossorigin, content, location) {
var script = document.querySelector("script[src=\"" + CSS.escape(src) + "\"]");
includeScript: function (id, src, integrity, crossorigin, type, content, location) {
var script;
if (src !== "") {
script = document.querySelector("script[src=\"" + CSS.escape(src) + "\"]");
}
else {
script = document.getElementById(id);
}
if (script !== null) {
script.remove();
script = null;
}
if (script === null) {
script = document.createElement("script");
if (id !== "") {
script.id = id;
}
if (type !== "") {
script.type = type;
}
if (src !== "") {
script.src = src;
if (integrity !== "") {
Expand All @@ -141,42 +148,21 @@ Oqtane.Interop = {
script.async = false;
this.addScript(script, location)
.then(() => {
console.log(src + ' loaded');
if (src !== "") {
console.log(src + ' loaded');
}
else {
console.log(id + ' loaded');
}
})
.catch(() => {
console.error(src + ' failed');
});
}
else {
if (script.id !== id) {
script.setAttribute('id', id);
}
if (src !== "") {
if (script.src !== this.getAbsoluteUrl(src)) {
script.removeAttribute('integrity');
script.removeAttribute('crossorigin');
script.src = src;
}
if (integrity !== "") {
if (script.integrity !== integrity) {
script.setAttribute('integrity', integrity);
if (src !== "") {
console.error(src + ' failed');
}
} else {
script.removeAttribute('integrity');
}
if (crossorigin !== "") {
if (script.crossOrigin !== crossorigin) {
script.setAttribute('crossorigin', crossorigin);
else {
console.error(id + ' failed');
}
} else {
script.removeAttribute('crossorigin');
}
}
else {
if (script.innerHTML !== content) {
script.innerHTML = content;
}
}
});
}
},
addScript: function (script, location) {
Expand Down Expand Up @@ -229,6 +215,10 @@ Oqtane.Interop = {
if (path === scripts[s].href && scripts[s].es6module === true) {
element.type = "module";
}
if (path === scripts[s].href && scripts[s].location === 'body') {
document.body.appendChild(element);
return false; // return false to bypass default DOM insertion mechanism
}
}
}
})
Expand Down Expand Up @@ -289,19 +279,21 @@ Oqtane.Interop = {
var fileinput = document.getElementById(id);
if (fileinput !== null) {
for (var i = 0; i < fileinput.files.length; i++) {
files.push(fileinput.files[i].name);
files.push(fileinput.files[i].name + ":" + fileinput.files[i].size);
}
}
return files;
},
uploadFiles: function (posturl, folder, id, antiforgerytoken) {
var fileinput = document.getElementById(id + 'FileInput');
var fileinput = document.getElementById('FileInput_' + id);
var files = fileinput.files;
var progressinfo = document.getElementById(id + 'ProgressInfo');
var progressbar = document.getElementById(id + 'ProgressBar');
var progressinfo = document.getElementById('ProgressInfo_' + id);
var progressbar = document.getElementById('ProgressBar_' + id);

progressinfo.setAttribute("style", "display: inline;");
progressbar.setAttribute("style", "width: 200px; display: inline;");
if (progressinfo !== null && progressbar !== null) {
progressinfo.setAttribute("style", "display: inline;");
progressbar.setAttribute("style", "width: 100%; display: inline;");
}

for (var i = 0; i < files.length; i++) {
var FileChunk = [];
Expand Down Expand Up @@ -332,21 +324,29 @@ Oqtane.Interop = {
var request = new XMLHttpRequest();
request.open('POST', posturl, true);
request.upload.onloadstart = function (e) {
progressinfo.innerHTML = file.name + ' 0%';
progressbar.value = 0;
if (progressinfo !== null && progressbar !== null) {
progressinfo.innerHTML = file.name + ' 0%';
progressbar.value = 0;
}
};
request.upload.onprogress = function (e) {
var percent = Math.ceil((e.loaded / e.total) * 100);
progressinfo.innerHTML = file.name + '[' + PartCount + '] ' + percent + '%';
progressbar.value = (percent / 100);
if (progressinfo !== null && progressbar !== null) {
var percent = Math.ceil((e.loaded / e.total) * 100);
progressinfo.innerHTML = file.name + '[' + PartCount + '] ' + percent + '%';
progressbar.value = (percent / 100);
}
};
request.upload.onloadend = function (e) {
progressinfo.innerHTML = file.name + ' 100%';
progressbar.value = 1;
if (progressinfo !== null && progressbar !== null) {
progressinfo.innerHTML = file.name + ' 100%';
progressbar.value = 1;
}
};
request.upload.onerror = function () {
progressinfo.innerHTML = file.name + ' Error: ' + xhr.status;
progressbar.value = 0;
request.upload.onerror = function() {
if (progressinfo !== null && progressbar !== null) {
progressinfo.innerHTML = file.name + ' Error: ' + xhr.status;
progressbar.value = 0;
}
};
request.send(data);
}
Expand All @@ -356,10 +356,15 @@ Oqtane.Interop = {
}
}
},
refreshBrowser: function (reload, wait) {
setInterval(function () {
window.location.reload(reload);
}, wait * 1000);
refreshBrowser: function (verify, wait) {
async function attemptReload (verify) {
if (verify) {
await fetch('');
}
window.location.reload();
}
attemptReload(verify);
setInterval(attemptReload, wait * 1000);
},
redirectBrowser: function (url, wait) {
setInterval(function () {
Expand Down

0 comments on commit 588327f

Please sign in to comment.