hacklab/OASIS_MOBILE
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

upstream: integrar 0.9.5 en lo que no diverge (57 ficheros) + dependencias nuevas

Browse source 
Primera tanda de la integracion 0.9.1 -> 0.9.5. Se actualizan los 57 ficheros que
upstream cambio y la rama no tocaba, entre ellos los 11 de traduccion: eso ya solo
es posible gracias al overlay de i18n, antes eran 11 conflictos garantizados.

Se portan ademas las dependencias que 0.9.5 introduce y de las que dependen los
ficheros actualizados: pdfDocument, content_favorites, recurrence, media_gallery,
comments_view, gallery_view y polls (modelo, limites y vista).

Quedan 48 ficheros con divergencia real por resolver a mano (backend.js,
main_views.js, OasisMobile.css y 45 vistas y modelos).

Verificado: 0 errores de sintaxis en src/, 0 requires relativos rotos, la app
arranca declarando 0.9.5 y las 47 rutas principales responden 200/302.
This commit is contained in:
SITO 2026-08-18 21:42:59 +02:00
parent b3986b12a0
commit f964e61a1c
67 changed files with 5740 additions and 10907 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/views/pixelia_view.js
View file

@ -47,22 +47,22 @@ exports.pixeliaView = (pixelArt, errorMessage) => {
input({ type: "number", id: "y", name: "y", min: 1, max: gridHeight, required: true }),
label({ for: "color" }, i18n.colorLabel),
select({ id: "color", name: "color", required: true },
option({ value: "#000000", style: "background-color:#000000;" }, "Black"),
option({ value: "#ffffff", style: "background-color:#ffffff;" }, "White"),
option({ value: "#17f018", style: "background-color:#17f018;" }, "Green"),
option({ value: "#ffbb00", style: "background-color:#ffbb00;" }, "Yellow"),
option({ value: "#ff0000", style: "background-color:#ff0000;" }, "Red"),
option({ value: "#0000ff", style: "background-color:#0000ff;" }, "Blue"),
option({ value: "#ffff00", style: "background-color:#ffff00;" }, "Lime"),
option({ value: "#00ff00", style: "background-color:#00ff00;" }, "Spring Green"),
option({ value: "#00ffff", style: "background-color:#00ffff;" }, "Aqua"),
option({ value: "#ff00ff", style: "background-color:#ff00ff;" }, "Fuchsia"),
option({ value: "#a52a2a", style: "background-color:#a52a2a;" }, "Brown"),
option({ value: "#800080", style: "background-color:#800080;" }, "Purple"),
option({ value: "#808000", style: "background-color:#808000;" }, "Olive"),
option({ value: "#00bfff", style: "background-color:#00bfff;" }, "Deep Sky Blue"),
option({ value: "#d3d3d3", style: "background-color:#d3d3d3;" }, "Light Grey"),
option({ value: "#ff6347", style: "background-color:#ff6347;" }, "Tomato")
option({ value: "#000000", class: "pixelia-swatch pixelia-swatch-000000" }, "Black"),
option({ value: "#ffffff", class: "pixelia-swatch pixelia-swatch-ffffff" }, "White"),
option({ value: "#17f018", class: "pixelia-swatch pixelia-swatch-17f018" }, "Green"),
option({ value: "#ffbb00", class: "pixelia-swatch pixelia-swatch-ffbb00" }, "Yellow"),
option({ value: "#ff0000", class: "pixelia-swatch pixelia-swatch-ff0000" }, "Red"),
option({ value: "#0000ff", class: "pixelia-swatch pixelia-swatch-0000ff" }, "Blue"),
option({ value: "#ffff00", class: "pixelia-swatch pixelia-swatch-ffff00" }, "Lime"),
option({ value: "#00ff00", class: "pixelia-swatch pixelia-swatch-00ff00" }, "Spring Green"),
option({ value: "#00ffff", class: "pixelia-swatch pixelia-swatch-00ffff" }, "Aqua"),
option({ value: "#ff00ff", class: "pixelia-swatch pixelia-swatch-ff00ff" }, "Fuchsia"),
option({ value: "#a52a2a", class: "pixelia-swatch pixelia-swatch-a52a2a" }, "Brown"),
option({ value: "#800080", class: "pixelia-swatch pixelia-swatch-800080" }, "Purple"),
option({ value: "#808000", class: "pixelia-swatch pixelia-swatch-808000" }, "Olive"),
option({ value: "#00bfff", class: "pixelia-swatch pixelia-swatch-00bfff" }, "Deep Sky Blue"),
option({ value: "#d3d3d3", class: "pixelia-swatch pixelia-swatch-d3d3d3" }, "Light Grey"),
option({ value: "#ff6347", class: "pixelia-swatch pixelia-swatch-ff6347" }, "Tomato")
),
button({ type: "submit" }, i18n.paintButton)
)