From 21a4ff24b8dbff831c741e5eb5d0675859a502fa Mon Sep 17 00:00:00 2001 From: xdrm-brackets Date: Mon, 18 Jul 2016 17:00:41 +0200 Subject: [PATCH] minmod --- manager/view/machine/groups.php | 2 -- manager/view/user/groups.php | 2 -- test/client/interface.php | 24 ++++++++++-------------- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/manager/view/machine/groups.php b/manager/view/machine/groups.php index ea38bcd..d761894 100644 --- a/manager/view/machine/groups.php +++ b/manager/view/machine/groups.php @@ -24,8 +24,6 @@ @name #@name @icon_remove - @icon_edit - @icon_type utilisateurs (@count) diff --git a/manager/view/user/groups.php b/manager/view/user/groups.php index 8c8511a..5414ad6 100644 --- a/manager/view/user/groups.php +++ b/manager/view/user/groups.php @@ -24,8 +24,6 @@ @name #@name @icon_remove - @icon_edit - @icon_type @count utilisateurs diff --git a/test/client/interface.php b/test/client/interface.php index b3554e7..5306e30 100644 --- a/test/client/interface.php +++ b/test/client/interface.php @@ -218,11 +218,7 @@ /* [0] Initialisation et éléments =========================================================*/ /* (1) Etats du système */ - var STATE = { - started: false, - signaled: false, - locked: false - }; + var STATE = [ false, false, false ]; /* (2) Elements du DOM */ var mBox = document.getElementById('machine-box'); @@ -260,17 +256,17 @@ ---------------------------------------------------------*/ function updateChips(){ /* (1) Si machine bloquée */ - if( STATE.locked ){ - STATE.started = false; - STATE.signaled = false; + if( STATE[2] ){ + STATE[0] = false; + STATE[1] = false; led.style.background = '#f00'; } /* (2) Si machine allumée */ - else if( STATE.started ){ + else if( STATE[0] ){ // {1} Allumée + signalée // - if( STATE.signaled ) + if( STATE[1] ) led.style.background = '#00f'; // {2} Allumée (non signalée) // @@ -280,7 +276,7 @@ }else led.style.background = '#000'; - if( STATE.started == true ) + if( STATE[0] == true ) r1.addClass('active'); else r1.remClass('active'); @@ -323,9 +319,9 @@ function countRoutine(){ COUNT++; - if( COUNT == 1 ) STATE.started = !STATE.started; - if( COUNT == 2 ) STATE.signaled = true; - if( COUNT == 3 ) STATE.locked = true; + if( COUNT == 1 ) STATE[0] = !STATE[0]; + if( COUNT == 2 ) STATE[1] = true; + if( COUNT == 3 ) STATE[2] = true; updateChips(); }