Merge branch 'master' of github.com:PyPlanet/PyPlanet

PyPlanet · Nov 4, 2023 · d0e5505 · d0e5505
2 parents ff6f062 + f8c5ee4
commit d0e5505
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 44 deletions.
diff --git a/pyplanet/apps/contrib/live_rankings/templates/widget.Script.txt b/pyplanet/apps/contrib/live_rankings/templates/widget.Script.txt
diff --git a/pyplanet/apps/contrib/live_rankings/templates/widget.xml b/pyplanet/apps/contrib/live_rankings/templates/widget.xml
@@ -21,7 +21,3 @@
     {% endfor %}
   {% endif %}
 {% endblock %}
-
-{% block maniascript %}
-  <script><!-- {% include 'live_rankings/widget.Script.txt' %} --></script>
-{% endblock %}
diff --git a/pyplanet/views/templates/generics/widget.Script.Txt b/pyplanet/views/templates/generics/widget.Script.Txt
@@ -136,5 +136,14 @@ while(True) {
     override_enable = True;
   }
 
+  foreach (Event in PendingEvents) {
+    if (Event.Type == CMlScriptEvent::Type::MouseClick && Event.Control.HasClass("toggleSpec")) {
+      if (InputPlayer.RequestsSpectate) {
+        declare frame <=> Event.Control.Parent;
+        SetSpectateTarget(frame.DataAttributeGet("login"));
+      }
+    }
+  }
+
   yield;
 }
diff --git a/pyplanet/views/templates/generics/widget_next.Script.Txt b/pyplanet/views/templates/generics/widget_next.Script.Txt
@@ -84,5 +84,14 @@ while(True) {
     override_enable = True;
   }
 
+  foreach (Event in PendingEvents) {
+    if (Event.Type == CMlScriptEvent::Type::MouseClick && Event.Control.HasClass("toggleSpec")) {
+      if (InputPlayer.RequestsSpectate) {
+        declare frame <=> Event.Control.Parent;
+        SetSpectateTarget(frame.DataAttributeGet("login"));
+      }
+    }
+  }
+
   yield;
 }