Skip to content

Commit ce68189

Browse files
committed
Remvoe # from course index in slugs
1 parent 8259ee4 commit ce68189

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

autoload/NavigationManager.gd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ var arguments := { }
1919

2020
var _current_unload_type := -1
2121
var _url_normalization_regex := RegExpGroup.compile(
22-
r"^(?<prefix>user:\/\/|res:\/\/|\.*?\/+)#?(?<course>[^\/]+)\/(?<lesson>[^\/]+)\/?(?<lesson_file>[^\.]+\.[^\/]+)?\/?(?<practice>.*)?",
22+
r"^(?<prefix>user:\/\/|res:\/\/|\.*?\/+)(?<course>[^\/]+)\/(?<lesson>[^\/]+)\/?(?<lesson_file>[^\.]+\.[^\/]+)?\/?(?<practice>.*)?",
2323
)
2424
var _slug_normalization_regex := RegExpGroup.compile(
25-
r"^#?(?<course>[^\/]+)\/(?<lesson>[^\/]+)\/?(?<practice>.*)?",
25+
r"^(?<course>[^\/]+)\/(?<lesson>[^\/]+)\/?(?<practice>.*)?",
2626
)
2727
var _lesson_cache := { }
2828

@@ -141,7 +141,7 @@ func navigate_to_lesson(course_id: String, lesson_slug: String) -> void:
141141

142142

143143
func navigate_to_practice(course_id: String, lesson_slug: String, practice_id: String) -> void:
144-
navigate_to("#%s/%s/%s" % [course_id, lesson_slug, practice_id])
144+
navigate_to("%s/%s/%s" % [course_id, lesson_slug, practice_id])
145145

146146

147147
func navigate_to(metadata: String) -> void:
@@ -349,7 +349,7 @@ func _push_javascript_state(url: String) -> void:
349349
if not _js_available:
350350
return
351351
@warning_ignore("unsafe_method_access")
352-
_js_history.pushState(url, "", "#" + url)
352+
_js_history.pushState(url, "", url)
353353

354354

355355
class NormalizedUrl:

ui/components/BreadCrumbs.gd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ func _create_navigation_node(text: String, course_index: CourseIndex, path: Stri
116116
navigation_node.add_theme_font_size_override("font_size", NODE_FONT_SIZE)
117117
navigation_node.mouse_default_cursor_shape = CURSOR_POINTING_HAND
118118
add_child(navigation_node)
119-
var slug := "#%s/%s" % [course_index.get_course_id(), course_index.get_lesson_slug_from_path(path)]
119+
var slug := "%s/%s" % [course_index.get_course_id(), course_index.get_lesson_slug_from_path(path)]
120120
navigation_node.pressed.connect(_on_navigation_pressed.bind(slug))
121121

122122

ui/screens/course_outliner/CourseLessonDetails.gd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,4 @@ func _on_goto_lesson_pressed() -> void:
9393
if not lesson:
9494
return
9595

96-
NavigationManager.navigate_to("#%s/%s" % [course_index.get_course_id(), course_index.get_lesson_slug_from_path(lesson.bbcode_path)])
96+
NavigationManager.navigate_to("%s/%s" % [course_index.get_course_id(), course_index.get_lesson_slug_from_path(lesson.bbcode_path)])

0 commit comments

Comments
 (0)