Skip to content

The Unified and Autonomous Development Platform

Remember editing position after committing source edit

Robin Shend488788e6322
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.js
index 6cb8ca9368..e09d58ddb8 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.js
@@ -16,6 +16,7 @@ onedev.server.blobEdit = {
}
});
$head.find(".save>a").click(function() {
+ onedev.server.viewState.getFromViewAndSetToHistory();
var $content = $body.find(">.content");
var $positionAware = $content.find(".position-aware");
if ($positionAware.length != 0) {
@@ -66,8 +67,6 @@ onedev.server.blobEdit = {
},
selectTab: function($tab) {
- onedev.server.viewState.getFromViewAndSetToHistory();
-
var $active = $tab.parent().find(".tab.active");
$active.removeClass("active");
$tab.addClass("active");
@@ -89,6 +88,9 @@ onedev.server.blobEdit = {
}
$(window).resize();
+
+ if (!$tab.hasClass("save"))
+ onedev.server.viewState.getFromHistoryAndSetToView();
},
onNameChanging: function(containerId, addingFile, recreateCallback) {
var $body = $("#" + containerId + ">.blob-edit>.body");
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceEditPanel.java
index aa2f6a4691..31e6e508e2 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceEditPanel.java
@@ -3,7 +3,6 @@ package io.onedev.server.web.page.project.blob.render.renderers.source;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.head.OnLoadHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.FormComponentPanel;
@@ -17,7 +16,6 @@ import io.onedev.server.OneDev;
import io.onedev.server.web.component.sourceformat.OptionChangeCallback;
import io.onedev.server.web.component.sourceformat.SourceFormatPanel;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
-import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;
import io.onedev.server.web.page.project.blob.render.edit.BlobEditPanel;
import io.onedev.server.web.page.project.blob.render.view.Positionable;
@@ -32,7 +30,18 @@ public class SourceEditPanel extends BlobEditPanel implements Positionable {
@Override
protected FormComponentPanel<byte[]> newEditor(String componentId, byte[] initialContent) {
- return new SourceFormComponent(componentId, initialContent);
+ return new SourceFormComponent(componentId, initialContent) {
+
+ @Override
+ protected BlobRenderContext getContext() {
+ return context;
+ }
+
+ @Override
+ protected SourceFormatPanel getSourceFormat() {
+ return sourceFormat;
+ }
+ };
}
@Override
@@ -72,26 +81,15 @@ public class SourceEditPanel extends BlobEditPanel implements Positionable {
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
response.render(JavaScriptHeaderItem.forReference(new SourceEditResourceReference()));
-
+
String autosaveKey = JavaScriptEscape.escapeJavaScript(context.getAutosaveKey());
PlanarRange mark = SourceRendererProvider.getRange(context.getPosition());
- String jsonOfMark = mark!=null?getJson(mark):"undefined";
- String script = String.format("onedev.server.sourceEdit.onDomReady('%s', '%s', %s, '%s', %s, '%s', %b, '%s');",
- getEditor().getMarkupId(),
- JavaScriptEscape.escapeJavaScript(context.getNewPath()),
- jsonOfMark,
- sourceFormat.getIndentType(),
- sourceFormat.getTabSize(),
- sourceFormat.getLineWrapMode(),
- context.getMode() == Mode.EDIT || context.getInitialNewPath() != null,
- autosaveKey);
- response.render(OnDomReadyHeaderItem.forScript(script));
- script = String.format("onedev.server.sourceEdit.onWindowLoad('%s', %s, '%s');",
- getEditor().getMarkupId(), jsonOfMark, autosaveKey);
- response.render(OnLoadHeaderItem.forScript(script));
+ String script = String.format("onedev.server.sourceEdit.onWindowLoad('%s', %s, '%s');",
+ getEditor().getMarkupId(), mark != null? getJson(mark): "undefined", autosaveKey);
+ response.render(OnLoadHeaderItem.forScript(script));
}
-
+
private String getJson(PlanarRange mark) {
try {
return OneDev.getInstance(ObjectMapper.class).writeValueAsString(mark);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.java
index c092c82f65..0f02162c66 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.java
@@ -2,17 +2,27 @@ package io.onedev.server.web.page.project.blob.render.renderers.source;
import java.nio.charset.Charset;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.form.FormComponentPanel;
import org.apache.wicket.markup.html.form.TextArea;
import org.apache.wicket.model.Model;
+import org.unbescape.javascript.JavaScriptEscape;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Charsets;
+import io.onedev.commons.utils.PlanarRange;
import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.OneDev;
import io.onedev.server.util.ContentDetector;
+import io.onedev.server.web.component.sourceformat.SourceFormatPanel;
+import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
+import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;
@SuppressWarnings("serial")
-class SourceFormComponent extends FormComponentPanel<byte[]> {
+abstract class SourceFormComponent extends FormComponentPanel<byte[]> {
private TextArea<String> input;
@@ -54,5 +64,36 @@ class SourceFormComponent extends FormComponentPanel<byte[]> {
setConvertedInput(new byte[0]);
}
}
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ String autosaveKey = JavaScriptEscape.escapeJavaScript(getContext().getAutosaveKey());
+ PlanarRange mark = SourceRendererProvider.getRange(getContext().getPosition());
+ String jsonOfMark;
+ if (mark != null) {
+ try {
+ jsonOfMark = OneDev.getInstance(ObjectMapper.class).writeValueAsString(mark);
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
+ } else {
+ jsonOfMark = "undefined";
+ }
+ String script = String.format("onedev.server.sourceEdit.onDomReady('%s', '%s', %s, '%s', %s, '%s', %b, '%s');",
+ getMarkupId(),
+ JavaScriptEscape.escapeJavaScript(getContext().getNewPath()),
+ jsonOfMark,
+ getSourceFormat().getIndentType(),
+ getSourceFormat().getTabSize(),
+ getSourceFormat().getLineWrapMode(),
+ getContext().getMode() == Mode.EDIT || getContext().getInitialNewPath() != null,
+ autosaveKey);
+ response.render(OnDomReadyHeaderItem.forScript(script));
+ }
+
+ protected abstract BlobRenderContext getContext();
+
+ protected abstract SourceFormatPanel getSourceFormat();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceRendererProvider.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceRendererProvider.java
index 634a924ad1..c48a81166b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceRendererProvider.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceRendererProvider.java
@@ -7,8 +7,8 @@ import org.apache.wicket.Component;
import io.onedev.commons.utils.PlanarRange;
import io.onedev.server.web.PrioritizedComponentRenderer;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
-import io.onedev.server.web.page.project.blob.render.BlobRendererContribution;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;
+import io.onedev.server.web.page.project.blob.render.BlobRendererContribution;
public class SourceRendererProvider implements BlobRendererContribution {