Skip to content

The Unified and Autonomous Development Platform

Fix the bug that outline search dialog appears unexpectedly

Robin Shen2bb2cc35224a
diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/ProjectBlobResourceReference.java b/web/src/main/java/com/turbodev/server/web/page/project/blob/ProjectBlobResourceReference.java
index 2f3cff409c..ed267b9fa4 100644
--- a/web/src/main/java/com/turbodev/server/web/page/project/blob/ProjectBlobResourceReference.java
+++ b/web/src/main/java/com/turbodev/server/web/page/project/blob/ProjectBlobResourceReference.java
@@ -7,6 +7,7 @@ import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import com.turbodev.server.web.asset.cookies.CookiesResourceReference;
+import com.turbodev.server.web.asset.hotkeys.HotkeysResourceReference;
import com.turbodev.server.web.asset.jqueryui.JQueryUIResourceReference;
import com.turbodev.server.web.page.base.BaseDependentCssResourceReference;
import com.turbodev.server.web.page.base.BaseDependentResourceReference;
@@ -24,6 +25,7 @@ public class ProjectBlobResourceReference extends BaseDependentResourceReference
List<HeaderItem> dependencies = super.getDependencies();
dependencies.add(JavaScriptHeaderItem.forReference(new CookiesResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new JQueryUIResourceReference()));
+ dependencies.add(JavaScriptHeaderItem.forReference(new HotkeysResourceReference()));
dependencies.add(CssHeaderItem.forReference(
new BaseDependentCssResourceReference(ProjectBlobResourceReference.class, "project-blob.css")));
return dependencies;
diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/source-view.js b/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/source-view.js
index 4b258e49c9..4e84315085 100644
--- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/source-view.js
+++ b/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/source-view.js
@@ -56,8 +56,8 @@ turbodev.server.sourceView = {
if (!($(document).data("SourceViewShortcutsBinded"))) {
$(document).data("SourceViewShortcutsBinded", true);
- $(document).on("keydown", function(e) {
- if (e.key == "o" && $(".modal:visible").length == 0) {
+ $(document).bind("keydown", "o", function(e) {
+ if ($(".modal:visible").length == 0) {
e.preventDefault();
var $sourceView = $(".source-view");
if ($sourceView.length != 0 && $(".outline-toggle").length != 0)
diff --git a/web/src/main/java/com/turbodev/server/web/page/security/LoginPage.html b/web/src/main/java/com/turbodev/server/web/page/security/LoginPage.html
index b26e262a6d..57225b6013 100644
--- a/web/src/main/java/com/turbodev/server/web/page/security/LoginPage.html
+++ b/web/src/main/java/com/turbodev/server/web/page/security/LoginPage.html
@@ -14,7 +14,7 @@
<div class="row">
<div class="col-sm-6">
<div class="checkbox">
- <label><input wicket:id="rememberMe" type="checkbox"> Remember</label>
+ <label><input wicket:id="rememberMe" type="checkbox">Remember Me</label>
</div>
</div>
<div class="col-sm-6">