Merge branch 'develop' into 1.1

wintercms · Mar 12, 2021 · 9992db6 · 9992db6
2 parents e472bb2 + 72f87f2
commit 9992db6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/modules/system/assets/ui/js/list.rowlink.js b/modules/system/assets/ui/js/list.rowlink.js
@@ -78,7 +78,7 @@
             })
 
             $(this).addClass(options.linkedClass)
-            link.after(link.children()).hide()
+            link.hide().after(link.html())
         })
 
         // Add Keyboard Navigation to list rows

diff --git a/modules/system/assets/ui/storm-min.js b/modules/system/assets/ui/storm-min.js
diff --git a/modules/system/traits/AssetMaker.php b/modules/system/traits/AssetMaker.php
@@ -115,6 +115,14 @@ public function addJs($name, $attributes = [])
             $name = $this->combineAssets($name, $this->getLocalPath($this->assetPath));
         }
 
+        // Alias october.* assets to winter.*
+        if (str_contains($name, 'js/october.')) {
+            $winterPath = str_replace('js/october.', 'js/winter.', $name);
+            if (file_exists(base_path(ltrim(parse_url($winterPath, PHP_URL_PATH), '/')))) {
+                $name = $winterPath;
+            }
+        }
+
         $jsPath = $this->getAssetPath($name);
 
         if (isset($this->controller)) {