From 4cb31d2e19f9249940ea8041ff4007665704ea26 Mon Sep 17 00:00:00 2001 From: cyber-dream Date: Tue, 23 May 2023 02:58:41 +0300 Subject: [PATCH] Fix decorat window bringToTop logic --- resources/decorat.js | 54 ++++++++++ resources/wde.js | 216 +++++--------------------------------- resources/webfs.js | 131 +++++++++++++++++++++++ templates/base/index.tmpl | 5 +- 4 files changed, 212 insertions(+), 194 deletions(-) create mode 100644 resources/decorat.js create mode 100644 resources/webfs.js diff --git a/resources/decorat.js b/resources/decorat.js new file mode 100644 index 0000000..f493008 --- /dev/null +++ b/resources/decorat.js @@ -0,0 +1,54 @@ +class WindowsCompositor{ + static windowsLayer + + constructor(){ + this.windowLayer = document.body.querySelector('#windows-layer') + WindowsCompositor.windowsLayer = document.body.querySelector('#windows-layer') + if (!WebDesktopEnvironment.isMobile) { + let startDrag = function(event) { + let window = event.target.closest('.WindowFrame') + WindowsCompositor.bringWindowToFront(window) + if (event.target.classList.contains("DragArea")){ + let xPosInit = event.offsetX + let yPosInit = event.offsetY + let dragWindow = function(event){ + window.style.left = `${event.clientX - xPosInit}px` + window.style.top = `${event.clientY - yPosInit}px` + } + let stopDrag = function(){ + removeEventListener('mousemove', dragWindow) + removeEventListener('mouseup', stopDrag) + } + + addEventListener('mousemove', dragWindow) + addEventListener('mouseup', stopDrag) + } + } + WindowsCompositor.windowsLayer.addEventListener('mousedown', startDrag) + } + } + + /** + * @param {HTMLElement} window + */ + static bringWindowToFront(window){ //FIXME + let previousWindow = WindowsCompositor.windowsLayer.lastChild + if (window == null || window == undefined){ + return + } + if (window != previousWindow){ + WindowsCompositor.windowsLayer.insertBefore(window, previousWindow.nextSibling) + previousWindow.classList.remove("Focused") + window.classList.add("Focused") + } else { + window.classList.add("Focused") + } + return + } + + + static ChangeURL(appWindow){ + let appId = appWindow.getAttribute('appid') + window.history.replaceState(null, "", `/${appId}/`); + } +} diff --git a/resources/wde.js b/resources/wde.js index d138810..14bfd1c 100644 --- a/resources/wde.js +++ b/resources/wde.js @@ -36,10 +36,12 @@ class WebDesktopEnvironment{ async loadWDE(){ // await WebDesktopEnvironment.load2('/Applications/Finder.app', [ "desktop", document.querySelector('#desktop-layer')]) // await WebDesktopEnvironment.Open('/Applications/Finder.app', ["/home/user/.desktop", "-desktop", document.querySelector('#desktop-layer')]) - WebDesktopEnvironment.Open('/Applications/Finder.app', ["/home/user/Blogs",]) + await WebDesktopEnvironment.Open('/Applications/Finder.app', ["/home/user/Blogs",]) + await WebDesktopEnvironment.Open('/Applications/Finder.app', ["/home/user",]) + await WebDesktopEnvironment.Open('/Applications/Finder.app', ["/home",]) // WebDesktopEnvironment.Open('/Applications/AboutMe.app', []) // WebDesktopEnvironment.Open('/Applications/FinderAdmin.app', ["/home/user",]) - WebDesktopEnvironment.Open('/Applications/BlogViewer.app', ["/home/user/Blogs/blog1.blog",]) + await WebDesktopEnvironment.Open('/Applications/BlogViewer.app', ["/home/user/Blogs/blog1.blog",]) } /** @@ -124,7 +126,7 @@ class WebDesktopEnvironment{ return newWindow } else { newWindow.setAttribute("class", "WindowFrame ConvexElement") - newWindow.setAttribute("windowId", "SuperUniqUUID") //TODO: + newWindow.setAttribute("windowId", WebDesktopEnvironment.makeid(4)) //TODO: newWindow.style.width = width.toString() + "px" newWindow.style.height = height.toString() + "px" @@ -202,8 +204,26 @@ class WebDesktopEnvironment{ (function(a){if(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino|android|ipad|playbook|silk/i.test(a)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0,4))) check = true;})(navigator.userAgent||navigator.vendor||window.opera); return check; } + + + /** + * @param {num} length + */ + static makeid(length) { + let result = ''; + const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; + const charactersLength = characters.length; + let counter = 0; + while (counter < length) { + result += characters.charAt(Math.floor(Math.random() * charactersLength)); + counter += 1; + } + return result; + } + } +//Deprecated var getJSON = function(url, callback) { var xhr = new XMLHttpRequest(); xhr.open('GET', url, true); @@ -217,192 +237,4 @@ var getJSON = function(url, callback) { } }; xhr.send(); -}; - -class WindowsCompositor{ - static windowsLayer - - constructor(){ - this.windowLayer = document.body.querySelector('#windows-layer') - WindowsCompositor.windowsLayer = document.body.querySelector('#windows-layer') - if (!WebDesktopEnvironment.isMobile) { - let startDrag = function(event) { - let window = event.target.closest('.WindowFrame') - WindowsCompositor.bringWindowToFront(window) - if (event.target.classList.contains("DragArea")){ - let xPosInit = event.offsetX - let yPosInit = event.offsetY - let dragWindow = function(event){ - window.style.left = `${event.clientX - xPosInit}px` - window.style.top = `${event.clientY - yPosInit}px` - } - let stopDrag = function(){ - removeEventListener('mousemove', dragWindow) - removeEventListener('mouseup', stopDrag) - } - - addEventListener('mousemove', dragWindow) - addEventListener('mouseup', stopDrag) - } - } - WindowsCompositor.windowsLayer.addEventListener('mousedown', startDrag) - } - } - - /** - * @param {HTMLElement} window - */ - static bringWindowToFront(window){ //FIXME - if (window == null | window == undefined){ - return - } - let previousWindow = WindowsCompositor.windowsLayer.lastChild - if (window != previousWindow){ - WindowsCompositor.windowsLayer.insertBefore(previousWindow, window) - } - if (!window.classList.contains("Focused")){ - previousWindow.classList.remove("Focused") - window.classList.add("Focused") - } - // WindowsCompositor.ChangeURL(window) - } - - - static ChangeURL(appWindow){ - let appId = appWindow.getAttribute('appid') - window.history.replaceState(null, "", `/${appId}/`); - } -} - - -class WebFS{ - /** - * @param {string} path - * @returns {boolean} - */ - static async CreateDirectory(path){ - if (path == undefined){ - WebDesktopEnvironment.Alert("Path is undefined") - return false - } - const params = new URLSearchParams({ - path: `${path}/New Directory` - }) - const response = await fetch(`/system/fs/createDir?` + params) - if (response.status != 200){ - WebDesktopEnvironment.Alert("DIRCTORY CREATION ERROR") //TODO - return false - } - return true - } - - /** - * @param {string} path - * @returns {boolean} - */ - static async DeleteFile(path){ - const params = new URLSearchParams({ - path: path - }) - const response = await fetch(`/system/fs/delete?` + params) - if (response.status != 200){ - WebDesktopEnvironment.Alert("DELETE ERROR") //TODO - return false - } - return true - } - - /** - * @param {string} path - * @returns {boolean} - */ - static async MoveFile(sourcePath, targetPath){ - const params = new URLSearchParams({ - sourcePath: sourcePath, - targetPath: targetPath - }) - const response = await fetch(`/system/fs/move?` + params) - if (response.status != 200){ - // WebDesktopEnvironment.Alert("Move ERROR") //TODO - return false - } - return true - } - - /** - * @param {string} linkPath - * @returns {string} - */ - static async ReadObjectLink(linkPath){ - const params = new URLSearchParams({ - linkPath: linkPath, - }) - const response = await fetch(`/system/fs/readObjectLink?` + params) - if (response.status != 200){ - WebDesktopEnvironment.Alert("TODO") //TODO - return "" - } - const path = await response.text() - //TODO Validate - return path - } - - /** - * @param {string} sourcePath - * @param {string} linkPath - * @returns {string} - */ - static async CreatePathLink(sourcePath, linkPath){ - const params = new URLSearchParams({ - sourcePath: sourcePath, - linkPath: linkPath, - }) - const response = await fetch(`/system/fs/createPathLink?` + params) - return response.status == 200 - } - - /** - * @param {string} linkPath - * @returns {string} - */ - static async ReadPathLink(linkPath){ - const params = new URLSearchParams({ - linkPath: linkPath, - }) - const response = await fetch(`/system/fs/readPathLink?` + params) - if (response.status != 200){ - WebDesktopEnvironment.Alert("TODO") //TODO - return "" - } - // console.log(response) - const file = await response.json() - //TODO Validate - return file - } - - /** - * @param {File} file - * @param {string} parentPath - * @returns {boolean} - */ - static async UploadFile(file, parentPath){ - console.log('here') - let formData = new FormData() - formData.append("file", file) //FIXME Conn reset - const params = new URLSearchParams({ - parentPath: parentPath, - }) - const response = await fetch(`/system/fs/upload?` + params, - { - method: "POST", //TODO Change to PUT? - body: formData - }) - console.log(response.status) - if (response.status != 201){ - const error = await response.json() - WebDesktopEnvironment.Alert(error.message) - return false - } - return true - } -} \ No newline at end of file +}; \ No newline at end of file diff --git a/resources/webfs.js b/resources/webfs.js new file mode 100644 index 0000000..d2b293d --- /dev/null +++ b/resources/webfs.js @@ -0,0 +1,131 @@ +class WebFS{ + /** + * @param {string} path + * @returns {boolean} + */ + static async CreateDirectory(path){ + if (path == undefined){ + WebDesktopEnvironment.Alert("Path is undefined") + return false + } + const params = new URLSearchParams({ + path: `${path}/New Directory` + }) + const response = await fetch(`/system/fs/createDir?` + params) + if (response.status != 200){ + WebDesktopEnvironment.Alert("DIRCTORY CREATION ERROR") //TODO + return false + } + return true + } + + /** + * @param {string} path + * @returns {boolean} + */ + static async DeleteFile(path){ + const params = new URLSearchParams({ + path: path + }) + const response = await fetch(`/system/fs/delete?` + params) + if (response.status != 200){ + WebDesktopEnvironment.Alert("DELETE ERROR") //TODO + return false + } + return true + } + + /** + * @param {string} path + * @returns {boolean} + */ + static async MoveFile(sourcePath, targetPath){ + const params = new URLSearchParams({ + sourcePath: sourcePath, + targetPath: targetPath + }) + const response = await fetch(`/system/fs/move?` + params) + if (response.status != 200){ + // WebDesktopEnvironment.Alert("Move ERROR") //TODO + return false + } + return true + } + + /** + * @param {string} linkPath + * @returns {string} + */ + static async ReadObjectLink(linkPath){ + const params = new URLSearchParams({ + linkPath: linkPath, + }) + const response = await fetch(`/system/fs/readObjectLink?` + params) + if (response.status != 200){ + WebDesktopEnvironment.Alert("TODO") //TODO + return "" + } + const path = await response.text() + //TODO Validate + return path + } + + /** + * @param {string} sourcePath + * @param {string} linkPath + * @returns {string} + */ + static async CreatePathLink(sourcePath, linkPath){ + const params = new URLSearchParams({ + sourcePath: sourcePath, + linkPath: linkPath, + }) + const response = await fetch(`/system/fs/createPathLink?` + params) + return response.status == 200 + } + + /** + * @param {string} linkPath + * @returns {string} + */ + static async ReadPathLink(linkPath){ + const params = new URLSearchParams({ + linkPath: linkPath, + }) + const response = await fetch(`/system/fs/readPathLink?` + params) + if (response.status != 200){ + WebDesktopEnvironment.Alert("TODO") //TODO + return "" + } + // console.log(response) + const file = await response.json() + //TODO Validate + return file + } + + /** + * @param {File} file + * @param {string} parentPath + * @returns {boolean} + */ + static async UploadFile(file, parentPath){ + console.log('here') + let formData = new FormData() + formData.append("file", file) //FIXME Conn reset + const params = new URLSearchParams({ + parentPath: parentPath, + }) + const response = await fetch(`/system/fs/upload?` + params, + { + method: "POST", //TODO Change to PUT? + body: formData + }) + console.log(response.status) + if (response.status != 201){ + const error = await response.json() + WebDesktopEnvironment.Alert(error.message) + return false + } + return true + } +} \ No newline at end of file diff --git a/templates/base/index.tmpl b/templates/base/index.tmpl index f67cae2..8a57f25 100644 --- a/templates/base/index.tmpl +++ b/templates/base/index.tmpl @@ -2,13 +2,11 @@ Greg Brzezinski - - @@ -17,6 +15,9 @@ + + +