better js

OrchardCMS · Dec 20, 2024 · cb2e40c · cb2e40c
1 parent ed900d9
commit cb2e40c
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 16 deletions.
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Services/AdminMenuPermissionService.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Services/AdminMenuPermissionService.cs
@@ -2,6 +2,7 @@
 
 namespace OrchardCore.AdminMenu.Services;
 
+[Obsolete("This service is obsolete and will be removed in version 4. Instead, please use IPermissionService")]
 public sealed class AdminMenuPermissionService : IAdminMenuPermissionService
 {
     private readonly IEnumerable<IPermissionProvider> _permissionProviders;

diff --git a/...rchardCore.Modules/OrchardCore.AdminMenu/Views/Items/LinkAdminNode.Fields.TreeEdit.cshtml b/...rchardCore.Modules/OrchardCore.AdminMenu/Views/Items/LinkAdminNode.Fields.TreeEdit.cshtml
@@ -113,19 +113,19 @@
         <div class="mb-3">
             <div class="w-xl-50">
                 <input asp-for="SelectedPermissionNames" type="hidden" v-model="selectedNames" />
-                <vue-multiselect v-model="value" 
-                                :options="options" 
-                                track-by="name"
-                                label="displayText" 
-                                placeholder="@T["Type to search"]"
-                                @@select="onSelect"
-                                :searchable="true" 
-                                :close-on-select="true" 
-                                :reset-after="true"
-                                :show-labels="true" 
-                                :hide-selected="false"
-                                select-label="@T["Select"]" 
-                                deselect-label="@T["Remove"]">
+                <vue-multiselect v-model="value"
+                                 :options="options"
+                                 track-by="name"
+                                 label="displayText"
+                                 placeholder="@T["Type to search"]"
+                                 @@select="onSelect"
+                                 :searchable="true"
+                                 :close-on-select="true"
+                                 :reset-after="true"
+                                 :show-labels="true"
+                                 :hide-selected="false"
+                                 select-label="@T["Select"]"
+                                 deselect-label="@T["Remove"]">
                     <template slot="option" slot-scope="props">
                         <div v-cloak><span>{{ props.option.displayText }}</span></div>
                     </template>
@@ -137,7 +137,11 @@
             </div>
         </div>
     </div>
-    <script at="Foot" depends-on="admin-menu-permission-picker">initAdminMenuPermissionsPicker(document.querySelector("#PermissionPicker"))</script>
+    <script at="Foot" depends-on="admin-menu-permission-picker">
+        document.addEventListener('DOMContentLoaded', () => {
+            initAdminMenuPermissionsPicker(document.querySelector("#PermissionPicker"));
+        });
+    </script>
 </div>
 
 <script at="Foot">

diff --git a/...ore.Modules/OrchardCore.AdminMenu/Views/Items/PlaceholderAdminNode.Fields.TreeEdit.cshtml b/...ore.Modules/OrchardCore.AdminMenu/Views/Items/PlaceholderAdminNode.Fields.TreeEdit.cshtml
@@ -115,7 +115,11 @@
             </div>
         </div>
     </div>
-    <script at="Foot" depends-on="admin-menu-permission-picker">initAdminMenuPermissionsPicker(document.querySelector("#PermissionPicker"))</script>
+    <script at="Foot" depends-on="admin-menu-permission-picker">
+        document.addEventListener('DOMContentLoaded', () => {
+            initAdminMenuPermissionsPicker(document.querySelector("#PermissionPicker"))
+        });
+    </script>
 </div>
 
 <script at="Foot">

diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/Views/MenuItemPermissionPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Menu/Views/MenuItemPermissionPart.Edit.cshtml
@@ -60,4 +60,8 @@
     </div>
 </div>
 
-<script at="Foot" depends-on="admin-permission-picker,vuejs">initMenuPermissionsPicker(document.querySelector("#PermissionPicker"))</script>
+<script at="Foot" depends-on="menu-permission-picker,vuejs">
+    document.addEventListener('DOMContentLoaded', () => {
+        initMenuPermissionsPicker(document.querySelector("#PermissionPicker"))
+    });
+</script>