The Unified and Autonomous Development Platform
Able to upload files/images as blobs while editing markdown blob file
Robin Shen4b62b6295a88
diff --git a/core/src/main/java/com/turbodev/server/event/RefUpdated.java b/core/src/main/java/com/turbodev/server/event/RefUpdated.javaindex 03d9fc67a6..70b3ed1a39 100644--- a/core/src/main/java/com/turbodev/server/event/RefUpdated.java+++ b/core/src/main/java/com/turbodev/server/event/RefUpdated.java@@ -10,15 +10,15 @@ public class RefUpdated {private final String refName;- private final ObjectId oldObjectId;+ private final ObjectId oldCommitId;- private final ObjectId newObjectId;+ private final ObjectId newCommitId;- public RefUpdated(Project project, String refName, ObjectId oldObjectId, ObjectId newObjectId) {+ public RefUpdated(Project project, String refName, ObjectId oldCommitId, ObjectId newCommitId) {this.project = project;this.refName = refName;- this.oldObjectId = oldObjectId;- this.newObjectId = newObjectId;+ this.oldCommitId = oldCommitId;+ this.newCommitId = newCommitId;}public Project getProject() {@@ -29,12 +29,12 @@ public class RefUpdated {return refName;}- public ObjectId getOldObjectId() {- return oldObjectId;+ public ObjectId getOldCommitId() {+ return oldCommitId;}- public ObjectId getNewObjectId() {- return newObjectId;+ public ObjectId getNewCommitId() {+ return newCommitId;}}diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultCommitInfoManager.java b/core/src/main/java/com/turbodev/server/manager/impl/DefaultCommitInfoManager.javaindex 85627ef536..34b4a44102 100644--- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultCommitInfoManager.java+++ b/core/src/main/java/com/turbodev/server/manager/impl/DefaultCommitInfoManager.java@@ -1054,11 +1054,11 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager impleme@Sessional@Listenpublic void on(RefUpdated event) {- if (!event.getNewObjectId().equals(ObjectId.zeroId())+ if (!event.getNewCommitId().equals(ObjectId.zeroId())&& (event.getRefName().startsWith(Constants.R_HEADS)|| event.getRefName().startsWith(Constants.R_TAGS))) {try (RevWalk revWalk = new RevWalk(event.getProject().getRepository())) {- RevCommit commit = GitUtils.parseCommit(revWalk, event.getNewObjectId());+ RevCommit commit = GitUtils.parseCommit(revWalk, event.getNewCommitId());if (commit != null) {CollectingWork work = new CollectingWork(PRIORITY, commit, event.getRefName());batchWorkManager.submit(getBatchWorker(event.getProject().getId()), work);diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultProjectManager.java b/core/src/main/java/com/turbodev/server/manager/impl/DefaultProjectManager.javaindex 9e124837ad..b71723ed91 100644--- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultProjectManager.java+++ b/core/src/main/java/com/turbodev/server/manager/impl/DefaultProjectManager.java@@ -262,7 +262,7 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem@Transactional@Listenpublic void on(RefUpdated event) {- if (event.getNewObjectId().equals(ObjectId.zeroId())) {+ if (event.getNewCommitId().equals(ObjectId.zeroId())) {Project project = event.getProject();String branch = GitUtils.ref2branch(event.getRefName());if (branch != null) {diff --git a/core/src/main/java/com/turbodev/server/model/Project.java b/core/src/main/java/com/turbodev/server/model/Project.javaindex fa76a16bfd..da6326357e 100644--- a/core/src/main/java/com/turbodev/server/model/Project.java+++ b/core/src/main/java/com/turbodev/server/model/Project.java@@ -104,6 +104,8 @@ public class Project extends AbstractEntity {private static final int LAST_COMMITS_CACHE_THRESHOLD = 1000;+ public static final int MAX_UPLOAD_SIZE = 10; // In mega bytes+@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=true)private Project forkedFrom;diff --git a/search/src/main/java/com/turbodev/server/search/DefaultIndexManager.java b/search/src/main/java/com/turbodev/server/search/DefaultIndexManager.javaindex fc7e3b7658..b585843ce8 100644--- a/search/src/main/java/com/turbodev/server/search/DefaultIndexManager.java+++ b/search/src/main/java/com/turbodev/server/search/DefaultIndexManager.java@@ -407,8 +407,8 @@ public class DefaultIndexManager implements IndexManager {public void on(RefUpdated event) {// only index branches at back end, tags will be indexed on demand from GUI// as many tags might be pushed all at once when the repository is imported- if (event.getRefName().startsWith(Constants.R_HEADS) && !event.getNewObjectId().equals(ObjectId.zeroId())) {- IndexWork work = new IndexWork(BACKEND_INDEXING_PRIORITY, event.getNewObjectId());+ if (event.getRefName().startsWith(Constants.R_HEADS) && !event.getNewCommitId().equals(ObjectId.zeroId())) {+ IndexWork work = new IndexWork(BACKEND_INDEXING_PRIORITY, event.getNewCommitId());batchWorkManager.submit(getBatchWorker(event.getProject().getId(), event.getProject().getForkRoot().getId()), work);}}diff --git a/web/.tern-project b/web/.tern-projectindex daa12a1091..44d451293b 100644--- a/web/.tern-project+++ b/web/.tern-project@@ -11,10 +11,20 @@"plugins": {"guess-types": {+ },+ "browser-extension": {++ },+ "jquery-ui1-12": {++ },+ "jquery-extension": {+}},"libs": ["ecma5",- "browser"+ "browser",+ "jquery"]}\ No newline at end of filediff --git a/web/src/main/java/com/turbodev/server/web/asset/codemirror/codemirror.js b/web/src/main/java/com/turbodev/server/web/asset/codemirror/codemirror.jsindex 21818b4dc7..457c292337 100644--- a/web/src/main/java/com/turbodev/server/web/asset/codemirror/codemirror.js+++ b/web/src/main/java/com/turbodev/server/web/asset/codemirror/codemirror.js@@ -69,7 +69,7 @@ turbodev.server.codemirror = {}}});- if (turbodev.server.isMac()) {+ if (turbodev.server.util.isMac()) {CodeMirror.keyMap.default["Cmd-L"] = "gotoLine";} else {CodeMirror.keyMap.default["Ctrl-L"] = "gotoLine";@@ -138,7 +138,7 @@ turbodev.server.codemirror = {return false;}}- if (turbodev.server.isMac()) {+ if (turbodev.server.util.isMac()) {$(document).bind("keydown", "Meta+f", find);$(document).bind("keydown", "Meta+g", findNext);$(document).bind("keydown", "Meta+Shift+g", findPrev);diff --git a/web/src/main/java/com/turbodev/server/web/asset/codemirror/highlight.js b/web/src/main/java/com/turbodev/server/web/asset/codemirror/highlight.jsindex f21bbd30f3..ade488a172 100644--- a/web/src/main/java/com/turbodev/server/web/asset/codemirror/highlight.js+++ b/web/src/main/java/com/turbodev/server/web/asset/codemirror/highlight.js@@ -5,7 +5,7 @@ turbodev.server.highlight = function($container) {var text = $this.text().trim();$this.empty();var cm = CodeMirror(this, {- readOnly: turbodev.server.isDevice()?"nocursor":true,+ readOnly: turbodev.server.util.isDevice()?"nocursor":true,value: text,highlightIdentifiers: {delay: 500},theme: "eclipse",diff --git a/web/src/main/java/com/turbodev/server/web/behavior/AutoHeightBehavior.java b/web/src/main/java/com/turbodev/server/web/behavior/AutoHeightBehavior.javadeleted file mode 100644index 0df689198f..0000000000--- a/web/src/main/java/com/turbodev/server/web/behavior/AutoHeightBehavior.java+++ /dev/null@@ -1,32 +0,0 @@-package com.turbodev.server.web.behavior;--import org.apache.wicket.Component;-import org.apache.wicket.behavior.Behavior;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;--@SuppressWarnings("serial")-public class AutoHeightBehavior extends Behavior {-- private final int bottomOffset;-- public AutoHeightBehavior(int bottomOffset) {- this.bottomOffset = bottomOffset;- }-- @Override- public void bind(Component component) {- super.bind(component);- component.setOutputMarkupId(true);- }-- @Override- public void renderHead(Component component, IHeaderResponse response) {- super.renderHead(component, response);-- String script = String.format("turbodev.server.autoHeight('#%s', %d);",- component.getMarkupId(), bottomOffset);- response.render(OnDomReadyHeaderItem.forScript(script));- }--}diff --git a/web/src/main/java/com/turbodev/server/web/component/dropzonefield/DropzoneField.java b/web/src/main/java/com/turbodev/server/web/component/dropzonefield/DropzoneField.javaindex 1ef5e4f626..d8265c8112 100644--- a/web/src/main/java/com/turbodev/server/web/component/dropzonefield/DropzoneField.java+++ b/web/src/main/java/com/turbodev/server/web/component/dropzonefield/DropzoneField.java@@ -5,6 +5,8 @@ import java.util.Collection;import java.util.Iterator;import java.util.List;+import javax.annotation.Nullable;+import org.apache.commons.fileupload.FileItem;import org.apache.commons.fileupload.FileUploadException;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -27,19 +29,45 @@ import com.turbodev.server.web.behavior.AbstractPostAjaxBehavior;@SuppressWarnings("serial")public class DropzoneField extends FormComponentPanel<Collection<FileUpload>> {+ private final int maxFiles;+private final int maxFilesize;+ private final String acceptedFiles;+private AbstractPostAjaxBehavior uploadBehavior;private AbstractPostAjaxBehavior deleteBehavior;private List<FileItem> fileItems = new ArrayList<>();- public DropzoneField(String id, IModel<Collection<FileUpload>> model, int maxFilesize) {+ /**+ * @param id+ * id of the component+ * @param model+ * model of the component+ * @param acceptedFiles+ * accepted mime types, for instance: images/*. Use <tt>null</tt> for unlimited+ * @param maxFiles+ * max number of files, use <tt>0</tt> for unlimited+ * @param maxFilesize+ * max file size in MB+ */+ public DropzoneField(String id, IModel<Collection<FileUpload>> model, @Nullable String acceptedFiles,+ int maxFiles, int maxFilesize) {super(id, model);+ this.acceptedFiles = acceptedFiles;+ this.maxFiles = maxFiles;this.maxFilesize = maxFilesize;}+ @Override+ protected void onBeforeRender() {+ // In order to be consistent with browser side+ fileItems.clear();+ super.onBeforeRender();+ }+@Overrideprotected void onInitialize() {super.onInitialize();@@ -105,10 +133,12 @@ public class DropzoneField extends FormComponentPanel<Collection<FileUpload>> {response.render(JavaScriptHeaderItem.forReference(new DropzoneFieldResourceReference()));String script = String.format(- "turbodev.server.onDropzoneDomReady('%s', '%s', %s, %d);",+ "turbodev.server.dropzone.onDomReady('%s', '%s', %s, %s, %s, %d);",getMarkupId(),uploadBehavior.getCallbackUrl(),- deleteBehavior.getCallbackFunction(CallbackParameter.explicit("name")),+ deleteBehavior.getCallbackFunction(CallbackParameter.explicit("name")),+ acceptedFiles!=null?"'" + acceptedFiles + "'":"null",+ maxFiles!=0?maxFiles:"null",maxFilesize);response.render(OnDomReadyHeaderItem.forScript(script));diff --git a/web/src/main/java/com/turbodev/server/web/component/dropzonefield/dropzone-field.css b/web/src/main/java/com/turbodev/server/web/component/dropzonefield/dropzone-field.cssindex 138c9e03d7..9835ff7c08 100644--- a/web/src/main/java/com/turbodev/server/web/component/dropzonefield/dropzone-field.css+++ b/web/src/main/java/com/turbodev/server/web/component/dropzonefield/dropzone-field.css@@ -9,4 +9,4 @@.dropzone .dz-preview .dz-error-message {top: 150px !important;-}\ No newline at end of file+}diff --git a/web/src/main/java/com/turbodev/server/web/component/dropzonefield/dropzone-field.js b/web/src/main/java/com/turbodev/server/web/component/dropzonefield/dropzone-field.jsindex e5e2c4a966..b5d080d5b2 100644--- a/web/src/main/java/com/turbodev/server/web/component/dropzonefield/dropzone-field.js+++ b/web/src/main/java/com/turbodev/server/web/component/dropzonefield/dropzone-field.js@@ -1,17 +1,25 @@-turbodev.server.onDropzoneDomReady = function(containerId, uploadUrl, deleteCallback, maxFilesize) {- var $input = $("#" + containerId + ">.dropzone");- $input.dropzone({- url: uploadUrl,- addRemoveLinks: true,- maxFilesize: maxFilesize,- dictDefaultMessage: "Drop files here or click to upload",- removedfile: function(file) {- deleteCallback(file.name);- $(file.previewElement).remove();- },- headers: {- "Wicket-Ajax": true,- "Wicket-Ajax-BaseURL": Wicket.Ajax.baseUrl- }- });+turbodev.server.dropzone = {+ onDomReady: function(containerId, uploadUrl, deleteCallback, acceptedFiles, maxFiles, maxFilesize) {+ var input = document.querySelector("#" + containerId + ">.dropzone");++ var dropzone = new Dropzone(input, {+ url: uploadUrl,+ addRemoveLinks: true,+ acceptedFiles: acceptedFiles,+ maxFiles: maxFiles,+ maxFilesize: maxFilesize,+ dictDefaultMessage: "Drop files here or click to upload",+ success: function() {+ turbodev.server.form.markDirty($(input).closest("form"));+ },+ removedfile: function(file) {+ deleteCallback(file.name);+ $(file.previewElement).remove();+ },+ headers: {+ "Wicket-Ajax": true,+ "Wicket-Ajax-BaseURL": Wicket.Ajax.baseUrl+ }+ });+ }}\ No newline at end of filediff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/InsertUrlPanel.html b/web/src/main/java/com/turbodev/server/web/component/markdown/InsertUrlPanel.htmlindex a31c2c7587..d9565addfc 100644--- a/web/src/main/java/com/turbodev/server/web/component/markdown/InsertUrlPanel.html+++ b/web/src/main/java/com/turbodev/server/web/component/markdown/InsertUrlPanel.html@@ -3,52 +3,86 @@<button wicket:id="close" type="button" class="close">×</button><h4 wicket:id="title" class="modal-title"></h4></div>- <div class="modal-body insert-url">- <div class="section">- <div class="content">- <form wicket:id="urlForm" class="form-inline url">- <div class="form-group">- <input wicket:id="url" placeholder="Input url" class="form-control autofocus url"></input>- <button wicket:id="ok" type="submit" class="btn btn-default">Insert</button>- </div>- <div wicket:id="feedback" class="feedback"></div>- </form>+ <div wicket:id="content" class="modal-body insert-url"></div>++ <wicket:fragment wicket:id="tabbedFrag">+ <ul wicket:id="tabs" class="tabs nav nav-tabs"></ul>+ <div wicket:id="content"></div>+ </wicket:fragment>+ <wicket:fragment wicket:id="inputUrlFrag">+ <form wicket:id="form" class="input-url">+ <div wicket:id="feedback" class="feedback"></div>+ <div class="form-group">+ <label wicket:id="urlLabel" class="control-label"></label>+ <input wicket:id="url" class="form-control autofocus url"></input>+ <p wicket:id="urlHelp" class="help-block"></p>+ </div>+ <div class="form-group">+ <label wicket:id="textLabel" class="control-label"></label>+ <input wicket:id="text" class="form-control autofocus text"></input>+ </div>+ <div class="actions clearfix">+ <button wicket:id="insert" type="submit" class="dirty-aware btn btn-primary pull-right">Insert</button></div>- </div>- <wicket:enclosure child="blobPicker">- <div class="section">- <div class="or">-OR-</div>- <div class="content">- <a wicket:id="blobPicker" class="btn btn-default">Select File in Repository...</a>+ </form>+ </wicket:fragment>+ <wicket:fragment wicket:id="pickBlobFrag">+ <div wicket:id="files" class="files"></div>+ </wicket:fragment>+ <wicket:fragment wicket:id="pickAttachedImageFrag">+ <ul class="attachments list-unstyled">+ <li wicket:id="attachments" class="attachment image">+ <a wicket:id="select" title="Insert this image" class="insert"><img wicket:id="image"></img></a>+ <a wicket:id="delete" title="Remove this image" class="delete btn btn-default btn-block"><i class="fa fa-trash"></i> Remove</a>+ </li>+ </ul>+ </wicket:fragment>+ <wicket:fragment wicket:id="pickAttachedFileFrag">+ <ul class="attachments list-unstyled">+ <li wicket:id="attachments" class="attachment file">+ <div class="row">+ <div class="col-md-9">+ <a wicket:id="select" title="Insert link to this file" class="insert btn btn-block btn-default"><span wicket:id="file"></span></a>+ </div>+ <div class="col-md-3">+ <a wicket:id="delete" title="Remove this file" class="delete btn btn-block btn-default"><i class="fa fa-trash"></i> Remove</a>+ </div>+ </div>+ </li>+ </ul>+ </wicket:fragment>+ <wicket:fragment wicket:id="uploadAttachmentFrag">+ <form wicket:id="form" class="upload-attachment">+ <div wicket:id="feedback" class="feedback"></div>+ <div wicket:id="file"></div>+ <div class="actions clearfix">+ <button wicket:id="insert" type="submit" class="dirty-aware btn btn-primary pull-right">Insert</button></div>- </div>- </wicket:enclosure>- <wicket:enclosure child="uploadForm">- <div class="section">- <div class="or">-OR-</div>- <div class="content">- <form wicket:id="uploadForm" class="upload">- <div class="btn btn-default btn-file">- Upload File... <input wicket:id="file" type="file"></input> <button wicket:id="submit" class="hidden">submit</button>- </div>- <div wicket:id="feedback" class="feedback"></div>- </form>+ </form>+ </wicket:fragment>+ <wicket:fragment wicket:id="uploadBlobFrag">+ <form wicket:id="form" class="upload-blob">+ <div wicket:id="feedback" class="feedback"></div>+ <div class="form-group">+ <div wicket:id="file"></div></div>- </div>- </wicket:enclosure>- <wicket:enclosure child="attachments">- <div class="section">- <div class="or">-OR-</div>- <div class="content">- <label>Select Uploaded File</label>- <ul class="attachments list-unstyled">- <li wicket:id="attachments" class="attachment">- <a wicket:id="select" title="Select this attachment" class="select"></a>- <a wicket:id="delete" title="Remove this attachment" class="delete"><i class="fa fa-trash"></i></a>- </li>- </ul>- </div>- </div>- </wicket:enclosure>- </div>+ <div class="form-group">+ <label>Directory</label>+ <input wicket:id="directory" class="form-control"></input>+ <p class="help-block">Optionally specify the directory to put uploaded files. This value+ is considered to be relative to current repository directory</p>+ </div>+ <div class="form-group">+ <label>Summary Commit Message</label>+ <input wicket:id="summaryCommitMessage" class="form-control" placeholder="Add files via upload"></input>+ </div>+ <div class="form-group">+ <label>Detail Commit Message</label>+ <textarea wicket:id="detailCommitMessage" class="form-control" rows="5"></textarea>+ </div>+ <div class="actions clearfix">+ <button wicket:id="insert" class="btn btn-primary pull-right">Commit & Insert</button>+ </div>+ </form>+ </wicket:fragment></wicket:panel>\ No newline at end of filediff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/InsertUrlPanel.java b/web/src/main/java/com/turbodev/server/web/component/markdown/InsertUrlPanel.javaindex 3493a22eea..72a366b692 100644--- a/web/src/main/java/com/turbodev/server/web/component/markdown/InsertUrlPanel.java+++ b/web/src/main/java/com/turbodev/server/web/component/markdown/InsertUrlPanel.java@@ -4,49 +4,54 @@ import java.io.File;import java.io.IOException;import java.io.InputStream;import java.util.ArrayList;+import java.util.Collection;import java.util.List;import java.util.Map;+import java.util.Set;import javax.activation.MimetypesFileTypeMap;import org.apache.commons.fileupload.FileUploadException;import org.apache.commons.lang3.StringEscapeUtils;-import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.ajax.markup.html.form.AjaxButton;-import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;-import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.form.TextArea;import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.markup.html.form.upload.FileUpload;-import org.apache.wicket.markup.html.form.upload.FileUploadField;+import org.apache.wicket.markup.html.image.ExternalImage;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;+import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;+import org.apache.wicket.model.PropertyModel;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.util.lang.Bytes;import org.eclipse.jgit.lib.FileMode;import org.eclipse.jgit.lib.ObjectId;-import com.turbodev.utils.FileUtils;-import com.turbodev.utils.PathUtils;+import com.google.common.base.Preconditions;import com.turbodev.server.git.BlobIdent;import com.turbodev.server.git.BlobIdentFilter;import com.turbodev.server.model.Project;-import com.turbodev.server.web.component.floating.FloatingPanel;-import com.turbodev.server.web.component.link.DropdownLink;+import com.turbodev.server.web.component.dropzonefield.DropzoneField;import com.turbodev.server.web.component.projectfilepicker.ProjectFilePicker;+import com.turbodev.server.web.component.tabbable.AjaxActionTab;+import com.turbodev.server.web.component.tabbable.Tab;+import com.turbodev.server.web.component.tabbable.Tabbable;import com.turbodev.server.web.page.project.blob.ProjectBlobPage;import com.turbodev.server.web.page.project.blob.render.BlobRenderContext;+import com.turbodev.server.web.page.project.blob.render.BlobUploadException;+import com.turbodev.utils.PathUtils;+import com.turbodev.utils.StringUtils;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;@@ -55,8 +60,24 @@ abstract class InsertUrlPanel extends Panel {private static final MimetypesFileTypeMap MIME_TYPES = new MimetypesFileTypeMap();+ static final String TAB_INPUT_URL = "Input URL";++ static final String TAB_PICK_EXISTING = "Pick Existing";++ static final String TAB_UPLOAD = "Upload";++ private static final String CONTENT_ID = "content";++ private Collection<FileUpload> uploads;+private String url;+ private String text;++ private String summaryCommitMessage;++ private String detailCommitMessage;+private final MarkdownEditor markdownEditor;private final boolean isImage;@@ -67,66 +88,59 @@ abstract class InsertUrlPanel extends Panel {this.isImage = isImage;}- @Override- protected void onInitialize() {- super.onInitialize();-- add(new AjaxLink<Void>("close") {+ private Component newInputUrlPanel() {+ Fragment fragment = new Fragment(CONTENT_ID, "inputUrlFrag", this) {@Override- public void onClick(AjaxRequestTarget target) {- onClose(target);+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ String script = String.format("turbodev.server.markdown.onInputUrlDomReady('%s');", getMarkupId());+ response.render(OnDomReadyHeaderItem.forScript(script));}- });+ };- if (isImage)- add(new Label("title", "Insert Image"));- else- add(new Label("title", "Insert Link"));-- Form<?> urlForm = new Form<Void>("urlForm");- add(urlForm);- urlForm.add(new NotificationPanel("feedback", urlForm));+ Form<?> form = new Form<Void>("form");+ form.add(new NotificationPanel("feedback", form));- TextField<String> urlField = new TextField<String>("url", new IModel<String>() {-- @Override- public void detach() {- }-- @Override- public String getObject() {- return url;- }-- @Override- public void setObject(String object) {- url = object;- }-- });- urlField.setOutputMarkupId(true);- urlForm.add(urlField);+ form.add(new Label("urlLabel", isImage?"Image URL":"Link URL"));+ form.add(new Label("urlHelp", isImage?"Absolute or relative url of the image":"Absolute or relative url of the link"));+ form.add(new TextField<String>("url", new PropertyModel<String>(this, "url")));++ form.add(new Label("textLabel", isImage?"Image Text": "Link Text"));+ form.add(new TextField<String>("text", new PropertyModel<String>(this, "text")));- urlForm.add(new AjaxButton("ok", urlForm) {+ form.add(new AjaxButton("insert", form) {@Overrideprotected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);if (StringUtils.isBlank(url)) {- error("Url should be specified");- target.add(InsertUrlPanel.this);+ if (isImage)+ error("Image URL should be specified");+ else+ error("Link URL should be specified");+ target.add(fragment);} else {- markdownEditor.insertUrl(target, isImage, url, null, null);+ if (text == null)+ text = StringUtils.describeUrl(url);+ markdownEditor.insertUrl(target, isImage, url, text, null);onClose(target);}}});-- BlobRenderContext blobRenderContext = markdownEditor.getBlobRenderContext();- if (blobRenderContext != null) {++ fragment.add(form);+ fragment.setOutputMarkupId(true);+ return fragment;+ }++ private Component newPickExistingPanel() {+ Fragment fragment;+ BlobRenderContext context = markdownEditor.getBlobRenderContext();+ if (context != null) {+ fragment = new Fragment(CONTENT_ID, "pickBlobFrag", this);BlobIdentFilter blobIdentFilter = new BlobIdentFilter() {@Override@@ -151,185 +165,348 @@ abstract class InsertUrlPanel extends Panel {*/ObjectId commitId;try {- commitId = blobRenderContext.getProject().getRepository()- .resolve(blobRenderContext.getBlobIdent().revision);+ commitId = context.getProject().getRepository()+ .resolve(context.getBlobIdent().revision);} catch (IOException e) {throw new RuntimeException(e);}- BlobIdent rootBlobIdent = new BlobIdent(commitId.name(), null, FileMode.TYPE_TREE);- if (!blobRenderContext.getProject().getChildren(rootBlobIdent, blobIdentFilter).isEmpty()) {- add(new DropdownLink("blobPicker") {+ Set<BlobIdent> filePickerState = markdownEditor.getFilePickerState();+ BlobIdent blobIdent = context.getBlobIdent();+ String parentPath;+ if (blobIdent.isTree())+ parentPath = blobIdent.path;+ else if (blobIdent.path.contains("/"))+ parentPath = StringUtils.substringBeforeLast(blobIdent.path, "/");+ else+ parentPath = null;++ while (parentPath != null) {+ filePickerState.add(new BlobIdent(commitId.name(), parentPath, FileMode.TYPE_TREE));+ if (parentPath.contains("/"))+ parentPath = StringUtils.substringBeforeLast(parentPath, "/");+ else+ parentPath = null;+ }++ fragment.add(new ProjectFilePicker("files", commitId) {- @Override- protected Component newContent(String id, FloatingPanel dropdown) {+ @Override+ protected void onSelect(AjaxRequestTarget target, BlobIdent blobIdent) {+ blobIdent = new BlobIdent(context.getBlobIdent().revision, blobIdent.path, blobIdent.mode);+ String baseUrl = context.getBaseUrl();+ String referenceUrl = urlFor(ProjectBlobPage.class,+ ProjectBlobPage.paramsOf(context.getProject(), blobIdent)).toString();+ String relativized = PathUtils.relativize(baseUrl, referenceUrl);+ markdownEditor.insertUrl(target, isImage, relativized, StringUtils.describeUrl(blobIdent.getName()), null);+ onClose(target);+ }++ @Override+ protected BlobIdentFilter getBlobIdentFilter() {+ return blobIdentFilter;+ }++ @Override+ protected Project getProject() {+ return markdownEditor.getBlobRenderContext().getProject();+ }++ @Override+ protected Set<BlobIdent> getState() {+ return markdownEditor.getFilePickerState();+ }- BlobIdent blobIdent = blobRenderContext.getBlobIdent();- String openDirectory;- if (blobIdent.isTree())- openDirectory = blobIdent.path;- else if (blobIdent.path.contains("/"))- openDirectory = StringUtils.substringBeforeLast(blobIdent.path, "/");- else- openDirectory = null;+ });+ } else {+ AttachmentSupport attachmentSupport = Preconditions.checkNotNull(markdownEditor.getAttachmentSupport());+ if (isImage) {+ fragment = new Fragment(CONTENT_ID, "pickAttachedImageFrag", this);+ fragment.add(new ListView<String>("attachments", new LoadableDetachableModel<List<String>>() {++ @Override+ protected List<String> load() {+ List<String> attachmentNames = new ArrayList<>();+ for (String attachmentName: attachmentSupport.getAttachments()) {+ if (markdownEditor.isWebSafeImage(attachmentName))+ attachmentNames.add(attachmentName);+ }+ return attachmentNames;+ }++ }) {++ @Override+ protected void populateItem(final ListItem<String> item) {+ String attachmentName = item.getModelObject();+ String attachmentUrl = attachmentSupport.getAttachmentUrl(attachmentName);++ AjaxLink<Void> selectLink = new AjaxLink<Void>("select") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ String displayName = StringUtils.describeUrl(attachmentName);+ markdownEditor.insertUrl(target, true, attachmentUrl, displayName, null);+ onClose(target);+ }++ };+ selectLink.add(new ExternalImage("image", StringEscapeUtils.escapeHtml4(attachmentUrl)));+ item.add(selectLink);- return new ProjectFilePicker(id, new AbstractReadOnlyModel<Project>() {+ item.add(new AjaxLink<Void>("delete") {@Override- public Project getObject() {- return blobRenderContext.getProject();+ public void onClick(AjaxRequestTarget target) {+ attachmentSupport.deleteAttachemnt(attachmentName);+ target.add(fragment);}- }, blobRenderContext.getBlobIdent().revision, commitId, openDirectory) {+ });+ }++ });++ } else {+ fragment = new Fragment(CONTENT_ID, "pickAttachedFileFrag", this);+ fragment.add(new ListView<String>("attachments", new LoadableDetachableModel<List<String>>() {++ @Override+ protected List<String> load() {+ return attachmentSupport.getAttachments();+ }++ }) {++ @Override+ protected void populateItem(final ListItem<String> item) {+ String attachmentName = item.getModelObject();+ String attachmentUrl = attachmentSupport.getAttachmentUrl(attachmentName);++ AjaxLink<Void> selectLink = new AjaxLink<Void>("select") {@Override- protected void onSelect(AjaxRequestTarget target, BlobIdent blobIdent) {- String baseUrl = blobRenderContext.getBaseUrl();- String referenceUrl = urlFor(ProjectBlobPage.class,- ProjectBlobPage.paramsOf(blobRenderContext.getProject(), blobIdent)).toString();- String relativized = PathUtils.relativize(baseUrl, referenceUrl);- markdownEditor.insertUrl(target, isImage, relativized, blobIdent.getName(), null);+ public void onClick(AjaxRequestTarget target) {+ String displayName = StringUtils.describeUrl(attachmentName);+ markdownEditor.insertUrl(target, false, attachmentUrl, displayName, null);onClose(target);- dropdown.close();}+ };+ selectLink.add(new Label("file", StringEscapeUtils.escapeHtml4(attachmentName)));+ item.add(selectLink);++ item.add(new AjaxLink<Void>("delete") {+@Override- protected BlobIdentFilter getBlobIdentFilter() {- return blobIdentFilter;+ public void onClick(AjaxRequestTarget target) {+ attachmentSupport.deleteAttachemnt(attachmentName);+ target.add(fragment);}- };+ });}-- });- } else {- add(new WebMarkupContainer("blobPicker").setVisible(false));++ });}- } else {- add(new WebMarkupContainer("blobPicker").setVisible(false));}+ fragment.setOutputMarkupId(true);+ return fragment;+ }++ private Component newUploadPanel() {+ Fragment fragment;++ IModel<Collection<FileUpload>> model = new PropertyModel<Collection<FileUpload>>(this, "uploads");+ String acceptedFiles;+ if (isImage)+ acceptedFiles = "image/*";+ else+ acceptedFiles = null;AttachmentSupport attachmentSupport = markdownEditor.getAttachmentSupport();- add(new ListView<String>("attachments", new LoadableDetachableModel<List<String>>() {+ if (attachmentSupport != null) {+ fragment = new Fragment(CONTENT_ID, "uploadAttachmentFrag", this);++ Form<?> form = new Form<Void>("form") {- @Override- protected List<String> load() {- List<String> attachmentNames = new ArrayList<>();- if (attachmentSupport != null) {- for (String attachmentName: attachmentSupport.getAttachments()) {- if (!isImage || markdownEditor.isWebSafeImage(attachmentName))- attachmentNames.add(attachmentName);+ @Override+ protected void onSubmit() {+ super.onSubmit();++ AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);+ String attachmentName;+ FileUpload upload = uploads.iterator().next();+ try (InputStream is = upload.getInputStream()) {+ attachmentName = attachmentSupport.saveAttachment(upload.getClientFileName(), is);+ } catch (IOException e) {+ throw new RuntimeException(e);}+ markdownEditor.insertUrl(target, isImage,+ attachmentSupport.getAttachmentUrl(attachmentName), StringUtils.describeUrl(attachmentName), null);+ onClose(target);}- return attachmentNames;- }++ @Override+ protected void onFileUploadException(FileUploadException e, Map<String, Object> model) {+ throw new RuntimeException(e);+ }++ };+ form.setMaxSize(Bytes.bytes(attachmentSupport.getAttachmentMaxSize()));+ form.setMultiPart(true);+ form.add(new NotificationPanel("feedback", form));++ int maxFilesize = (int) (attachmentSupport.getAttachmentMaxSize()/1024/1024);+ if (maxFilesize <= 0)+ maxFilesize = 1;+ form.add(new DropzoneField("file", model, acceptedFiles, 1, maxFilesize).setRequired(true));++ form.add(new AjaxButton("insert"){});- }) {+ fragment.add(form);+ } else {+ fragment = new Fragment(CONTENT_ID, "uploadBlobFrag", this);+ Form<?> form = new Form<Void>("form");+ form.setMultiPart(true);+ form.setFileMaxSize(Bytes.megabytes(Project.MAX_UPLOAD_SIZE));+ add(form);++ NotificationPanel feedback = new NotificationPanel("feedback", form);+ feedback.setOutputMarkupPlaceholderTag(true);+ form.add(feedback);++ form.add(new DropzoneField("file", model, acceptedFiles, 1, Project.MAX_UPLOAD_SIZE).setRequired(true));- @Override- protected void populateItem(final ListItem<String> item) {- String attachmentName = item.getModelObject();- String attachmentUrl = attachmentSupport.getAttachmentUrl(attachmentName);- item.add(new AjaxLink<Void>("select") {+ form.add(new TextField<String>("directory",+ new PropertyModel<String>(markdownEditor, "uploadDirectory")));+ form.add(new TextField<String>("summaryCommitMessage",+ new PropertyModel<String>(InsertUrlPanel.this, "summaryCommitMessage")));+ form.add(new TextArea<String>("detailCommitMessage",+ new PropertyModel<String>(InsertUrlPanel.this, "detailCommitMessage")));++ form.add(new AjaxButton("insert") {- @Override- public void onClick(AjaxRequestTarget target) {- markdownEditor.insertUrl(target, isImage, attachmentUrl, attachmentName, null);- onClose(target);- }+ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);- @Override- public IModel<?> getBody() {- String body;- if (isImage)- body = "<img src='" + StringEscapeUtils.escapeHtml4(attachmentUrl) + "'></img>";- else- body = "<span>" + StringEscapeUtils.escapeHtml4(item.getModelObject()) + "<span>";- return Model.of(body);- }+ BlobRenderContext context = Preconditions.checkNotNull(markdownEditor.getBlobRenderContext());+ String commitMessage = summaryCommitMessage;+ if (StringUtils.isBlank(commitMessage))+ commitMessage = "Add files via upload";- }.setEscapeModelStrings(false));-- item.add(new AjaxLink<Void>("delete") {+ if (StringUtils.isNotBlank(detailCommitMessage))+ commitMessage += "\n\n" + detailCommitMessage;- @Override- public void onClick(AjaxRequestTarget target) {- attachmentSupport.deleteAttachemnt(attachmentName);- target.add(InsertUrlPanel.this);+ try {+ String directory = markdownEditor.getUploadDirectory();+ context.uploadFiles(uploads, directory, commitMessage);+ String fileName = uploads.iterator().next().getClientFileName();+ String url;+ if (directory != null) {+ url = directory + "/" + fileName;+ } else {+ url = fileName;+ }+ markdownEditor.insertUrl(target, isImage, url, StringUtils.describeUrl(fileName), null);+ onClose(target);+ } catch (BlobUploadException e) {+ form.error(e.getMessage());+ target.add(feedback);}-- });- }+ }- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!getModelObject().isEmpty());- }+ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(feedback);+ }++ });- });+ fragment.add(form);+ }++ fragment.setOutputMarkupId(true);+ return fragment;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new Label("title", isImage?"Insert Image":"Insert Link"));- FileUploadField uploadField = new FileUploadField("file") {+ if (markdownEditor.getBlobRenderContext() == null && markdownEditor.getAttachmentSupport() == null) {+ add(newInputUrlPanel());+ } else {+ Fragment fragment = new Fragment(CONTENT_ID, "tabbedFrag", this);+ List<Tab> tabs = new ArrayList<>();+ AjaxActionTab inputUrlTab = new AjaxActionTab(Model.of(TAB_INPUT_URL)) {- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);+ @Override+ protected void onSelect(AjaxRequestTarget target, Component tabLink) {+ Component content = newInputUrlPanel();+ target.add(content);+ fragment.replace(content);+ markdownEditor.setActiveInsertUrlTab(TAB_INPUT_URL);+ }- String script = String.format("turbodev.server.markdown.onFileUploadDomReady('%s', %d, '%s');",- getMarkupId(), attachmentSupport.getAttachmentMaxSize(),- FileUtils.byteCountToDisplaySize(attachmentSupport.getAttachmentMaxSize()));- response.render(OnDomReadyHeaderItem.forScript(script));- }-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- if (isImage)- tag.put("accept", "image/*");- }+ };+ tabs.add(inputUrlTab);- };-- Form<?> uploadForm = new Form<Void>("uploadForm") {+ AjaxActionTab pickExistingTab = new AjaxActionTab(Model.of(TAB_PICK_EXISTING)) {- @Override- protected void onSubmit() {- super.onSubmit();+ @Override+ protected void onSelect(AjaxRequestTarget target, Component tabLink) {+ Component content = newPickExistingPanel();+ target.add(content);+ fragment.replace(content);+ markdownEditor.setActiveInsertUrlTab(TAB_PICK_EXISTING);+ }- AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);- FileUpload upload = uploadField.getFileUpload();- if (upload != null) {- String attachmentName;- try (InputStream is = upload.getInputStream()) {- attachmentName = attachmentSupport.saveAttachment(upload.getClientFileName(), is);- } catch (IOException e) {- throw new RuntimeException(e);- }- markdownEditor.insertUrl(target, isImage,- attachmentSupport.getAttachmentUrl(attachmentName), attachmentName, null);- onClose(target);- } else {- error("Please select a non-empty file");- target.add(InsertUrlPanel.this);+ };+ tabs.add(pickExistingTab);++ AjaxActionTab uploadTab = new AjaxActionTab(Model.of(TAB_UPLOAD)) {++ @Override+ protected void onSelect(AjaxRequestTarget target, Component tabLink) {+ Component content = newUploadPanel();+ target.add(content);+ fragment.replace(content);+ markdownEditor.setActiveInsertUrlTab(TAB_UPLOAD);}- }++ };+ tabs.add(uploadTab);+ fragment.add(new Tabbable("tabs", tabs));++ inputUrlTab.setSelected(false);+ if (markdownEditor.getActiveInsertUrlTab().equals(TAB_INPUT_URL)) {+ inputUrlTab.setSelected(true);+ fragment.add(newInputUrlPanel());+ } else if (markdownEditor.getActiveInsertUrlTab().equals(TAB_PICK_EXISTING)) {+ pickExistingTab.setSelected(true);+ fragment.add(newPickExistingPanel());+ } else {+ uploadTab.setSelected(true);+ fragment.add(newUploadPanel());+ }+ add(fragment);+ }++ add(new AjaxLink<Void>("close") {+@Override- protected void onFileUploadException(FileUploadException e, Map<String, Object> model) {- throw new RuntimeException(e);+ public void onClick(AjaxRequestTarget target) {+ onClose(target);}- };- if (attachmentSupport != null)- uploadForm.setMaxSize(Bytes.bytes(attachmentSupport.getAttachmentMaxSize()));- uploadForm.setMultiPart(true);- uploadForm.add(new NotificationPanel("feedback", uploadForm).setOutputMarkupPlaceholderTag(true));- uploadForm.add(uploadField);- uploadForm.add(new AjaxButton("submit") {});- uploadForm.setVisible(attachmentSupport != null);- add(uploadForm);+ });- setOutputMarkupId(true);}protected abstract void onClose(AjaxRequestTarget target);diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/MarkdownEditor.java b/web/src/main/java/com/turbodev/server/web/component/markdown/MarkdownEditor.javaindex 610673bf12..45d8e742d4 100644--- a/web/src/main/java/com/turbodev/server/web/component/markdown/MarkdownEditor.java+++ b/web/src/main/java/com/turbodev/server/web/component/markdown/MarkdownEditor.java@@ -6,8 +6,10 @@ import java.io.UnsupportedEncodingException;import java.net.URLDecoder;import java.util.ArrayList;import java.util.HashMap;+import java.util.HashSet;import java.util.List;import java.util.Map;+import java.util.Set;import javax.annotation.Nullable;import javax.servlet.http.Cookie;@@ -46,6 +48,7 @@ import com.turbodev.launcher.loader.AppLoader;import com.google.common.base.Charsets;import com.google.common.base.Preconditions;import com.turbodev.server.TurboDev;+import com.turbodev.server.git.BlobIdent;import com.turbodev.server.manager.MarkdownManager;import com.turbodev.server.model.PullRequest;import com.turbodev.server.util.facade.UserFacade;@@ -72,6 +75,12 @@ public class MarkdownEditor extends FormComponentPanel<String> {private AbstractPostAjaxBehavior ajaxBehavior;+ private String activeInsertUrlTab = InsertUrlPanel.TAB_INPUT_URL;++ private String uploadDirectory;++ private Set<BlobIdent> filePickerState = new HashSet<>();+/*** @param id* component id of the editor@@ -399,10 +408,10 @@ public class MarkdownEditor extends FormComponentPanel<String> {}public void insertUrl(AjaxRequestTarget target, boolean isImage, String url,- @Nullable String name, String replaceMessage) {- String script = String.format("turbodev.server.markdown.insertUrl('%s', %s, '%s', %s, %s);",+ String name, @Nullable String replaceMessage) {+ String script = String.format("turbodev.server.markdown.insertUrl('%s', %s, '%s', '%s', %s);",container.getMarkupId(), isImage, StringEscapeUtils.escapeEcmaScript(url),- name!=null?"'"+StringEscapeUtils.escapeEcmaScript(name)+"'":"undefined",+ StringEscapeUtils.escapeEcmaScript(name),replaceMessage!=null?"'"+replaceMessage+"'":"undefined");target.appendJavaScript(script);}@@ -441,5 +450,29 @@ public class MarkdownEditor extends FormComponentPanel<String> {public BlobRenderContext getBlobRenderContext() {return blobRenderContext;}++ public String getActiveInsertUrlTab() {+ return activeInsertUrlTab;+ }++ public void setActiveInsertUrlTab(String activeInsertUrlTab) {+ this.activeInsertUrlTab = activeInsertUrlTab;+ }++ public String getUploadDirectory() {+ return uploadDirectory;+ }++ public void setUploadDirectory(String uploadDirectory) {+ this.uploadDirectory = uploadDirectory;+ }++ public Set<BlobIdent> getFilePickerState() {+ return filePickerState;+ }++ public void setFilePickerState(Set<BlobIdent> filePickerState) {+ this.filePickerState = filePickerState;+ }}diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/markdown.css b/web/src/main/java/com/turbodev/server/web/component/markdown/markdown.cssindex 6707f6137d..4cb8772924 100644--- a/web/src/main/java/com/turbodev/server/web/component/markdown/markdown.css+++ b/web/src/main/java/com/turbodev/server/web/component/markdown/markdown.css@@ -196,40 +196,21 @@ body.fullscreen {color: inherit;}-.insert-url>.section>.or {- font-size: 16px;- font-weight: bold;- margin: 12px 0;-}-.insert-url>.section>.content {- padding: 12px;- border: 1px dashed #AAA;- border-radius: 4px;- background: #F9F9F9;+.insert-url .attachment {+ margin-bottom: 20px;}-.insert-url>.section>.content .alert {+.insert-url .attachment:LAST-CHILD {margin-bottom: 0;- margin-top: 20px;}-.insert-url input.url {- width: 470px;- margin-right: 7px;-}-.insert-url .attachments {- max-height: 300px;- overflow: auto;- margin-bottom: 20px;-}-.insert-url .attachments img {+.insert-url .attachment.image img {max-width: 100%;+ border-radius: 4px 4px 0 0 ;}-.insert-url .attachment a {- color: #666;-}-.insert-url .attachment a.select {- margin-right: 6px;+.insert-url .attachment.image .btn {+ border-radius: 0 0 4px 4px;}+.insert-url .alert-info {margin-top: 20px;}diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/markdown.js b/web/src/main/java/com/turbodev/server/web/component/markdown/markdown.jsindex 71e2d5c3ae..29d64adb25 100644--- a/web/src/main/java/com/turbodev/server/web/component/markdown/markdown.js+++ b/web/src/main/java/com/turbodev/server/web/component/markdown/markdown.js@@ -958,19 +958,13 @@ turbodev.server.markdown = {}}},- onFileUploadDomReady: function(uploadId, maxSize, maxSizeForDisplay) {- var $upload = $('#' + uploadId);- $upload.change(function() {- var $feedback = $upload.closest('form').find(".feedback");- if ($upload[0].files[0].size>maxSize) {- $feedback.html("<div class='alert alert-danger'>Size of upload file should be less than "- + maxSizeForDisplay + "<button type='button' class='close' data-dismiss='alert' aria-label='Close'>" +- "<span aria-hidden='true'>×</span></button></div>");- } else {- $feedback.empty();- $upload.next().click();- }- })+ onInputUrlDomReady: function(containerId) {+ var $container = $("#"+containerId);+ var $url = $container.find(".url");+ var $text = $container.find(".text");+ $url.on("input", function() {+ $text.attr("placeholder", turbodev.server.util.describeUrl($url.val()));+ });}};\ No newline at end of filediff --git a/web/src/main/java/com/turbodev/server/web/component/projectfilepicker/ProjectFilePicker.java b/web/src/main/java/com/turbodev/server/web/component/projectfilepicker/ProjectFilePicker.javaindex e50119d31b..318a057689 100644--- a/web/src/main/java/com/turbodev/server/web/component/projectfilepicker/ProjectFilePicker.java+++ b/web/src/main/java/com/turbodev/server/web/component/projectfilepicker/ProjectFilePicker.java@@ -2,10 +2,8 @@ package com.turbodev.server.web.component.projectfilepicker;import java.util.Iterator;import java.util.List;+import java.util.Set;-import javax.annotation.Nullable;--import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;@@ -16,7 +14,8 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.html.panel.GenericPanel;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.eclipse.jgit.lib.FileMode;@@ -29,26 +28,16 @@ import com.turbodev.server.web.component.BlobIcon;import com.turbodev.server.web.component.link.ViewStateAwareAjaxLink;@SuppressWarnings("serial")-public abstract class ProjectFilePicker extends GenericPanel<Project> {+public abstract class ProjectFilePicker extends Panel {- private final String revision;-private final ObjectId commitId;- private final String initialDirectoryToOpen;-- public ProjectFilePicker(String id, IModel<Project> projectModel, String revision) {- this(id, projectModel, revision, projectModel.getObject().getObjectId(revision), null);- }-- public ProjectFilePicker(String id, IModel<Project> projectModel, String revision, ObjectId commitId,- @Nullable String initialDirectoryToOpen) {- super(id, projectModel);- this.revision = revision;+ public ProjectFilePicker(String id, ObjectId commitId) {+ super(id);+this.commitId = commitId;- this.initialDirectoryToOpen = initialDirectoryToOpen;}-+@Overrideprotected void onInitialize() {super.onInitialize();@@ -61,7 +50,7 @@ public abstract class ProjectFilePicker extends GenericPanel<Project> {@Overridepublic Iterator<? extends BlobIdent> getRoots() {- return getChildren(new BlobIdent(revision, null, FileMode.TYPE_TREE));+ return getChildren(new BlobIdent(commitId.name(), null, FileMode.TYPE_TREE));}@Override@@ -71,7 +60,7 @@ public abstract class ProjectFilePicker extends GenericPanel<Project> {@Overridepublic Iterator<? extends BlobIdent> getChildren(BlobIdent node) {- return getModelObject().getChildren(node, getBlobIdentFilter(), commitId).iterator();+ return getProject().getChildren(node, getBlobIdentFilter(), commitId).iterator();}@Override@@ -79,31 +68,26 @@ public abstract class ProjectFilePicker extends GenericPanel<Project> {return Model.of(object);}+ }, new AbstractReadOnlyModel<Set<BlobIdent>>() {++ @Override+ public Set<BlobIdent> getObject() {+ return getState();+ }+}) {@Overrideprotected void onInitialize() {super.onInitialize();add(new HumanTheme());-- if (initialDirectoryToOpen != null) {- reveal(initialDirectoryToOpen);- }- }-- private void reveal(String directory) {- expand(new BlobIdent(revision, directory, FileMode.TREE.getBits()));- if (directory.contains("/")) {- reveal(StringUtils.substringBeforeLast(directory, "/"));- }}@Overridepublic void expand(BlobIdent blobIdent) {super.expand(blobIdent);- List<BlobIdent> children = ProjectFilePicker.this.getModelObject().getChildren(blobIdent,- getBlobIdentFilter(), commitId);+ List<BlobIdent> children = getProject().getChildren(blobIdent, getBlobIdentFilter(), commitId);if (children.size() == 1 && children.get(0).isTree())expand(children.get(0));}@@ -142,6 +126,10 @@ public abstract class ProjectFilePicker extends GenericPanel<Project> {super.renderHead(response);response.render(CssHeaderItem.forReference(new ProjectFilePickerResourceReference()));}++ protected abstract Project getProject();++ protected abstract Set<BlobIdent> getState();protected abstract void onSelect(AjaxRequestTarget target, BlobIdent blobIdent);diff --git a/web/src/main/java/com/turbodev/server/web/component/tabbable/AjaxActionTab.java b/web/src/main/java/com/turbodev/server/web/component/tabbable/AjaxActionTab.javaindex 03090ba699..b1a596e803 100644--- a/web/src/main/java/com/turbodev/server/web/component/tabbable/AjaxActionTab.java+++ b/web/src/main/java/com/turbodev/server/web/component/tabbable/AjaxActionTab.java@@ -37,7 +37,7 @@ public abstract class AjaxActionTab extends ActionTab {@Overrideprotected final void onSelect(Component tabLink) {- AjaxRequestTarget target = (AjaxRequestTarget) RequestCycle.get().getRequestHandlerScheduledAfterCurrent();+ AjaxRequestTarget target = Preconditions.checkNotNull(RequestCycle.get().find(AjaxRequestTarget.class));target.add(Preconditions.checkNotNull(tabLink.findParent(Tabbable.class)));onSelect(target, tabLink);}diff --git a/web/src/main/java/com/turbodev/server/web/page/base/base.js b/web/src/main/java/com/turbodev/server/web/page/base/base.jsindex ac4a258f28..9f5f5f85fe 100644--- a/web/src/main/java/com/turbodev/server/web/page/base/base.js+++ b/web/src/main/java/com/turbodev/server/web/page/base/base.js@@ -343,16 +343,6 @@ turbodev.server = {},- autoHeight: function(targetSelector, bottomOffset) {- var adjustHeight = function() {- $(targetSelector).css("max-height", $(document).scrollTop() + $(window).height()- - $(targetSelector).offset().top - bottomOffset + "px");- };- adjustHeight();- $(window).resize(adjustHeight);- $(window).scroll(adjustHeight);- },-showSessionFeedback: function() {if ($("#session-feedback li").length != 0) {var feedback = $("#session-feedback");@@ -542,16 +532,42 @@ turbodev.server = {return history.state != undefined && history.state.visited === true;},},- isDevice: function() {- var ua = navigator.userAgent.toLowerCase();- return ua.indexOf("android") != -1- || ua.indexOf("iphone") != -1- || ua.indexOf("ipad") != -1- || ua.indexOf("windows phone") != -1;- },- isMac: function() {- return navigator.userAgent.indexOf('Mac') != -1;+ util: {+ isDevice: function() {+ var ua = navigator.userAgent.toLowerCase();+ return ua.indexOf("android") != -1+ || ua.indexOf("iphone") != -1+ || ua.indexOf("ipad") != -1+ || ua.indexOf("windows phone") != -1;+ },+ isMac: function() {+ return navigator.userAgent.indexOf('Mac') != -1;+ },+ describeUrl: function(url) {+ if (url.startsWith("http://"))+ return url.substring("http://".length);+ if (url.startsWith("https://"))+ return url.substring("https://".length);++ var index = url.lastIndexOf("/");+ if (index != -1)+ url = url.substring(index+1, url.length);+ index = url.lastIndexOf(".");+ if (index != -1)+ url = url.substring(0, index);+ index = url.lastIndexOf(".");+ if (index != -1)+ url = url.substring(index+1);++ url = url.replace(/[-_]/g, " ");+ var camelized = "";+ var splitted = url.split(" ");+ for (var i in splitted)+ camelized += splitted[i].charAt(0).toUpperCase() + splitted[i].slice(1) + " ";+ return camelized.trim();+ }},+mouseState: {pressed: false,moved: false,diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/BlobUploadPanel.html b/web/src/main/java/com/turbodev/server/web/page/project/blob/BlobUploadPanel.htmlindex e0776c34ed..5076908be3 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/blob/BlobUploadPanel.html+++ b/web/src/main/java/com/turbodev/server/web/page/project/blob/BlobUploadPanel.html@@ -7,11 +7,13 @@<div class="modal-body"><div wicket:id="feedback"></div><div class="form-group">- <div wicket:id="files"></div>+ <div wicket:id="files" class="files"></div></div><div class="form-group">- <label>Sub Directory</label>- <input wicket:id="subDirectory" class="form-control" placeholder="Optionally specify sub directory to put uploaded files"></input>+ <label>Directory</label>+ <input wicket:id="directory" class="form-control"></input>+ <p class="help-block">Optionally specify the directory to put uploaded files. This value+ is considered to be relative to current repository directory</p></div><div class="form-group"><label>Summary Commit Message</label>diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/BlobUploadPanel.java b/web/src/main/java/com/turbodev/server/web/page/project/blob/BlobUploadPanel.javaindex 19acc8a0ea..2ef00895bd 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/blob/BlobUploadPanel.java+++ b/web/src/main/java/com/turbodev/server/web/page/project/blob/BlobUploadPanel.java@@ -2,8 +2,6 @@ package com.turbodev.server.web.page.project.blob;import java.util.ArrayList;import java.util.Collection;-import java.util.HashMap;-import java.util.Map;import org.apache.commons.lang3.StringUtils;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -16,22 +14,9 @@ import org.apache.wicket.markup.html.form.upload.FileUpload;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.PropertyModel;import org.apache.wicket.util.lang.Bytes;-import org.eclipse.jgit.lib.FileMode;-import org.eclipse.jgit.lib.ObjectId;-import com.google.common.base.Preconditions;-import com.google.common.collect.Sets;-import com.turbodev.server.TurboDev;-import com.turbodev.server.git.BlobContent;-import com.turbodev.server.git.BlobEdits;-import com.turbodev.server.git.GitUtils;-import com.turbodev.server.git.exception.NotTreeException;-import com.turbodev.server.git.exception.ObjectAlreadyExistsException;-import com.turbodev.server.git.exception.ObsoleteCommitException;-import com.turbodev.server.manager.ProjectManager;-import com.turbodev.server.manager.UserManager;-import com.turbodev.server.model.User;-import com.turbodev.server.security.SecurityUtils;+import com.turbodev.server.event.RefUpdated;+import com.turbodev.server.model.Project;import com.turbodev.server.web.component.dropzonefield.DropzoneField;import com.turbodev.server.web.page.project.blob.render.BlobRenderContext;@@ -40,11 +25,9 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel@SuppressWarnings("serial")abstract class BlobUploadPanel extends Panel {- private static final int MAX_FILE_SIZE = 10; // In meta bytes-private final BlobRenderContext context;- private String subDirectory;+ private String directory;private String summaryCommitMessage;@@ -63,7 +46,7 @@ abstract class BlobUploadPanel extends Panel {Form<?> form = new Form<Void>("form");form.setMultiPart(true);- form.setFileMaxSize(Bytes.megabytes(MAX_FILE_SIZE));+ form.setFileMaxSize(Bytes.megabytes(Project.MAX_UPLOAD_SIZE));add(form);form.add(new AjaxLink<Void>("close") {@@ -80,78 +63,22 @@ abstract class BlobUploadPanel extends Panel {form.add(feedback);form.add(new DropzoneField("files",- new PropertyModel<Collection<FileUpload>>(this, "uploads"), MAX_FILE_SIZE).setRequired(true));+ new PropertyModel<Collection<FileUpload>>(this, "uploads"), null, 0, Project.MAX_UPLOAD_SIZE).setRequired(true));form.add(new AjaxButton("upload") {@Overrideprotected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);- ProjectManager projectManager = TurboDev.getInstance(ProjectManager.class);- Map<String, BlobContent> newBlobs = new HashMap<>();-- String directory;- if (context.getBlobIdent().path != null) {- if (subDirectory != null)- directory = context.getBlobIdent().path + "/" + subDirectory;- else- directory = context.getBlobIdent().path;- } else {- if (subDirectory != null)- directory = subDirectory;- else- directory = null;- }-- for (FileUpload upload: uploads) {- String blobPath = upload.getClientFileName();- if (directory != null)- blobPath = directory + "/" + blobPath;-- if (projectManager.isModificationNeedsQualityCheck(SecurityUtils.getUser(), context.getProject(),- context.getBlobIdent().revision, blobPath)) {- form.error("Adding of file '" + blobPath + "' need to be reviewed/verified. "- + "Please submit pull request instead");- target.add(feedback);- return;- }- BlobContent blobContent = new BlobContent.Immutable(upload.getBytes(), FileMode.REGULAR_FILE);- newBlobs.put(blobPath, blobContent);- }-- BlobEdits blobEdits = new BlobEdits(Sets.newHashSet(), newBlobs);- String refName = GitUtils.branch2ref(context.getBlobIdent().revision);-String commitMessage = summaryCommitMessage;if (StringUtils.isBlank(commitMessage))commitMessage = "Add files via upload";if (StringUtils.isNotBlank(detailCommitMessage))commitMessage += "\n\n" + detailCommitMessage;- User user = Preconditions.checkNotNull(TurboDev.getInstance(UserManager.class).getCurrent());-- ObjectId prevCommitId = context.getProject().getObjectId(context.getBlobIdent().revision);- ObjectId newCommitId = null;- while (newCommitId == null) {- try {- newCommitId = blobEdits.commit(context.getProject().getRepository(), refName, prevCommitId,- prevCommitId, user.asPerson(), commitMessage);- } catch (ObjectAlreadyExistsException e) {- form.error(e.getMessage());- target.add(feedback);- break;- } catch (NotTreeException e) {- form.error(e.getMessage());- target.add(feedback);- break;- } catch (ObsoleteCommitException e) {- prevCommitId = e.getOldCommitId();- }- }-- if (newCommitId != null)- onCommitted(target, prevCommitId, newCommitId);+ RefUpdated refUpdated = context.uploadFiles(uploads, directory, commitMessage);+ onCommitted(target, refUpdated);}@Override@@ -162,7 +89,7 @@ abstract class BlobUploadPanel extends Panel {});- form.add(new TextField<String>("subDirectory", new PropertyModel<String>(this, "subDirectory")));+ form.add(new TextField<String>("directory", new PropertyModel<String>(this, "directory")));form.add(new TextField<String>("summaryCommitMessage",new PropertyModel<String>(this, "summaryCommitMessage")));form.add(new TextArea<String>("detailCommitMessage", new PropertyModel<String>(this, "detailCommitMessage")));@@ -176,7 +103,8 @@ abstract class BlobUploadPanel extends Panel {});}- abstract void onCommitted(AjaxRequestTarget target, ObjectId oldCommit, ObjectId newCommit);+ abstract void onCommitted(AjaxRequestTarget target, RefUpdated refUpdated);abstract void onCancel(AjaxRequestTarget target);+}diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/ProjectBlobPage.java b/web/src/main/java/com/turbodev/server/web/page/project/blob/ProjectBlobPage.javaindex 13a2c61196..f94abdfd67 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/blob/ProjectBlobPage.java+++ b/web/src/main/java/com/turbodev/server/web/page/project/blob/ProjectBlobPage.java@@ -28,6 +28,7 @@ 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.upload.FileUpload;import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.request.IRequestParameters;import org.apache.wicket.request.cycle.RequestCycle;@@ -46,19 +47,27 @@ import org.eclipse.jgit.treewalk.TreeWalk;import com.google.common.base.Objects;import com.google.common.base.Preconditions;+import com.google.common.collect.Sets;import com.turbodev.jsymbol.TokenPosition;import com.turbodev.jsymbol.util.NoAntiCacheImage;import com.turbodev.launcher.loader.ListenerRegistry;import com.turbodev.server.TurboDev;import com.turbodev.server.event.RefUpdated;+import com.turbodev.server.git.BlobContent;+import com.turbodev.server.git.BlobEdits;import com.turbodev.server.git.BlobIdent;import com.turbodev.server.git.GitUtils;+import com.turbodev.server.git.exception.NotTreeException;+import com.turbodev.server.git.exception.ObjectAlreadyExistsException;+import com.turbodev.server.git.exception.ObsoleteCommitException;import com.turbodev.server.manager.CodeCommentManager;import com.turbodev.server.manager.ProjectManager;import com.turbodev.server.manager.PullRequestManager;+import com.turbodev.server.manager.UserManager;import com.turbodev.server.model.CodeComment;import com.turbodev.server.model.Project;import com.turbodev.server.model.PullRequest;+import com.turbodev.server.model.User;import com.turbodev.server.model.support.TextRange;import com.turbodev.server.persistence.UnitOfWork;import com.turbodev.server.search.IndexManager;@@ -83,6 +92,7 @@ import com.turbodev.server.web.page.project.ProjectPage;import com.turbodev.server.web.page.project.blob.navigator.BlobNavigator;import com.turbodev.server.web.page.project.blob.render.BlobRenderContext;import com.turbodev.server.web.page.project.blob.render.BlobRendererContribution;+import com.turbodev.server.web.page.project.blob.render.BlobUploadException;import com.turbodev.server.web.page.project.blob.render.view.Markable;import com.turbodev.server.web.page.project.blob.search.SearchMenuContributor;import com.turbodev.server.web.page.project.blob.search.advanced.AdvancedSearchPanel;@@ -382,8 +392,8 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {}@Override- void onCommitted(AjaxRequestTarget target, ObjectId oldCommit, ObjectId newCommit) {- ProjectBlobPage.this.onCommitted(target, oldCommit, newCommit);+ void onCommitted(AjaxRequestTarget target, RefUpdated refUpdated) {+ ProjectBlobPage.this.onCommitted(target, refUpdated);modal.close();}@@ -964,21 +974,18 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {}@Override- public void onCommitted(AjaxRequestTarget target, ObjectId oldCommit, ObjectId newCommit) {- String refName = GitUtils.branch2ref(state.blobIdent.revision);+ public void onCommitted(AjaxRequestTarget target, RefUpdated refUpdated) {Project project = getProject();String branch = state.blobIdent.revision;BlobIdent newBlobIdent;- getProject().cacheObjectId(branch, newCommit);+ getProject().cacheObjectId(branch, refUpdated.getNewCommitId());Subject subject = SecurityUtils.getSubject();Long projectId = project.getId();- ObjectId oldCommitId = oldCommit.copy();- ObjectId newCommitId = newCommit.copy();if (state.mode == Mode.DELETE) {try (RevWalk revWalk = new RevWalk(getProject().getRepository())) {- RevTree revTree = getProject().getRevCommit(newCommit).getTree();+ RevTree revTree = getProject().getRevCommit(refUpdated.getNewCommitId()).getTree();String parentPath = StringUtils.substringBeforeLast(state.blobIdent.path, "/");while (TreeWalk.forPath(getProject().getRepository(), parentPath, revTree) == null) {if (parentPath.contains("/")) {@@ -1006,9 +1013,8 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {ThreadContext.bind(subject);try {Project project = TurboDev.getInstance(ProjectManager.class).load(projectId);- project.cacheObjectId(branch, newCommitId);- RefUpdated event = new RefUpdated(project, refName, oldCommitId, newCommitId);- TurboDev.getInstance(ListenerRegistry.class).post(event);+ project.cacheObjectId(branch, refUpdated.getNewCommitId());+ TurboDev.getInstance(ListenerRegistry.class).post(refUpdated);} finally {ThreadContext.unbindSubject();}@@ -1108,4 +1114,64 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {}}+ @Override+ public RefUpdated uploadFiles(Collection<FileUpload> uploads, String directory, String commitMessage) {+ ProjectManager projectManager = TurboDev.getInstance(ProjectManager.class);+ Map<String, BlobContent> newBlobs = new HashMap<>();++ String parentPath;+ BlobIdent blobIdent = getBlobIdent();+ if (blobIdent.path != null) {+ if (blobIdent.isTree())+ parentPath = blobIdent.path;+ else if (blobIdent.path.contains("/"))+ parentPath = StringUtils.substringBeforeLast(blobIdent.path, "/");+ else+ parentPath = null;+ } else {+ parentPath = null;+ }++ if (directory != null) {+ if (parentPath != null)+ parentPath += "/" + directory;+ else+ parentPath = directory;+ }++ for (FileUpload upload: uploads) {+ String blobPath = upload.getClientFileName();+ if (parentPath != null)+ blobPath = parentPath + "/" + blobPath;++ if (projectManager.isModificationNeedsQualityCheck(SecurityUtils.getUser(), getProject(),+ blobIdent.revision, blobPath)) {+ throw new BlobUploadException("Adding of file '" + blobPath + "' need to be reviewed/verified. "+ + "Please submit pull request instead");+ }++ BlobContent blobContent = new BlobContent.Immutable(upload.getBytes(), FileMode.REGULAR_FILE);+ newBlobs.put(blobPath, blobContent);+ }++ BlobEdits blobEdits = new BlobEdits(Sets.newHashSet(), newBlobs);+ String refName = GitUtils.branch2ref(blobIdent.revision);++ User user = Preconditions.checkNotNull(TurboDev.getInstance(UserManager.class).getCurrent());++ ObjectId prevCommitId = getProject().getObjectId(blobIdent.revision);++ while (true) {+ try {+ ObjectId newCommitId = blobEdits.commit(getProject().getRepository(), refName, prevCommitId,+ prevCommitId, user.asPerson(), commitMessage);+ return new RefUpdated(getProject(), refName, prevCommitId, newCommitId);+ } catch (ObjectAlreadyExistsException|NotTreeException e) {+ throw new BlobUploadException(e.getMessage());+ } catch (ObsoleteCommitException e) {+ prevCommitId = e.getOldCommitId();+ }+ }+ }+}diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/project-blob.css b/web/src/main/java/com/turbodev/server/web/page/project/blob/project-blob.cssindex 56780fe9c4..cf7337a95a 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/blob/project-blob.css+++ b/web/src/main/java/com/turbodev/server/web/page/project/blob/project-blob.css@@ -116,3 +116,4 @@color: #05B305;margin-left: 4px;}+diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/BlobRenderContext.java b/web/src/main/java/com/turbodev/server/web/page/project/blob/render/BlobRenderContext.javaindex 9f320c5552..b3ac5d12c4 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/BlobRenderContext.java+++ b/web/src/main/java/com/turbodev/server/web/page/project/blob/render/BlobRenderContext.java@@ -1,15 +1,17 @@package com.turbodev.server.web.page.project.blob.render;import java.io.Serializable;+import java.util.Collection;import java.util.List;import javax.annotation.Nullable;import org.apache.wicket.ajax.AjaxRequestTarget;-import org.eclipse.jgit.lib.ObjectId;+import org.apache.wicket.markup.html.form.upload.FileUpload;import org.eclipse.jgit.revwalk.RevCommit;import com.turbodev.jsymbol.TokenPosition;+import com.turbodev.server.event.RefUpdated;import com.turbodev.server.git.BlobIdent;import com.turbodev.server.model.CodeComment;import com.turbodev.server.model.Project;@@ -68,12 +70,14 @@ public interface BlobRenderContext extends Serializable {void onModeChange(AjaxRequestTarget target, Mode mode);- void onCommitted(AjaxRequestTarget target, ObjectId oldCommit, ObjectId newCommit);+ void onCommitted(AjaxRequestTarget target, RefUpdated refUpdated);void onCommentOpened(AjaxRequestTarget target, @Nullable CodeComment comment);void onAddComment(AjaxRequestTarget target, TextRange mark);+ RefUpdated uploadFiles(Collection<FileUpload> uploads, @Nullable String directory, String commitMessage);+@NullableCodeComment getOpenComment();diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/BlobUploadException.java b/web/src/main/java/com/turbodev/server/web/page/project/blob/render/BlobUploadException.javanew file mode 100644index 0000000000..26583fedf8--- /dev/null+++ b/web/src/main/java/com/turbodev/server/web/page/project/blob/render/BlobUploadException.java@@ -0,0 +1,11 @@+package com.turbodev.server.web.page.project.blob.render;++public class BlobUploadException extends RuntimeException {++ private static final long serialVersionUID = 1L;++ public BlobUploadException(String message) {+ super(message);+ }++}diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java b/web/src/main/java/com/turbodev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.javaindex 5b7543346d..c91475b0db 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java+++ b/web/src/main/java/com/turbodev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java@@ -42,6 +42,7 @@ import com.turbodev.utils.Provider;import com.google.common.base.Objects;import com.google.common.base.Preconditions;import com.turbodev.server.TurboDev;+import com.turbodev.server.event.RefUpdated;import com.turbodev.server.git.Blob;import com.turbodev.server.git.BlobChange;import com.turbodev.server.git.BlobContent;@@ -392,7 +393,8 @@ public class CommitOptionPanel extends Panel {}}if (newCommitId != null) {- context.onCommitted(target, prevCommitId, newCommitId);+ RefUpdated refUpdated = new RefUpdated(context.getProject(), refName, prevCommitId, newCommitId);+ context.onCommitted(target, refUpdated);if (autosaveKey != null)target.appendJavaScript(String.format("localStorage.removeItem('%s');", autosaveKey));return true;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.jsindex 4e84315085..5586992643 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@@ -8,7 +8,7 @@ turbodev.server.sourceView = {var cm = CodeMirror($code[0], {value: fileContent,- readOnly: turbodev.server.isDevice()?"nocursor": true,+ readOnly: turbodev.server.util.isDevice()?"nocursor": true,theme: "eclipse",lineNumbers: true,lineWrapping: lineWrapMode == "Soft wrap",diff --git a/web/src/main/java/com/turbodev/server/web/page/test/TestPage.html b/web/src/main/java/com/turbodev/server/web/page/test/TestPage.htmlindex 795b443f3a..b47194918b 100644--- a/web/src/main/java/com/turbodev/server/web/page/test/TestPage.html+++ b/web/src/main/java/com/turbodev/server/web/page/test/TestPage.html@@ -1,3 +1,2 @@<wicket:extend>- <a wicket:id="test">test</a></wicket:extend>\ No newline at end of filediff --git a/web/src/main/java/com/turbodev/server/web/page/test/TestPage.java b/web/src/main/java/com/turbodev/server/web/page/test/TestPage.javaindex 27cd6712b1..b328e20317 100644--- a/web/src/main/java/com/turbodev/server/web/page/test/TestPage.java+++ b/web/src/main/java/com/turbodev/server/web/page/test/TestPage.java@@ -1,7 +1,5 @@package com.turbodev.server.web.page.test;-import org.apache.wicket.markup.html.link.Link;-import com.turbodev.server.web.page.base.BasePage;@SuppressWarnings("serial")@@ -10,15 +8,6 @@ public class TestPage extends BasePage {@Overrideprotected void onInitialize() {super.onInitialize();-- add(new Link<Void>("test") {-- @Override- public void onClick() {- }-- });-}}diff --git a/web/src/main/java/com/turbodev/server/web/page/user/AvatarEditPage.html b/web/src/main/java/com/turbodev/server/web/page/user/AvatarEditPage.htmlindex 0d39599505..419712c414 100644--- a/web/src/main/java/com/turbodev/server/web/page/user/AvatarEditPage.html+++ b/web/src/main/java/com/turbodev/server/web/page/user/AvatarEditPage.html@@ -3,19 +3,14 @@<img wicket:id="avatar"></img><form wicket:id="form"><div wicket:id="feedback"></div>- <div class="clearfix">- <div class="upload pull-left">- <span class="btn btn-default btn-file">- Select image file to use as avatar... <input wicket:id="file" type="file" accept=".png, .gif, .jpg, .jpeg"></input>- </span>- </div>- <div class="reset pull-left">- <a wicket:id="reset" class="btn btn-default">Use default</a>- </div>+ <div wicket:id="file"></div>+ <div class="actions">+ <button wicket:id="useUploaded" class="btn btn-primary dirty-aware">Use Uploaded</button>+ <a wicket:id="useDefault" class="btn btn-default">Use Default</a></div></form><div class="help-block">- Supported image types are png, gif, jpg and jpeg. The image size should be less than <span wicket:id="maxSize"></span>M bytes.+ The image size should be less than <span wicket:id="maxSize"></span>M bytes.</div></div></wicket:extend>\ No newline at end of filediff --git a/web/src/main/java/com/turbodev/server/web/page/user/AvatarEditPage.java b/web/src/main/java/com/turbodev/server/web/page/user/AvatarEditPage.javaindex 4e29996fbd..4f289da5c7 100644--- a/web/src/main/java/com/turbodev/server/web/page/user/AvatarEditPage.java+++ b/web/src/main/java/com/turbodev/server/web/page/user/AvatarEditPage.java@@ -1,20 +1,24 @@package com.turbodev.server.web.page.user;+import java.util.Collection;+import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.form.AjaxFormSubmitBehavior;import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;import org.apache.wicket.event.Broadcast;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.form.upload.FileUpload;-import org.apache.wicket.markup.html.form.upload.FileUploadField;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.PropertyModel;import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.apache.wicket.util.lang.Bytes;-import com.turbodev.utils.FileUtils;import com.turbodev.server.TurboDev;import com.turbodev.server.security.SecurityUtils;import com.turbodev.server.web.component.avatar.Avatar;import com.turbodev.server.web.component.avatar.AvatarChanged;+import com.turbodev.server.web.component.dropzonefield.DropzoneField;import com.turbodev.server.web.util.avatar.AvatarManager;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;@@ -22,7 +26,9 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel@SuppressWarnings("serial")public class AvatarEditPage extends UserPage {- private static final int MAX_IMAGE_SIZE = 10*1024*1024;+ private static final int MAX_IMAGE_SIZE = 5;++ private Collection<FileUpload> uploads;public AvatarEditPage(PageParameters params) {super(params);@@ -36,43 +42,40 @@ public class AvatarEditPage extends UserPage {Form<?> form = new Form<Void>("form");add(form);+form.add(new NotificationPanel("feedback", form));+ form.setMaxSize(Bytes.megabytes(MAX_IMAGE_SIZE));form.setOutputMarkupId(true);- // for some reason, javascript reports cross origin iframe access error when file size- // exceeds this limit, so we check at server side for the file size instead- // form.setMaxSize(Bytes.megabytes(MAX_IMAGE_SIZE));form.setMultiPart(true);- FileUploadField uploadField = new FileUploadField("file");- form.add(uploadField);+ IModel<Collection<FileUpload>> model = new PropertyModel<>(this, "uploads");- uploadField.add(new AjaxFormSubmitBehavior("change") {+ DropzoneField dropzoneField = new DropzoneField("file", model, "image/*", 1, MAX_IMAGE_SIZE);+ dropzoneField.setRequired(true);+ form.add(dropzoneField);++ form.add(new AjaxButton("useUploaded") {@Override- protected void onSubmit(AjaxRequestTarget target) {- super.onSubmit(target);- FileUpload upload = uploadField.getFileUpload();- if (upload.getSize() >= MAX_IMAGE_SIZE) {- form.error("Upload must be less than " + FileUtils.byteCountToDisplaySize(MAX_IMAGE_SIZE));- } else {- AvatarManager avatarManager = TurboDev.getInstance(AvatarManager.class);- avatarManager.useAvatar(userModel.getObject(), upload);- form.success("Avatar has been updated.");- send(getPage(), Broadcast.BREADTH, new AvatarChanged(target, userModel.getObject()));- }+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);target.add(form);}@Override- protected void onError(AjaxRequestTarget target) {- super.onError(target);+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);+ FileUpload upload = uploads.iterator().next();+ AvatarManager avatarManager = TurboDev.getInstance(AvatarManager.class);+ avatarManager.useAvatar(userModel.getObject(), upload);+ send(getPage(), Broadcast.BREADTH, new AvatarChanged(target, userModel.getObject()));target.add(form);}});- form.add(new AjaxLink<Void>("reset") {+ form.add(new AjaxLink<Void>("useDefault") {@Overrideprotected void onConfigure() {@@ -85,7 +88,6 @@ public class AvatarEditPage extends UserPage {public void onClick(AjaxRequestTarget target) {AvatarManager avatarManager = TurboDev.getInstance(AvatarManager.class);avatarManager.useAvatar(userModel.getObject(), null);- form.success("Avatar has been reset");target.add(form);send(getPage(), Broadcast.BREADTH, new AvatarChanged(target, userModel.getObject()));}diff --git a/web/src/main/java/com/turbodev/server/web/util/resource/AttachmentResource.java b/web/src/main/java/com/turbodev/server/web/util/resource/AttachmentResource.javaindex dc58333dcf..2fdc508725 100644--- a/web/src/main/java/com/turbodev/server/web/util/resource/AttachmentResource.java+++ b/web/src/main/java/com/turbodev/server/web/util/resource/AttachmentResource.java@@ -57,6 +57,8 @@ public class AttachmentResource extends AbstractResource {throw new IllegalArgumentException("attachment parameter has to be specified");File attachmentFile = new File(getAttachmentDir(project.getFacade(), storage), attachment);+ if (!attachmentFile.exists())+ throw new RuntimeException("Attachment not found: " + attachment);ResourceResponse response = new ResourceResponse();response.setContentLength(attachmentFile.length());