Skip to content

Commit 9992db6

Browse files
committed
Merge branch 'develop' into 1.1
2 parents e472bb2 + 72f87f2 commit 9992db6

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

modules/system/assets/ui/js/list.rowlink.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
})
7979

8080
$(this).addClass(options.linkedClass)
81-
link.after(link.children()).hide()
81+
link.hide().after(link.html())
8282
})
8383

8484
// Add Keyboard Navigation to list rows

modules/system/assets/ui/storm-min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

modules/system/traits/AssetMaker.php

+8
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,14 @@ public function addJs($name, $attributes = [])
115115
$name = $this->combineAssets($name, $this->getLocalPath($this->assetPath));
116116
}
117117

118+
// Alias october.* assets to winter.*
119+
if (str_contains($name, 'js/october.')) {
120+
$winterPath = str_replace('js/october.', 'js/winter.', $name);
121+
if (file_exists(base_path(ltrim(parse_url($winterPath, PHP_URL_PATH), '/')))) {
122+
$name = $winterPath;
123+
}
124+
}
125+
118126
$jsPath = $this->getAssetPath($name);
119127

120128
if (isset($this->controller)) {

0 commit comments

Comments
 (0)