Skip to content

Commit

Permalink
Merge pull request TBSniller#68 from TBSniller/update_and_lint
Browse files Browse the repository at this point in the history
lint, update & push to 0.4.3
  • Loading branch information
TBSniller committed Mar 11, 2023
2 parents 00f94ae + 88e1344 commit d356d61
Show file tree
Hide file tree
Showing 6 changed files with 7,417 additions and 5,621 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build_piccap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ jobs:
submodules: recursive
fetch-depth: 0

- uses: actions/setup-node@v1
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 18

- name: Install webOS CLI
run: sudo npm install --location=global @webosose/ares-cli
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
run: find . && find ./build

- name: Upload PicCap IPK
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: piccap_ipk
path: ./build/*.ipk
Expand Down
2 changes: 1 addition & 1 deletion frontend/appinfo.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "org.webosbrew.piccap",
"version": "0.4.2",
"version": "0.4.3",
"vendor": "Homebrew",
"type": "web",
"main": "index.html",
Expand Down
9 changes: 5 additions & 4 deletions frontend/js/ui.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ window.switchView = function (view) {
const btnsettings = document.getElementById('btnNavSettings');
const btnlogs = document.getElementById('btnNavLogs');
const btnabout = document.getElementById('btnNavAbout');

const settingItemsAdv = document.getElementById('settingItemsAdv');
const settingItemsNormal = document.getElementById('settingItemsNormal');
const btnAdvanced = document.getElementById('btnSettingsAdvanced');
switch (view) {
case 'service':
service.style.display = 'block';
Expand Down Expand Up @@ -52,10 +56,7 @@ window.switchView = function (view) {
btnabout.style.background = null;
btnabout.style.color = null;

//Open non advanced page
const settingItemsAdv = document.getElementById('settingItemsAdv');
const settingItemsNormal = document.getElementById('settingItemsNormal');
const btnAdvanced = document.getElementById('btnSettingsAdvanced');
// Open non advanced page
btnAdvanced.style.background = null;
btnAdvanced.style.color = null;
settingItemsNormal.style.display = 'block';
Expand Down
2 changes: 1 addition & 1 deletion hyperion-webos
Loading

0 comments on commit d356d61

Please sign in to comment.