Merge pull request #116 from AN0NCER/develop

Correction + revision
AN0NCER · Jul 14, 2024 · bd7c0ea · bd7c0ea
2 parents d01881e + 6bb4b63
commit bd7c0ea
Show file tree

Hide file tree

Showing 25 changed files with 392 additions and 468 deletions.
diff --git a/404a.html b/404a.html
@@ -141,6 +141,7 @@
 
     <!-- #region JavaScript-->
     <script src="/javascript/library/jqery.min.js"></script>
+    <script src="/javascript/services/dispatcher.js" type="module"></script>
     <script src="/javascript/kodik.js"></script>
     <script src="/javascript/parametrs.js"></script>
     <script src="/javascript/pages/404a.js" type="module"></script>

diff --git a/index.html b/index.html
@@ -19,7 +19,6 @@
     <link rel="stylesheet" href="/style/css/index.css">
     <link rel="manifest" href="/images/icons/manifest-o.json">
     <script src="/javascript/library/jqery.min.js"></script>
-    <script src="/javascript/engine/event_handler.js"></script>
 </head>
 
 <body data-orientation="0">
@@ -260,6 +259,7 @@
     <script src="/javascript/library/anime.min.js"></script>
     <!--Custom library-->
     <script src="/javascript/server.js"></script>
+    <script src="/javascript/services/dispatcher.js" type="module"></script>
     <script src="/javascript/parametrs.js"></script>
     <script src="/javascript/kodik.js"></script>
     <script src="/javascript/pages/index.js" type="module"></script>

diff --git a/javascript/engine/event_handler.js b/javascript/engine/event_handler.js
diff --git a/javascript/engine/orientation.js b/javascript/engine/orientation.js
diff --git a/javascript/menu.js b/javascript/menu.js
@@ -510,20 +510,6 @@ const IntercatMenu = {
         },
         line: {
 
-        },
-        standartcontrol: {
-            type: "parametr",
-            disabled: () => {
-                return false;
-            },
-            value: () => {
-                return $PARAMETERS.player.autonekst;
-            },
-            text: "Автопереключение",
-            icon: `<svg xmlns="http://www.w3.org/2000/svg" height="1em" viewBox="0 0 384 512"><path d="M73 39c-14.8-9.1-33.4-9.4-48.5-.9S0 62.6 0 80V432c0 17.4 9.4 33.4 24.5 41.9s33.7 8.1 48.5-.9L361 297c14.3-8.7 23-24.2 23-41s-8.7-32.2-23-41L73 39z"/></svg>`,
-            event: (bool) => {
-                setParameter('autonekst', bool);
-            }
         },
         fullscreen: {
             type: "parametr",
@@ -550,10 +536,8 @@ const IntercatMenu = {
             event: (bool) => {
                 setParameter('standart', bool);
             },
-            text: "Плеер",
-            icon: `<svg width="16" height="20" viewBox="0 0 16 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-            <path d="M0.550458 5.92729H3.44954C3.87634 5.92729 4.0784 5.84857 4.17437 5.44142C4.27034 5.03428 4.29358 4.58401 4.29358 4.58401H5.50459V15.5304C5.50459 15.5304 5.12416 15.6461 4.69725 15.759C4.27034 15.872 4.11009 16.0419 4.11009 16.3306V19.1029C4.11009 19.3602 4.33027 19.6746 4.69725 19.6746H11.3028C11.633 19.6746 11.8899 19.3602 11.8899 19.1315V16.302C11.8899 16.0734 11.6697 15.8448 11.4128 15.7876C11.156 15.7304 10.4954 15.5304 10.4954 15.5304V4.58401H11.7064L11.9266 5.44142C11.9633 5.64149 12.2202 5.92729 12.5138 5.92729H15.4495C15.7431 5.92729 16 5.61291 16 5.41284V0.868531C16 0.668467 15.7064 0.3255 15.4128 0.3255H0.587156C0.293578 0.3255 0 0.697048 0 0.897112V5.38426C0 5.58433 0.293577 5.92729 0.550458 5.92729Z" fill="white"/>
-          </svg>`
+            text: "Tunime плеер",
+            icon: `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M159.3 5.4c7.8-7.3 19.9-7.2 27.7 .1c27.6 25.9 53.5 53.8 77.7 84c11-14.4 23.5-30.1 37-42.9c7.9-7.4 20.1-7.4 28 .1c34.6 33 63.9 76.6 84.5 118c20.3 40.8 33.8 82.5 33.8 111.9C448 404.2 348.2 512 224 512C98.4 512 0 404.1 0 276.5c0-38.4 17.8-85.3 45.4-131.7C73.3 97.7 112.7 48.6 159.3 5.4zM225.7 416c25.3 0 47.7-7 68.8-21c42.1-29.4 53.4-88.2 28.1-134.4c-4.5-9-16-9.6-22.5-2l-25.2 29.3c-6.6 7.6-18.5 7.4-24.7-.5c-16.5-21-46-58.5-62.8-79.8c-6.3-8-18.3-8.1-24.7-.1c-33.8 42.5-50.8 69.3-50.8 99.4C112 375.4 162.6 416 225.7 416z"/></svg>`
         }
     }
 }