From ed6550a4cdf7611ed0bb86af2d774f575ba33421 Mon Sep 17 00:00:00 2001 From: Cory McWilliams Date: Sat, 18 Jun 2022 17:07:36 +0000 Subject: [PATCH] Move some deps to deps. git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@3903 ed5197a5-7fde-0310-b194-c3ffbd925b24 --- core/client.js | 32 +++++++++---------- core/core.js | 32 ++++++------------- core/index.html | 4 +-- .../codemirror/annotatescrollbar.min.js | 0 {core => deps}/codemirror/base16-dark.min.css | 0 {core => deps}/codemirror/codemirror.min.css | 0 {core => deps}/codemirror/codemirror.min.js | 0 {core => deps}/codemirror/css.min.js | 0 {core => deps}/codemirror/dialog.min.css | 0 {core => deps}/codemirror/dialog.min.js | 0 {core => deps}/codemirror/htmlmixed.min.js | 0 {core => deps}/codemirror/javascript.min.js | 0 {core => deps}/codemirror/jump-to-line.min.js | 0 .../codemirror/matchesonscrollbar.min.css | 0 .../codemirror/matchesonscrollbar.min.js | 0 {core => deps}/codemirror/search.min.js | 0 {core => deps}/codemirror/searchcursor.min.js | 0 .../codemirror/trailingspace.min.js | 0 {core => deps}/codemirror/xml.min.js | 0 {core => deps/smoothie}/smoothie.js | 0 {core => deps/split}/split.min.js | 0 {core => deps/split}/split.min.js.map | 0 22 files changed, 27 insertions(+), 41 deletions(-) rename {core => deps}/codemirror/annotatescrollbar.min.js (100%) rename {core => deps}/codemirror/base16-dark.min.css (100%) rename {core => deps}/codemirror/codemirror.min.css (100%) rename {core => deps}/codemirror/codemirror.min.js (100%) rename {core => deps}/codemirror/css.min.js (100%) rename {core => deps}/codemirror/dialog.min.css (100%) rename {core => deps}/codemirror/dialog.min.js (100%) rename {core => deps}/codemirror/htmlmixed.min.js (100%) rename {core => deps}/codemirror/javascript.min.js (100%) rename {core => deps}/codemirror/jump-to-line.min.js (100%) rename {core => deps}/codemirror/matchesonscrollbar.min.css (100%) rename {core => deps}/codemirror/matchesonscrollbar.min.js (100%) rename {core => deps}/codemirror/search.min.js (100%) rename {core => deps}/codemirror/searchcursor.min.js (100%) rename {core => deps}/codemirror/trailingspace.min.js (100%) rename {core => deps}/codemirror/xml.min.js (100%) rename {core => deps/smoothie}/smoothie.js (100%) rename {core => deps/split}/split.min.js (100%) rename {core => deps/split}/split.min.js.map (100%) diff --git a/core/client.js b/core/client.js index cf14d468..7364cab5 100644 --- a/core/client.js +++ b/core/client.js @@ -91,22 +91,22 @@ function edit() { gSplit = Split(['#editPane', '#viewPane'], {minSize: 0}); ensureLoaded([ - {tagName: "script", attributes: {src: "/static/codemirror/codemirror.min.js"}}, - {tagName: "link", attributes: {rel: "stylesheet", href: "/static/codemirror/base16-dark.min.css"}}, - {tagName: "link", attributes: {rel: "stylesheet", href: "/static/codemirror/matchesonscrollbar.min.css"}}, - {tagName: "link", attributes: {rel: "stylesheet", href: "/static/codemirror/dialog.min.css"}}, - {tagName: "link", attributes: {rel: "stylesheet", href: "/static/codemirror/codemirror.min.css"}}, - {tagName: "script", attributes: {src: "/static/codemirror/trailingspace.min.js"}}, - {tagName: "script", attributes: {src: "/static/codemirror/dialog.min.js"}}, - {tagName: "script", attributes: {src: "/static/codemirror/search.min.js"}}, - {tagName: "script", attributes: {src: "/static/codemirror/searchcursor.min.js"}}, - {tagName: "script", attributes: {src: "/static/codemirror/jump-to-line.min.js"}}, - {tagName: "script", attributes: {src: "/static/codemirror/matchesonscrollbar.min.js"}}, - {tagName: "script", attributes: {src: "/static/codemirror/annotatescrollbar.min.js"}}, - {tagName: "script", attributes: {src: "/static/codemirror/javascript.min.js"}}, - {tagName: "script", attributes: {src: "/static/codemirror/css.min.js"}}, - {tagName: "script", attributes: {src: "/static/codemirror/xml.min.js"}}, - {tagName: "script", attributes: {src: "/static/codemirror/htmlmixed.min.js"}}, + {tagName: "script", attributes: {src: "/codemirror/codemirror.min.js"}}, + {tagName: "link", attributes: {rel: "stylesheet", href: "/codemirror/base16-dark.min.css"}}, + {tagName: "link", attributes: {rel: "stylesheet", href: "/codemirror/matchesonscrollbar.min.css"}}, + {tagName: "link", attributes: {rel: "stylesheet", href: "/codemirror/dialog.min.css"}}, + {tagName: "link", attributes: {rel: "stylesheet", href: "/codemirror/codemirror.min.css"}}, + {tagName: "script", attributes: {src: "/codemirror/trailingspace.min.js"}}, + {tagName: "script", attributes: {src: "/codemirror/dialog.min.js"}}, + {tagName: "script", attributes: {src: "/codemirror/search.min.js"}}, + {tagName: "script", attributes: {src: "/codemirror/searchcursor.min.js"}}, + {tagName: "script", attributes: {src: "/codemirror/jump-to-line.min.js"}}, + {tagName: "script", attributes: {src: "/codemirror/matchesonscrollbar.min.js"}}, + {tagName: "script", attributes: {src: "/codemirror/annotatescrollbar.min.js"}}, + {tagName: "script", attributes: {src: "/codemirror/javascript.min.js"}}, + {tagName: "script", attributes: {src: "/codemirror/css.min.js"}}, + {tagName: "script", attributes: {src: "/codemirror/xml.min.js"}}, + {tagName: "script", attributes: {src: "/codemirror/htmlmixed.min.js"}}, ], function() { load().catch(function(error) { alert(error); diff --git a/core/core.js b/core/core.js index e1d36aac..805ad495 100644 --- a/core/core.js +++ b/core/core.js @@ -266,26 +266,6 @@ var kStaticFiles = [ {uri: '/favicon.png', type: 'image/png'}, {uri: '/client.js', type: 'text/javascript; charset=UTF-8'}, {uri: '/robots.txt', type: 'text/plain; charset=UTF-8'}, - - {uri: '/split.min.js'}, - {uri: '/split.min.js.map'}, - {uri: '/smoothie.js'}, - {uri: '/codemirror/codemirror.min.js'}, - {uri: '/codemirror/base16-dark.min.css'}, - {uri: '/codemirror/matchesonscrollbar.min.css'}, - {uri: '/codemirror/dialog.min.css'}, - {uri: '/codemirror/codemirror.min.css'}, - {uri: '/codemirror/trailingspace.min.js'}, - {uri: '/codemirror/dialog.min.js'}, - {uri: '/codemirror/search.min.js'}, - {uri: '/codemirror/searchcursor.min.js'}, - {uri: '/codemirror/jump-to-line.min.js'}, - {uri: '/codemirror/matchesonscrollbar.min.js'}, - {uri: '/codemirror/annotatescrollbar.min.js'}, - {uri: '/codemirror/javascript.min.js'}, - {uri: '/codemirror/css.min.js'}, - {uri: '/codemirror/xml.min.js'}, - {uri: '/codemirror/htmlmixed.min.js'}, ]; function startsWithBytes(data, bytes) { @@ -324,7 +304,7 @@ const k_mime_types = { 'map': 'application/json', }; -async function perfettoHandler(request, response, uri) { +async function staticDirectoryHandler(request, response, directory, uri) { var filename = uri || 'index.html'; if (filename.indexOf('..') != -1) { response.writeHead(404, {"Content-Type": "text/plain; charset=utf-8", "Content-Length": "File not found".length}); @@ -333,7 +313,7 @@ async function perfettoHandler(request, response, uri) { } try { - var data = await File.readFile("deps/perfetto/" + filename); + var data = await File.readFile(directory + filename); response.writeHead(200, {"Content-Type": k_mime_types[filename.split('.').pop()] || 'text/plain', "Content-Length": data.byteLength}); response.end(data); } catch { @@ -593,8 +573,14 @@ loadSettings().then(function() { return blobHandler(request, response, match[1], match[2]); } else if (match = /^\/static(\/.*)/.exec(request.uri)) { return staticFileHandler(request, response, null, match[1]); + } else if (match = /^\/codemirror\/([\.\w-/]*)$/.exec(request.uri)) { + return staticDirectoryHandler(request, response, 'deps/codemirror/', match[1]); } else if (match = /^\/perfetto\/([\.\w-/]*)$/.exec(request.uri)) { - return perfettoHandler(request, response, match[1]); + return staticDirectoryHandler(request, response, 'deps/perfetto/', match[1]); + } else if (match = /^\/split\/([\.\w-/]*)$/.exec(request.uri)) { + return staticDirectoryHandler(request, response, 'deps/split/', match[1]); + } else if (match = /^\/smoothie\/([\.\w-/]*)$/.exec(request.uri)) { + return staticDirectoryHandler(request, response, 'deps/smoothie/', match[1]); } else if (match = /^(.*)(\/save?)$/.exec(request.uri)) { return blobHandler(request, response, match[1], match[2]); } else if (match = /^\/trace$/.exec(request.uri)) { diff --git a/core/index.html b/core/index.html index 35463403..f338d4de 100644 --- a/core/index.html +++ b/core/index.html @@ -59,8 +59,8 @@ - - + + diff --git a/core/codemirror/annotatescrollbar.min.js b/deps/codemirror/annotatescrollbar.min.js similarity index 100% rename from core/codemirror/annotatescrollbar.min.js rename to deps/codemirror/annotatescrollbar.min.js diff --git a/core/codemirror/base16-dark.min.css b/deps/codemirror/base16-dark.min.css similarity index 100% rename from core/codemirror/base16-dark.min.css rename to deps/codemirror/base16-dark.min.css diff --git a/core/codemirror/codemirror.min.css b/deps/codemirror/codemirror.min.css similarity index 100% rename from core/codemirror/codemirror.min.css rename to deps/codemirror/codemirror.min.css diff --git a/core/codemirror/codemirror.min.js b/deps/codemirror/codemirror.min.js similarity index 100% rename from core/codemirror/codemirror.min.js rename to deps/codemirror/codemirror.min.js diff --git a/core/codemirror/css.min.js b/deps/codemirror/css.min.js similarity index 100% rename from core/codemirror/css.min.js rename to deps/codemirror/css.min.js diff --git a/core/codemirror/dialog.min.css b/deps/codemirror/dialog.min.css similarity index 100% rename from core/codemirror/dialog.min.css rename to deps/codemirror/dialog.min.css diff --git a/core/codemirror/dialog.min.js b/deps/codemirror/dialog.min.js similarity index 100% rename from core/codemirror/dialog.min.js rename to deps/codemirror/dialog.min.js diff --git a/core/codemirror/htmlmixed.min.js b/deps/codemirror/htmlmixed.min.js similarity index 100% rename from core/codemirror/htmlmixed.min.js rename to deps/codemirror/htmlmixed.min.js diff --git a/core/codemirror/javascript.min.js b/deps/codemirror/javascript.min.js similarity index 100% rename from core/codemirror/javascript.min.js rename to deps/codemirror/javascript.min.js diff --git a/core/codemirror/jump-to-line.min.js b/deps/codemirror/jump-to-line.min.js similarity index 100% rename from core/codemirror/jump-to-line.min.js rename to deps/codemirror/jump-to-line.min.js diff --git a/core/codemirror/matchesonscrollbar.min.css b/deps/codemirror/matchesonscrollbar.min.css similarity index 100% rename from core/codemirror/matchesonscrollbar.min.css rename to deps/codemirror/matchesonscrollbar.min.css diff --git a/core/codemirror/matchesonscrollbar.min.js b/deps/codemirror/matchesonscrollbar.min.js similarity index 100% rename from core/codemirror/matchesonscrollbar.min.js rename to deps/codemirror/matchesonscrollbar.min.js diff --git a/core/codemirror/search.min.js b/deps/codemirror/search.min.js similarity index 100% rename from core/codemirror/search.min.js rename to deps/codemirror/search.min.js diff --git a/core/codemirror/searchcursor.min.js b/deps/codemirror/searchcursor.min.js similarity index 100% rename from core/codemirror/searchcursor.min.js rename to deps/codemirror/searchcursor.min.js diff --git a/core/codemirror/trailingspace.min.js b/deps/codemirror/trailingspace.min.js similarity index 100% rename from core/codemirror/trailingspace.min.js rename to deps/codemirror/trailingspace.min.js diff --git a/core/codemirror/xml.min.js b/deps/codemirror/xml.min.js similarity index 100% rename from core/codemirror/xml.min.js rename to deps/codemirror/xml.min.js diff --git a/core/smoothie.js b/deps/smoothie/smoothie.js similarity index 100% rename from core/smoothie.js rename to deps/smoothie/smoothie.js diff --git a/core/split.min.js b/deps/split/split.min.js similarity index 100% rename from core/split.min.js rename to deps/split/split.min.js diff --git a/core/split.min.js.map b/deps/split/split.min.js.map similarity index 100% rename from core/split.min.js.map rename to deps/split/split.min.js.map