From 47c8dd3a9874dcaf505abcea61cd550a2e87c816 Mon Sep 17 00:00:00 2001 From: sijanec Date: Wed, 23 Sep 2020 19:48:48 +0200 Subject: ugly hack --- assets/js/meals.js | 5 +++-- dist/cache_name.txt | 2 +- dist/js/app.js | 2 +- dist/js/meals.js | 4 ++-- dist/pages/about.html | 2 +- dist/sw.js | 4 ++-- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/assets/js/meals.js b/assets/js/meals.js index d614153..49d787d 100644 --- a/assets/js/meals.js +++ b/assets/js/meals.js @@ -324,7 +324,7 @@ var mealClickHandler = (eventClickInfo) => { document.getElementById("meal-options").innerHTML = ""; for(const [option_index, option_object] of Object.entries(meal_object.menu_options)) { let menu_option_li_el = document.createElement("li"); - let menu_option_a_el = document.createElement("a"); + let menu_option_a_el = document.createElement("button"); menu_option_a_el.innerText = option_object.text; // console.log(JSON.stringify(meal_object)); // debug if (option_object.selected != null) { @@ -334,7 +334,8 @@ var mealClickHandler = (eventClickInfo) => { menu_option_a_el.className = "selected-meal"; } } - menu_option_a_el.style = "waves-effect"; + menu_option_a_el.classList = "waves-effect waves-light btn-large"; + menu_option_a_el.style = "color: var(--color-text); background-color: rgba(0,0,0,0); line-height: 1.2; height:auto !important;"; menu_option_a_el.id = "menu_index_"+option_index; if(!(meal_object.readonly)) { menu_option_a_el.onclick = () => { diff --git a/dist/cache_name.txt b/dist/cache_name.txt index fbcbaab..66c4f1d 100755 --- a/dist/cache_name.txt +++ b/dist/cache_name.txt @@ -2,4 +2,4 @@ -///site-static-1.0.15.0-beta-5578035||| +///site-static-1.0.15.0-beta-bd565da||| diff --git a/dist/js/app.js b/dist/js/app.js index d143339..b37978c 100755 --- a/dist/js/app.js +++ b/dist/js/app.js @@ -3,7 +3,7 @@ const app_version = "1.0.15.0-beta"; -const previous_commit = "557803555ed7a4ae4c620c0a50405db049b627df"; +const previous_commit = "bd565dab653a0e10e083d5b1a2898d00a1f6a4da"; const BEZIAPP_UPDATE_INTERVAL = 300; // update vsakih 300 sekund if ("serviceWorker" in navigator) { diff --git a/dist/js/meals.js b/dist/js/meals.js index 2d502e8..5c2aecb 100755 --- a/dist/js/meals.js +++ b/dist/js/meals.js @@ -23,8 +23,8 @@ setLoading(false);},error:()=>{setLoading(false);UIAlert(D("lopolisAPIConnection async function setMenu(date,menu){let choice={};choice[date]=menu;getToken(getMenus,[setMenus,choice]);} function setupEventListeners(){$("#meals-login").click(()=>{lopolisLogin();});$("#meals-logout").click(()=>{lopolisLogout();});} var mealClickHandler=(eventClickInfo)=>{let meal_date=eventClickInfo.event.id;let meal_object=meals_data_global[meal_date];$("#meal-type").text(meal_object.meal);let meal_date_obj=new Date(meal_date);$("#meal-date").text(dateString.longFormatted(meal_date_obj));if(!(meal_object.readonly)){document.getElementById("meal-readonly").style.display="none";}else{document.getElementById("meal-readonly").style.display="block";} -document.getElementById("meal-options").innerHTML="";for(const[option_index,option_object]of Object.entries(meal_object.menu_options)){let menu_option_li_el=document.createElement("li");let menu_option_a_el=document.createElement("a");menu_option_a_el.innerText=option_object.text;if(option_object.selected!=null){if(option_object.selected){menu_option_a_el.className="selected-meal";}} -menu_option_a_el.style="waves-effect";menu_option_a_el.id="menu_index_"+option_index;if(!(meal_object.readonly)){menu_option_a_el.onclick=()=>{setMenu(meal_date,option_object.value);menu_option_a_el.className="to-be-selected-meal";let sidenav_element=document.getElementById("meal-info");let sidenav_instance=M.Sidenav.getInstance(sidenav_element);sidenav_instance.close();};} +document.getElementById("meal-options").innerHTML="";for(const[option_index,option_object]of Object.entries(meal_object.menu_options)){let menu_option_li_el=document.createElement("li");let menu_option_a_el=document.createElement("button");menu_option_a_el.innerText=option_object.text;if(option_object.selected!=null){if(option_object.selected){menu_option_a_el.className="selected-meal";}} +menu_option_a_el.classList="waves-effect waves-light btn-large";menu_option_a_el.style="color: var(--color-text); background-color: rgba(0,0,0,0); line-height: 1.2; height:auto !important;";menu_option_a_el.id="menu_index_"+option_index;if(!(meal_object.readonly)){menu_option_a_el.onclick=()=>{setMenu(meal_date,option_object.value);menu_option_a_el.className="to-be-selected-meal";let sidenav_element=document.getElementById("meal-info");let sidenav_instance=M.Sidenav.getInstance(sidenav_element);sidenav_instance.close();};} menu_option_li_el.appendChild(menu_option_a_el);document.getElementById("meal-options").appendChild(menu_option_li_el);} let sidenav_element=document.getElementById("meal-info");let sidenav_instance=M.Sidenav.getInstance(sidenav_element);sidenav_instance.open();} document.addEventListener("DOMContentLoaded",async()=>{checkLogin();var calendarEl=document.getElementById("meals-calendar");meals_calendar_obj=new FullCalendar.Calendar(calendarEl,{firstDay:1,plugins:["dayGrid"],defaultDate:getDateString(),navLinks:false,editable:false,events:[],eventClick:mealClickHandler,height:"parent"});meals_calendar_obj.render();setupEventListeners();$("#refresh-icon").click(function(){refreshMeals();});const menus=document.querySelectorAll('.side-menu');M.Sidenav.init(menus,{edge:'right',draggable:true});const modals=document.querySelectorAll('.side-modal');M.Sidenav.init(modals,{edge:'left',draggable:false});document.getElementsByClassName("fc-today-button")[0].style="display:none !important";var elemsx=document.querySelectorAll('select');M.FormSelect.init(elemsx);var datepickerelems=document.querySelectorAll('.datepicker');var today=new Date();M.Datepicker.init(datepickerelems,{firstDay:1,minDate:today,showDaysInNextAndPreviousMonths:true,showClearBtn:true,format:"dddd, dd. mmmm yyyy"});refreshMeals();}); \ No newline at end of file diff --git a/dist/pages/about.html b/dist/pages/about.html index 85721e8..5e28ce2 100755 --- a/dist/pages/about.html +++ b/dist/pages/about.html @@ -160,7 +160,7 @@

- ^HEAD 557803555ed7a4ae4c620c0a50405db049b627df + ^HEAD bd565dab653a0e10e083d5b1a2898d00a1f6a4da

diff --git a/dist/sw.js b/dist/sw.js index 6d97ea1..dbe1db3 100755 --- a/dist/sw.js +++ b/dist/sw.js @@ -3,8 +3,8 @@ // Change version to cause cache refresh -const static_cache_name = "site-static-1.0.15.0-beta-5578035"; -// commit before the latest is 557803555ed7a4ae4c620c0a50405db049b627df +const static_cache_name = "site-static-1.0.15.0-beta-bd565da"; +// commit before the latest is bd565dab653a0e10e083d5b1a2898d00a1f6a4da // Got them with find . -not -path '*/\.*' | sed "s/.*/\"&\",/" | grep -v sw.js // sw.js NE SME BITI CACHAN, ker vsebuje verzijo! -- cgit v1.2.3