UI/Viewcontrols: 43190, JS using factory (ILIAS-eLearning#8782)

srsolutionsag · Jan 3, 2025 · 7e8aa2c · 7e8aa2c
1 parent 1198a2f
commit 7e8aa2c
Showing 1 changed file with 21 additions and 12 deletions.
diff --git a/components/ILIAS/UI/src/Implementation/Component/ViewControl/Renderer.php b/components/ILIAS/UI/src/Implementation/Component/ViewControl/Renderer.php
@@ -139,11 +139,16 @@ protected function renderSortation(
         if ($triggeredSignals) {
             $internal_signal = $component->getSelectSignal();
             $signal = $triggeredSignals[0]->getSignal();
-
-            $component = $component->withAdditionalOnLoadCode(fn($id) => "$(document).on('$internal_signal', function(event, signalData) {
-                            il.UI.viewcontrol.sortation.onInternalSelect(event, signalData, '$signal', '$id');
-                            return false;
-                        })");
+            $component = $component
+                ->withAdditionalOnLoadCode(
+                    fn($id) => "il.UI.viewcontrol.sortation.init('$id');"
+                )
+                ->withAdditionalOnLoadCode(
+                    fn($id) => "$(document).on('$internal_signal', function(event, signalData) {
+                        il.UI.viewcontrol.sortation.get('$id').onInternalSelect(event, signalData, '$signal');
+                        return false;
+                    })"
+                );
         }
 
         $this->renderId($component, $tpl, "id", "ID");
@@ -177,7 +182,7 @@ protected function renderPagination(
     ): string {
         $range = $this->getPaginationRange($component);
 
-        if($component->getNumberOfPages() < 2) {
+        if ($component->getNumberOfPages() < 2) {
             return '';
         }
 
@@ -187,12 +192,16 @@ protected function renderPagination(
         if ($triggeredSignals) {
             $internal_signal = $component->getInternalSignal();
             $signal = $triggeredSignals[0]->getSignal();
-            $component = $component->withOnLoadCode(
-                fn($id) => "$(document).on('$internal_signal', function(event, signalData) {
-                            il.UI.viewcontrol.pagination.onInternalSelect(event, signalData, '$signal', '$id');
-                            return false;
-                        })"
-            );
+            $component = $component
+                ->withAdditionalOnLoadCode(
+                    fn($id) => "il.UI.viewcontrol.pagination.init('$id');"
+                )
+                ->withAdditionalOnLoadCode(
+                    fn($id) => "$(document).on('$internal_signal', function(event, signalData) {
+                        il.UI.viewcontrol.pagination.get('$id').onInternalSelect(event, signalData, '$signal');
+                        return false;
+                    })"
+                );
             $id = $this->bindJavaScript($component);
             $tpl->setVariable('ID', $id);
         }