From c889624f0a6e19e16d48ea1e8f3ef50f4f5e2ccc Mon Sep 17 00:00:00 2001 From: computermusik Date: Wed, 16 Apr 2025 17:56:05 +0200 Subject: [PATCH] cancel button css fix --- hss-server.maxpat | 92 ++++++++++++++------------------- javascript/djster_webcontrol.js | 7 ++- 2 files changed, 41 insertions(+), 58 deletions(-) diff --git a/hss-server.maxpat b/hss-server.maxpat index eb48e11..92d3cbf 100644 --- a/hss-server.maxpat +++ b/hss-server.maxpat @@ -4,7 +4,7 @@ "appversion" : { "major" : 9, "minor" : 0, - "revision" : 5, + "revision" : 6, "architecture" : "x64", "modernui" : 1 } @@ -173,7 +173,7 @@ "appversion" : { "major" : 9, "minor" : 0, - "revision" : 5, + "revision" : 6, "architecture" : "x64", "modernui" : 1 } @@ -1963,8 +1963,7 @@ } } - ], - "originid" : "pat-16914" + ] } , "patching_rect" : [ 1910.0, 213.0, 124.0, 22.0 ], @@ -2429,7 +2428,7 @@ "appversion" : { "major" : 9, "minor" : 0, - "revision" : 5, + "revision" : 6, "architecture" : "x64", "modernui" : 1 } @@ -2615,8 +2614,7 @@ } } - ], - "originid" : "pat-16918" + ] } , "patching_rect" : [ 1423.0, 329.0, 128.0, 22.0 ], @@ -2666,7 +2664,7 @@ "patching_rect" : [ 2169.0, 325.0, 41.0, 22.0 ], "presentation" : 1, "presentation_rect" : [ 413.0, 46.0, 39.0, 22.0 ], - "text" : "46:51" + "text" : "16:53" } } @@ -2690,7 +2688,7 @@ "patching_rect" : [ 1878.0, 139.0, 61.5, 22.0 ], "presentation" : 1, "presentation_rect" : [ 397.0, 13.0, 55.0, 22.0 ], - "text" : "11:50:31" + "text" : "14:26:13" } } @@ -3346,7 +3344,7 @@ "appversion" : { "major" : 9, "minor" : 0, - "revision" : 5, + "revision" : 6, "architecture" : "x64", "modernui" : 1 } @@ -3600,8 +3598,7 @@ } } - ], - "originid" : "pat-16920" + ] } , "patching_rect" : [ 1452.0, 153.0, 93.0, 22.0 ], @@ -3662,7 +3659,7 @@ "appversion" : { "major" : 9, "minor" : 0, - "revision" : 5, + "revision" : 6, "architecture" : "x64", "modernui" : 1 } @@ -3919,8 +3916,7 @@ } } - ], - "originid" : "pat-16922" + ] } , "patching_rect" : [ 1646.0, 422.0, 60.0, 22.0 ], @@ -4419,7 +4415,7 @@ "appversion" : { "major" : 9, "minor" : 0, - "revision" : 5, + "revision" : 6, "architecture" : "x64", "modernui" : 1 } @@ -5032,7 +5028,7 @@ "appversion" : { "major" : 9, "minor" : 0, - "revision" : 5, + "revision" : 6, "architecture" : "x64", "modernui" : 1 } @@ -5240,8 +5236,7 @@ } } - ], - "originid" : "pat-16928" + ] } , "patching_rect" : [ 593.0, 582.0, 73.0, 22.0 ], @@ -6227,8 +6222,7 @@ } } - ], - "originid" : "pat-16926" + ] } , "patching_rect" : [ 1239.0, 610.0, 80.0, 22.0 ], @@ -6426,7 +6420,7 @@ "appversion" : { "major" : 9, "minor" : 0, - "revision" : 5, + "revision" : 6, "architecture" : "x64", "modernui" : 1 } @@ -6550,8 +6544,7 @@ } } - ], - "originid" : "pat-16930" + ] } , "patching_rect" : [ 919.0, 207.0, 55.0, 22.0 ], @@ -6596,7 +6589,7 @@ "appversion" : { "major" : 9, "minor" : 0, - "revision" : 5, + "revision" : 6, "architecture" : "x64", "modernui" : 1 } @@ -6969,8 +6962,7 @@ } } - ], - "originid" : "pat-16932" + ] } , "patching_rect" : [ 752.0, 253.0, 45.0, 22.0 ], @@ -7029,7 +7021,7 @@ "appversion" : { "major" : 9, "minor" : 0, - "revision" : 5, + "revision" : 6, "architecture" : "x64", "modernui" : 1 } @@ -8260,8 +8252,7 @@ } } - ], - "originid" : "pat-16934" + ] } , "patching_rect" : [ 879.0, 292.0, 115.0, 22.0 ], @@ -8365,7 +8356,7 @@ "appversion" : { "major" : 9, "minor" : 0, - "revision" : 5, + "revision" : 6, "architecture" : "x64", "modernui" : 1 } @@ -8523,8 +8514,7 @@ } } - ], - "originid" : "pat-16936" + ] } , "patching_rect" : [ 501.0, 234.0, 34.0, 22.0 ], @@ -8630,7 +8620,7 @@ "outlettype" : [ "", "", "", "" ], "patching_rect" : [ 926.0, 16.0, 56.0, 22.0 ], "restore" : { - "duration" : [ 3600 ], + "duration" : [ 1800 ], "mc.function" : [ "data", 0, 196, 86400.0, 0.0, 1.0, 0.0, 0.0, 0, 0.0, 1800.0, 0.515873, 0, 0.0, 3600.0, 0.444444, 0, 0.0, 5400.0, 0.420635, 0, 0.0, 7200.0, 0.380952, 0, 0.0, 9000.0, 0.325397, 0, 0.0, 10800.0, 0.301587, 0, 0.0, 12600.0, 0.301587, 0, 0.0, 14400.0, 0.285714, 0, 0.0, 16200.0, 0.277778, 0, 0.0, 18000.0, 0.253968, 0, 0.0, 19800.0, 0.238095, 0, 0.0, 21600.0, 0.206349, 0, 0.0, 23400.0, 0.150794, 0, 0.0, 25200.0, 0.103175, 0, 0.0, 27000.0, 0.103175, 0, 0.0, 28800.0, 0.095238, 0, 0.0, 30600.0, 0.103175, 0, 0.0, 32400.0, 0.103175, 0, 0.0, 34200.0, 0.111111, 0, 0.0, 36000.0, 0.111111, 0, 0.0, 37800.0, 0.111111, 0, 0.0, 39600.0, 0.103175, 0, 0.0, 41400.0, 0.111111, 0, 0.0, 43200.0, 0.103175, 0, 0.0, 45000.0, 0.103175, 0, 0.0, 46800.0, 0.142857, 0, 0.0, 48600.0, 0.166667, 0, 0.0, 50400.0, 0.230159, 0, 0.0, 52200.0, 0.309524, 0, 0.0, 54000.0, 0.388889, 0, 0.0, 55800.0, 0.5, 0, 0.0, 57600.0, 0.531746, 0, 0.0, 59400.0, 0.587302, 0, 0.0, 61200.0, 0.674603, 0, 0.0, 63000.0, 0.746032, 0, 0.0, 64800.0, 0.801587, 0, 0.0, 66600.0, 0.896825, 0, 0.0, 68400.0, 0.904762, 0, 0.0, 70200.0, 0.912698, 0, 0.0, 72000.0, 0.896825, 0, 0.0, 73800.0, 0.904762, 0, 0.0, 75600.0, 0.873016, 0, 0.0, 77400.0, 0.904762, 0, 0.0, 79200.0, 0.81746, 0, 0.0, 81000.0, 0.777778, 0, 0.0, 82800.0, 0.738095, 0, 0.0, 84600.0, 0.650794, 0, 0.0, "curve", "data", 1, 196, 86400.0, 0.0, 1.0, 0.0, 0.0, 0, 0.0, 1800.0, 0.502041, 0, 0.0, 3600.0, 0.559184, 0, 0.0, 5400.0, 0.583673, 0, 0.0, 7200.0, 0.64898, 0, 0.0, 9000.0, 0.689796, 0, 0.0, 10800.0, 0.706122, 0, 0.0, 12600.0, 0.714286, 0, 0.0, 14400.0, 0.722449, 0, 0.0, 16200.0, 0.730612, 0, 0.0, 18000.0, 0.771429, 0, 0.0, 19800.0, 0.779592, 0, 0.0, 21600.0, 0.795918, 0, 0.0, 23400.0, 0.844898, 0, 0.0, 25200.0, 0.853061, 0, 0.0, 27000.0, 0.795918, 0, 0.0, 28800.0, 0.730612, 0, 0.0, 30600.0, 0.697959, 0, 0.0, 32400.0, 0.62449, 0, 0.0, 34200.0, 0.502041, 0, 0.0, 36000.0, 0.461224, 0, 0.0, 37800.0, 0.412245, 0, 0.0, 39600.0, 0.379592, 0, 0.0, 41400.0, 0.314286, 0, 0.0, 43200.0, 0.2, 0, 0.0, 45000.0, 0.093878, 0, 0.0, 46800.0, 0.134694, 0, 0.0, 48600.0, 0.183673, 0, 0.0, 50400.0, 0.257143, 0, 0.0, 52200.0, 0.330612, 0, 0.0, 54000.0, 0.436735, 0, 0.0, 55800.0, 0.502041, 0, 0.0, 57600.0, 0.559184, 0, 0.0, 59400.0, 0.608163, 0, 0.0, 61200.0, 0.706122, 0, 0.0, 63000.0, 0.746939, 0, 0.0, 64800.0, 0.795918, 0, 0.0, 66600.0, 0.885714, 0, 0.0, 68400.0, 0.787755, 0, 0.0, 70200.0, 0.640816, 0, 0.0, 72000.0, 0.477551, 0, 0.0, 73800.0, 0.346939, 0, 0.0, 75600.0, 0.216327, 0, 0.0, 77400.0, 0.085714, 0, 0.0, 79200.0, 0.167347, 0, 0.0, 81000.0, 0.232653, 0, 0.0, 82800.0, 0.273469, 0, 0.0, 84600.0, 0.363265, 0, 0.0, "curve" ], "nodes" : [ 0.5, 0.5, 0.1, 1, 0.1, 0.1, 0.1, 1, 0.9, 0.1, 0.1, 1, 0.9, 0.9, 0.1, 1, 0.1, 0.9, 0.1, 1 ], "pause" : [ 20 ], @@ -8685,16 +8675,17 @@ "appversion" : { "major" : 9, "minor" : 0, - "revision" : 5, + "revision" : 6, "architecture" : "x64", "modernui" : 1 } , "classnamespace" : "box", - "rect" : [ 4.0, 72.0, 1138.0, 1067.0 ], + "openrect" : [ 4.0, 72.0, 403.0, 671.0 ], "openinpresentation" : 1, "gridsize" : [ 15.0, 15.0 ], "toolbarvisible" : 0, + "devicewidth" : 403.0, "visible" : 1, "boxes" : [ { "box" : { @@ -9389,7 +9380,6 @@ } ], - "originid" : "pat-16938", "bgcolor" : [ 1.0, 1.0, 0.941, 1.0 ] } , @@ -9415,7 +9405,7 @@ "appversion" : { "major" : 9, "minor" : 0, - "revision" : 5, + "revision" : 6, "architecture" : "x64", "modernui" : 1 } @@ -9561,7 +9551,7 @@ "appversion" : { "major" : 9, "minor" : 0, - "revision" : 5, + "revision" : 6, "architecture" : "x64", "modernui" : 1 } @@ -10392,8 +10382,7 @@ } } - ], - "originid" : "pat-16942" + ] } , "patching_rect" : [ 313.0, 309.0, 392.0, 22.0 ], @@ -10414,7 +10403,7 @@ "appversion" : { "major" : 9, "minor" : 0, - "revision" : 5, + "revision" : 6, "architecture" : "x64", "modernui" : 1 } @@ -10518,7 +10507,7 @@ "appversion" : { "major" : 9, "minor" : 0, - "revision" : 5, + "revision" : 6, "architecture" : "x64", "modernui" : 1 } @@ -10656,8 +10645,7 @@ } } - ], - "originid" : "pat-16946" + ] } , "patching_rect" : [ 9.0, 147.0, 86.0, 22.0 ], @@ -12220,8 +12208,7 @@ } } - ], - "originid" : "pat-16944" + ] } , "patching_rect" : [ 192.0, 531.0, 51.0, 22.0 ], @@ -12290,7 +12277,7 @@ "appversion" : { "major" : 9, "minor" : 0, - "revision" : 5, + "revision" : 6, "architecture" : "x64", "modernui" : 1 } @@ -13462,8 +13449,7 @@ } } - ], - "originid" : "pat-16948" + ] } , "patching_rect" : [ 762.0, 299.0, 62.0, 22.0 ], @@ -13991,8 +13977,7 @@ } } - ], - "originid" : "pat-16940" + ] } , "patching_rect" : [ 347.0, 242.0, 97.0, 22.0 ], @@ -14197,7 +14182,7 @@ "outlettype" : [ "", "" ], "patching_rect" : [ 169.0, 125.0, 118.0, 22.0 ], "saved_object_attributes" : { - "filename" : "djster_webcontrol.js", + "filename" : "djster_webcontrol", "parameter_enable" : 0 } , @@ -15585,7 +15570,6 @@ } ], - "originid" : "pat-16250", "parameters" : { "obj-15::obj-1" : [ "Outset Pulses[3]", "Outset Pulses", 0 ], "obj-15::obj-104" : [ "umenu[3]", "Tonality Profile", 0 ], diff --git a/javascript/djster_webcontrol.js b/javascript/djster_webcontrol.js index 9c31dca..9671d47 100644 --- a/javascript/djster_webcontrol.js +++ b/javascript/djster_webcontrol.js @@ -350,7 +350,7 @@ var html = { }*/ }); - addButton("systemDIV", "cancelbutton", "Cancel", "margin-left:20vw;", "document.getElementById('basicDIV').style.display='block';document.getElementById('expertDIV').style.display='none';document.getElementById('roomDIV').style.display='none';document.getElementById('spat').style.display='none';document.getElementById('systemDIV').style.display='none';document.getElementById('manualDIV').style.display='none';document.getElementById('basic').style['background-color']='" + active + "';document.getElementById('expert').style['background-color']='" + nonactive + "';document.getElementById('room').style['background-color']='" + nonactive + "';document.getElementById('system').style['background-color']='" + nonactive + "';document.getElementById('manual').style['background-color']='" + nonactive + "';"); + addButton("systemDIV", "cancelbutton", "Cancel", "margin-left:20vw;", "document.getElementById('basicDIV').style.display='block';document.getElementById('expertDIV').style.display='none';document.getElementById('roomDIV').style.display='none';document.getElementById('spat').style.display='none';document.getElementById('systemDIV').style.display='none';document.getElementById('manualDIV').style.display='none';document.getElementById('basic').style['color']='" + active + "';document.getElementById('expert').style['color']='" + nonactive + "';document.getElementById('room').style['color']='" + nonactive + "';document.getElementById('system').style['color']='" + nonactive + "';document.getElementById('manual').style['color']='" + nonactive + "';"); addButton("systemDIV", "proceedbutton", "Shut Down", "background-color:" + alert + ";margin-left:15vw;", "drawsocket.send({system: {shutdown : true}})"); elements.push( @@ -424,9 +424,8 @@ var html = { "margin-left" : "10px" } }); - - - addButton("systemDIV", "cancelbutton", "Cancel", "background-color:" + nonactive + ";margin-left:20vw;", "document.getElementById('basicDIV').style.display='block';document.getElementById('expertDIV').style.display='none';document.getElementById('roomDIV').style.display='none';document.getElementById('spat').style.display='none';document.getElementById('systemDIV').style.display='none';document.getElementById('manualDIV').style.display='none';document.getElementById('basic').style['background-color']='" + active + "';document.getElementById('expert').style['background-color']='" + nonactive + "';document.getElementById('room').style['background-color']='" + nonactive + "';document.getElementById('system').style['background-color']='" + nonactive + "';document.getElementById('manual').style['background-color']='" + nonactive + "';"); + + addButton("systemDIV", "cancelbutton", "Cancel", "margin-left:20vw;", "document.getElementById('basicDIV').style.display='block';document.getElementById('expertDIV').style.display='none';document.getElementById('roomDIV').style.display='none';document.getElementById('spat').style.display='none';document.getElementById('systemDIV').style.display='none';document.getElementById('manualDIV').style.display='none';document.getElementById('basic').style['color']='" + active + "';document.getElementById('expert').style['color']='" + nonactive + "';document.getElementById('room').style['color']='" + nonactive + "';document.getElementById('system').style['color']='" + nonactive + "';document.getElementById('manual').style['color']='" + nonactive + "';"); addButton("systemDIV", "proceedbutton", "Shut Down", "background-color:" + alert + ";margin-left:15vw;", "drawsocket.send({system: {shutdown : true}})"); elements.push(