Skip to content

The Unified and Autonomous Development Platform

Able to upload files to repository

robin shenc9829b2a5cd5
diff --git a/web/pom.xml b/web/pom.xml
index a4b3974936..64406f6f68 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -89,7 +89,7 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.3</version>
+ <version>1.3.2</version>
</dependency>
<dependency>
<groupId>commons-validator</groupId>
diff --git a/web/src/main/java/com/gitplex/server/web/assets/js/dropzone/DropzoneResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/js/dropzone/DropzoneResourceReference.java
new file mode 100644
index 0000000000..54557b7079
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/assets/js/dropzone/DropzoneResourceReference.java
@@ -0,0 +1,34 @@
+package com.gitplex.server.web.assets.js.dropzone;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.wicket.Application;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.HeaderItem;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.request.resource.CssResourceReference;
+import org.apache.wicket.request.resource.JavaScriptResourceReference;
+
+public class DropzoneResourceReference extends JavaScriptResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public DropzoneResourceReference() {
+ super(DropzoneResourceReference.class, "dropzone.js");
+ }
+
+ @Override
+ public List<HeaderItem> getDependencies() {
+ List<HeaderItem> dependencies = new ArrayList<>();
+ dependencies.add(JavaScriptHeaderItem.forReference(
+ Application.get().getJavaScriptLibrarySettings().getJQueryReference()));
+ dependencies.add(CssHeaderItem.forReference(
+ new CssResourceReference(DropzoneResourceReference.class, "dropzone.css")));
+ dependencies.add(OnDomReadyHeaderItem.forScript("Dropzone.autoDiscover = false;"));
+
+ return dependencies;
+ }
+
+}
diff --git a/web/src/main/java/com/gitplex/server/web/assets/js/dropzone/dropzone.css b/web/src/main/java/com/gitplex/server/web/assets/js/dropzone/dropzone.css
new file mode 100644
index 0000000000..0494d1ccf4
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/assets/js/dropzone/dropzone.css
@@ -0,0 +1,388 @@
+/*
+ * The MIT License
+ * Copyright (c) 2012 Matias Meno <[email protected]>
+ */
+@-webkit-keyframes passing-through {
+ 0% {
+ opacity: 0;
+ -webkit-transform: translateY(40px);
+ -moz-transform: translateY(40px);
+ -ms-transform: translateY(40px);
+ -o-transform: translateY(40px);
+ transform: translateY(40px); }
+ 30%, 70% {
+ opacity: 1;
+ -webkit-transform: translateY(0px);
+ -moz-transform: translateY(0px);
+ -ms-transform: translateY(0px);
+ -o-transform: translateY(0px);
+ transform: translateY(0px); }
+ 100% {
+ opacity: 0;
+ -webkit-transform: translateY(-40px);
+ -moz-transform: translateY(-40px);
+ -ms-transform: translateY(-40px);
+ -o-transform: translateY(-40px);
+ transform: translateY(-40px); } }
+@-moz-keyframes passing-through {
+ 0% {
+ opacity: 0;
+ -webkit-transform: translateY(40px);
+ -moz-transform: translateY(40px);
+ -ms-transform: translateY(40px);
+ -o-transform: translateY(40px);
+ transform: translateY(40px); }
+ 30%, 70% {
+ opacity: 1;
+ -webkit-transform: translateY(0px);
+ -moz-transform: translateY(0px);
+ -ms-transform: translateY(0px);
+ -o-transform: translateY(0px);
+ transform: translateY(0px); }
+ 100% {
+ opacity: 0;
+ -webkit-transform: translateY(-40px);
+ -moz-transform: translateY(-40px);
+ -ms-transform: translateY(-40px);
+ -o-transform: translateY(-40px);
+ transform: translateY(-40px); } }
+@keyframes passing-through {
+ 0% {
+ opacity: 0;
+ -webkit-transform: translateY(40px);
+ -moz-transform: translateY(40px);
+ -ms-transform: translateY(40px);
+ -o-transform: translateY(40px);
+ transform: translateY(40px); }
+ 30%, 70% {
+ opacity: 1;
+ -webkit-transform: translateY(0px);
+ -moz-transform: translateY(0px);
+ -ms-transform: translateY(0px);
+ -o-transform: translateY(0px);
+ transform: translateY(0px); }
+ 100% {
+ opacity: 0;
+ -webkit-transform: translateY(-40px);
+ -moz-transform: translateY(-40px);
+ -ms-transform: translateY(-40px);
+ -o-transform: translateY(-40px);
+ transform: translateY(-40px); } }
+@-webkit-keyframes slide-in {
+ 0% {
+ opacity: 0;
+ -webkit-transform: translateY(40px);
+ -moz-transform: translateY(40px);
+ -ms-transform: translateY(40px);
+ -o-transform: translateY(40px);
+ transform: translateY(40px); }
+ 30% {
+ opacity: 1;
+ -webkit-transform: translateY(0px);
+ -moz-transform: translateY(0px);
+ -ms-transform: translateY(0px);
+ -o-transform: translateY(0px);
+ transform: translateY(0px); } }
+@-moz-keyframes slide-in {
+ 0% {
+ opacity: 0;
+ -webkit-transform: translateY(40px);
+ -moz-transform: translateY(40px);
+ -ms-transform: translateY(40px);
+ -o-transform: translateY(40px);
+ transform: translateY(40px); }
+ 30% {
+ opacity: 1;
+ -webkit-transform: translateY(0px);
+ -moz-transform: translateY(0px);
+ -ms-transform: translateY(0px);
+ -o-transform: translateY(0px);
+ transform: translateY(0px); } }
+@keyframes slide-in {
+ 0% {
+ opacity: 0;
+ -webkit-transform: translateY(40px);
+ -moz-transform: translateY(40px);
+ -ms-transform: translateY(40px);
+ -o-transform: translateY(40px);
+ transform: translateY(40px); }
+ 30% {
+ opacity: 1;
+ -webkit-transform: translateY(0px);
+ -moz-transform: translateY(0px);
+ -ms-transform: translateY(0px);
+ -o-transform: translateY(0px);
+ transform: translateY(0px); } }
+@-webkit-keyframes pulse {
+ 0% {
+ -webkit-transform: scale(1);
+ -moz-transform: scale(1);
+ -ms-transform: scale(1);
+ -o-transform: scale(1);
+ transform: scale(1); }
+ 10% {
+ -webkit-transform: scale(1.1);
+ -moz-transform: scale(1.1);
+ -ms-transform: scale(1.1);
+ -o-transform: scale(1.1);
+ transform: scale(1.1); }
+ 20% {
+ -webkit-transform: scale(1);
+ -moz-transform: scale(1);
+ -ms-transform: scale(1);
+ -o-transform: scale(1);
+ transform: scale(1); } }
+@-moz-keyframes pulse {
+ 0% {
+ -webkit-transform: scale(1);
+ -moz-transform: scale(1);
+ -ms-transform: scale(1);
+ -o-transform: scale(1);
+ transform: scale(1); }
+ 10% {
+ -webkit-transform: scale(1.1);
+ -moz-transform: scale(1.1);
+ -ms-transform: scale(1.1);
+ -o-transform: scale(1.1);
+ transform: scale(1.1); }
+ 20% {
+ -webkit-transform: scale(1);
+ -moz-transform: scale(1);
+ -ms-transform: scale(1);
+ -o-transform: scale(1);
+ transform: scale(1); } }
+@keyframes pulse {
+ 0% {
+ -webkit-transform: scale(1);
+ -moz-transform: scale(1);
+ -ms-transform: scale(1);
+ -o-transform: scale(1);
+ transform: scale(1); }
+ 10% {
+ -webkit-transform: scale(1.1);
+ -moz-transform: scale(1.1);
+ -ms-transform: scale(1.1);
+ -o-transform: scale(1.1);
+ transform: scale(1.1); }
+ 20% {
+ -webkit-transform: scale(1);
+ -moz-transform: scale(1);
+ -ms-transform: scale(1);
+ -o-transform: scale(1);
+ transform: scale(1); } }
+.dropzone, .dropzone * {
+ box-sizing: border-box; }
+
+.dropzone {
+ min-height: 150px;
+ border: 2px solid rgba(0, 0, 0, 0.3);
+ background: white;
+ padding: 20px 20px; }
+ .dropzone.dz-clickable {
+ cursor: pointer; }
+ .dropzone.dz-clickable * {
+ cursor: default; }
+ .dropzone.dz-clickable .dz-message, .dropzone.dz-clickable .dz-message * {
+ cursor: pointer; }
+ .dropzone.dz-started .dz-message {
+ display: none; }
+ .dropzone.dz-drag-hover {
+ border-style: solid; }
+ .dropzone.dz-drag-hover .dz-message {
+ opacity: 0.5; }
+ .dropzone .dz-message {
+ text-align: center;
+ margin: 2em 0; }
+ .dropzone .dz-preview {
+ position: relative;
+ display: inline-block;
+ vertical-align: top;
+ margin: 16px;
+ min-height: 100px; }
+ .dropzone .dz-preview:hover {
+ z-index: 1000; }
+ .dropzone .dz-preview:hover .dz-details {
+ opacity: 1; }
+ .dropzone .dz-preview.dz-file-preview .dz-image {
+ border-radius: 20px;
+ background: #999;
+ background: linear-gradient(to bottom, #eee, #ddd); }
+ .dropzone .dz-preview.dz-file-preview .dz-details {
+ opacity: 1; }
+ .dropzone .dz-preview.dz-image-preview {
+ background: white; }
+ .dropzone .dz-preview.dz-image-preview .dz-details {
+ -webkit-transition: opacity 0.2s linear;
+ -moz-transition: opacity 0.2s linear;
+ -ms-transition: opacity 0.2s linear;
+ -o-transition: opacity 0.2s linear;
+ transition: opacity 0.2s linear; }
+ .dropzone .dz-preview .dz-remove {
+ font-size: 14px;
+ text-align: center;
+ display: block;
+ cursor: pointer;
+ border: none; }
+ .dropzone .dz-preview .dz-remove:hover {
+ text-decoration: underline; }
+ .dropzone .dz-preview:hover .dz-details {
+ opacity: 1; }
+ .dropzone .dz-preview .dz-details {
+ z-index: 20;
+ position: absolute;
+ top: 0;
+ left: 0;
+ opacity: 0;
+ font-size: 13px;
+ min-width: 100%;
+ max-width: 100%;
+ padding: 2em 1em;
+ text-align: center;
+ color: rgba(0, 0, 0, 0.9);
+ line-height: 150%; }
+ .dropzone .dz-preview .dz-details .dz-size {
+ margin-bottom: 1em;
+ font-size: 16px; }
+ .dropzone .dz-preview .dz-details .dz-filename {
+ white-space: nowrap; }
+ .dropzone .dz-preview .dz-details .dz-filename:hover span {
+ border: 1px solid rgba(200, 200, 200, 0.8);
+ background-color: rgba(255, 255, 255, 0.8); }
+ .dropzone .dz-preview .dz-details .dz-filename:not(:hover) {
+ overflow: hidden;
+ text-overflow: ellipsis; }
+ .dropzone .dz-preview .dz-details .dz-filename:not(:hover) span {
+ border: 1px solid transparent; }
+ .dropzone .dz-preview .dz-details .dz-filename span, .dropzone .dz-preview .dz-details .dz-size span {
+ background-color: rgba(255, 255, 255, 0.4);
+ padding: 0 0.4em;
+ border-radius: 3px; }
+ .dropzone .dz-preview:hover .dz-image img {
+ -webkit-transform: scale(1.05, 1.05);
+ -moz-transform: scale(1.05, 1.05);
+ -ms-transform: scale(1.05, 1.05);
+ -o-transform: scale(1.05, 1.05);
+ transform: scale(1.05, 1.05);
+ -webkit-filter: blur(8px);
+ filter: blur(8px); }
+ .dropzone .dz-preview .dz-image {
+ border-radius: 20px;
+ overflow: hidden;
+ width: 120px;
+ height: 120px;
+ position: relative;
+ display: block;
+ z-index: 10; }
+ .dropzone .dz-preview .dz-image img {
+ display: block; }
+ .dropzone .dz-preview.dz-success .dz-success-mark {
+ -webkit-animation: passing-through 3s cubic-bezier(0.77, 0, 0.175, 1);
+ -moz-animation: passing-through 3s cubic-bezier(0.77, 0, 0.175, 1);
+ -ms-animation: passing-through 3s cubic-bezier(0.77, 0, 0.175, 1);
+ -o-animation: passing-through 3s cubic-bezier(0.77, 0, 0.175, 1);
+ animation: passing-through 3s cubic-bezier(0.77, 0, 0.175, 1); }
+ .dropzone .dz-preview.dz-error .dz-error-mark {
+ opacity: 1;
+ -webkit-animation: slide-in 3s cubic-bezier(0.77, 0, 0.175, 1);
+ -moz-animation: slide-in 3s cubic-bezier(0.77, 0, 0.175, 1);
+ -ms-animation: slide-in 3s cubic-bezier(0.77, 0, 0.175, 1);
+ -o-animation: slide-in 3s cubic-bezier(0.77, 0, 0.175, 1);
+ animation: slide-in 3s cubic-bezier(0.77, 0, 0.175, 1); }
+ .dropzone .dz-preview .dz-success-mark, .dropzone .dz-preview .dz-error-mark {
+ pointer-events: none;
+ opacity: 0;
+ z-index: 500;
+ position: absolute;
+ display: block;
+ top: 50%;
+ left: 50%;
+ margin-left: -27px;
+ margin-top: -27px; }
+ .dropzone .dz-preview .dz-success-mark svg, .dropzone .dz-preview .dz-error-mark svg {
+ display: block;
+ width: 54px;
+ height: 54px; }
+ .dropzone .dz-preview.dz-processing .dz-progress {
+ opacity: 1;
+ -webkit-transition: all 0.2s linear;
+ -moz-transition: all 0.2s linear;
+ -ms-transition: all 0.2s linear;
+ -o-transition: all 0.2s linear;
+ transition: all 0.2s linear; }
+ .dropzone .dz-preview.dz-complete .dz-progress {
+ opacity: 0;
+ -webkit-transition: opacity 0.4s ease-in;
+ -moz-transition: opacity 0.4s ease-in;
+ -ms-transition: opacity 0.4s ease-in;
+ -o-transition: opacity 0.4s ease-in;
+ transition: opacity 0.4s ease-in; }
+ .dropzone .dz-preview:not(.dz-processing) .dz-progress {
+ -webkit-animation: pulse 6s ease infinite;
+ -moz-animation: pulse 6s ease infinite;
+ -ms-animation: pulse 6s ease infinite;
+ -o-animation: pulse 6s ease infinite;
+ animation: pulse 6s ease infinite; }
+ .dropzone .dz-preview .dz-progress {
+ opacity: 1;
+ z-index: 1000;
+ pointer-events: none;
+ position: absolute;
+ height: 16px;
+ left: 50%;
+ top: 50%;
+ margin-top: -8px;
+ width: 80px;
+ margin-left: -40px;
+ background: rgba(255, 255, 255, 0.9);
+ -webkit-transform: scale(1);
+ border-radius: 8px;
+ overflow: hidden; }
+ .dropzone .dz-preview .dz-progress .dz-upload {
+ background: #333;
+ background: linear-gradient(to bottom, #666, #444);
+ position: absolute;
+ top: 0;
+ left: 0;
+ bottom: 0;
+ width: 0;
+ -webkit-transition: width 300ms ease-in-out;
+ -moz-transition: width 300ms ease-in-out;
+ -ms-transition: width 300ms ease-in-out;
+ -o-transition: width 300ms ease-in-out;
+ transition: width 300ms ease-in-out; }
+ .dropzone .dz-preview.dz-error .dz-error-message {
+ display: block; }
+ .dropzone .dz-preview.dz-error:hover .dz-error-message {
+ opacity: 1;
+ pointer-events: auto; }
+ .dropzone .dz-preview .dz-error-message {
+ pointer-events: none;
+ z-index: 1000;
+ position: absolute;
+ display: block;
+ display: none;
+ opacity: 0;
+ -webkit-transition: opacity 0.3s ease;
+ -moz-transition: opacity 0.3s ease;
+ -ms-transition: opacity 0.3s ease;
+ -o-transition: opacity 0.3s ease;
+ transition: opacity 0.3s ease;
+ border-radius: 8px;
+ font-size: 13px;
+ top: 130px;
+ left: -10px;
+ width: 140px;
+ background: #be2626;
+ background: linear-gradient(to bottom, #be2626, #a92222);
+ padding: 0.5em 1.2em;
+ color: white; }
+ .dropzone .dz-preview .dz-error-message:after {
+ content: '';
+ position: absolute;
+ top: -6px;
+ left: 64px;
+ width: 0;
+ height: 0;
+ border-left: 6px solid transparent;
+ border-right: 6px solid transparent;
+ border-bottom: 6px solid #be2626; }
diff --git a/web/src/main/java/com/gitplex/server/web/assets/js/dropzone/dropzone.js b/web/src/main/java/com/gitplex/server/web/assets/js/dropzone/dropzone.js
new file mode 100644
index 0000000000..895b055a8f
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/assets/js/dropzone/dropzone.js
@@ -0,0 +1,1767 @@
+
+/*
+ *
+ * More info at [www.dropzonejs.com](http://www.dropzonejs.com)
+ *
+ * Copyright (c) 2012, Matias Meno
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ */
+
+(function() {
+ var Dropzone, Emitter, camelize, contentLoaded, detectVerticalSquash, drawImageIOSFix, noop, without,
+ __slice = [].slice,
+ __hasProp = {}.hasOwnProperty,
+ __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
+
+ noop = function() {};
+
+ Emitter = (function() {
+ function Emitter() {}
+
+ Emitter.prototype.addEventListener = Emitter.prototype.on;
+
+ Emitter.prototype.on = function(event, fn) {
+ this._callbacks = this._callbacks || {};
+ if (!this._callbacks[event]) {
+ this._callbacks[event] = [];
+ }
+ this._callbacks[event].push(fn);
+ return this;
+ };
+
+ Emitter.prototype.emit = function() {
+ var args, callback, callbacks, event, _i, _len;
+ event = arguments[0], args = 2 <= arguments.length ? __slice.call(arguments, 1) : [];
+ this._callbacks = this._callbacks || {};
+ callbacks = this._callbacks[event];
+ if (callbacks) {
+ for (_i = 0, _len = callbacks.length; _i < _len; _i++) {
+ callback = callbacks[_i];
+ callback.apply(this, args);
+ }
+ }
+ return this;
+ };
+
+ Emitter.prototype.removeListener = Emitter.prototype.off;
+
+ Emitter.prototype.removeAllListeners = Emitter.prototype.off;
+
+ Emitter.prototype.removeEventListener = Emitter.prototype.off;
+
+ Emitter.prototype.off = function(event, fn) {
+ var callback, callbacks, i, _i, _len;
+ if (!this._callbacks || arguments.length === 0) {
+ this._callbacks = {};
+ return this;
+ }
+ callbacks = this._callbacks[event];
+ if (!callbacks) {
+ return this;
+ }
+ if (arguments.length === 1) {
+ delete this._callbacks[event];
+ return this;
+ }
+ for (i = _i = 0, _len = callbacks.length; _i < _len; i = ++_i) {
+ callback = callbacks[i];
+ if (callback === fn) {
+ callbacks.splice(i, 1);
+ break;
+ }
+ }
+ return this;
+ };
+
+ return Emitter;
+
+ })();
+
+ Dropzone = (function(_super) {
+ var extend, resolveOption;
+
+ __extends(Dropzone, _super);
+
+ Dropzone.prototype.Emitter = Emitter;
+
+
+ /*
+ This is a list of all available events you can register on a dropzone object.
+
+ You can register an event handler like this:
+
+ dropzone.on("dragEnter", function() { });
+ */
+
+ Dropzone.prototype.events = ["drop", "dragstart", "dragend", "dragenter", "dragover", "dragleave", "addedfile", "addedfiles", "removedfile", "thumbnail", "error", "errormultiple", "processing", "processingmultiple", "uploadprogress", "totaluploadprogress", "sending", "sendingmultiple", "success", "successmultiple", "canceled", "canceledmultiple", "complete", "completemultiple", "reset", "maxfilesexceeded", "maxfilesreached", "queuecomplete"];
+
+ Dropzone.prototype.defaultOptions = {
+ url: null,
+ method: "post",
+ withCredentials: false,
+ parallelUploads: 2,
+ uploadMultiple: false,
+ maxFilesize: 256,
+ paramName: "file",
+ createImageThumbnails: true,
+ maxThumbnailFilesize: 10,
+ thumbnailWidth: 120,
+ thumbnailHeight: 120,
+ filesizeBase: 1000,
+ maxFiles: null,
+ params: {},
+ clickable: true,
+ ignoreHiddenFiles: true,
+ acceptedFiles: null,
+ acceptedMimeTypes: null,
+ autoProcessQueue: true,
+ autoQueue: true,
+ addRemoveLinks: false,
+ previewsContainer: null,
+ hiddenInputContainer: "body",
+ capture: null,
+ renameFilename: null,
+ dictDefaultMessage: "Drop files here to upload",
+ dictFallbackMessage: "Your browser does not support drag'n'drop file uploads.",
+ dictFallbackText: "Please use the fallback form below to upload your files like in the olden days.",
+ dictFileTooBig: "File is too big ({{filesize}}MiB). Max filesize: {{maxFilesize}}MiB.",
+ dictInvalidFileType: "You can't upload files of this type.",
+ dictResponseError: "Server responded with {{statusCode}} code.",
+ dictCancelUpload: "Cancel upload",
+ dictCancelUploadConfirmation: "Are you sure you want to cancel this upload?",
+ dictRemoveFile: "Remove file",
+ dictRemoveFileConfirmation: null,
+ dictMaxFilesExceeded: "You can not upload any more files.",
+ accept: function(file, done) {
+ return done();
+ },
+ init: function() {
+ return noop;
+ },
+ forceFallback: false,
+ fallback: function() {
+ var child, messageElement, span, _i, _len, _ref;
+ this.element.className = "" + this.element.className + " dz-browser-not-supported";
+ _ref = this.element.getElementsByTagName("div");
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ child = _ref[_i];
+ if (/(^| )dz-message($| )/.test(child.className)) {
+ messageElement = child;
+ child.className = "dz-message";
+ continue;
+ }
+ }
+ if (!messageElement) {
+ messageElement = Dropzone.createElement("<div class=\"dz-message\"><span></span></div>");
+ this.element.appendChild(messageElement);
+ }
+ span = messageElement.getElementsByTagName("span")[0];
+ if (span) {
+ if (span.textContent != null) {
+ span.textContent = this.options.dictFallbackMessage;
+ } else if (span.innerText != null) {
+ span.innerText = this.options.dictFallbackMessage;
+ }
+ }
+ return this.element.appendChild(this.getFallbackForm());
+ },
+ resize: function(file) {
+ var info, srcRatio, trgRatio;
+ info = {
+ srcX: 0,
+ srcY: 0,
+ srcWidth: file.width,
+ srcHeight: file.height
+ };
+ srcRatio = file.width / file.height;
+ info.optWidth = this.options.thumbnailWidth;
+ info.optHeight = this.options.thumbnailHeight;
+ if ((info.optWidth == null) && (info.optHeight == null)) {
+ info.optWidth = info.srcWidth;
+ info.optHeight = info.srcHeight;
+ } else if (info.optWidth == null) {
+ info.optWidth = srcRatio * info.optHeight;
+ } else if (info.optHeight == null) {
+ info.optHeight = (1 / srcRatio) * info.optWidth;
+ }
+ trgRatio = info.optWidth / info.optHeight;
+ if (file.height < info.optHeight || file.width < info.optWidth) {
+ info.trgHeight = info.srcHeight;
+ info.trgWidth = info.srcWidth;
+ } else {
+ if (srcRatio > trgRatio) {
+ info.srcHeight = file.height;
+ info.srcWidth = info.srcHeight * trgRatio;
+ } else {
+ info.srcWidth = file.width;
+ info.srcHeight = info.srcWidth / trgRatio;
+ }
+ }
+ info.srcX = (file.width - info.srcWidth) / 2;
+ info.srcY = (file.height - info.srcHeight) / 2;
+ return info;
+ },
+
+ /*
+ Those functions register themselves to the events on init and handle all
+ the user interface specific stuff. Overwriting them won't break the upload
+ but can break the way it's displayed.
+ You can overwrite them if you don't like the default behavior. If you just
+ want to add an additional event handler, register it on the dropzone object
+ and don't overwrite those options.
+ */
+ drop: function(e) {
+ return this.element.classList.remove("dz-drag-hover");
+ },
+ dragstart: noop,
+ dragend: function(e) {
+ return this.element.classList.remove("dz-drag-hover");
+ },
+ dragenter: function(e) {
+ return this.element.classList.add("dz-drag-hover");
+ },
+ dragover: function(e) {
+ return this.element.classList.add("dz-drag-hover");
+ },
+ dragleave: function(e) {
+ return this.element.classList.remove("dz-drag-hover");
+ },
+ paste: noop,
+ reset: function() {
+ return this.element.classList.remove("dz-started");
+ },
+ addedfile: function(file) {
+ var node, removeFileEvent, removeLink, _i, _j, _k, _len, _len1, _len2, _ref, _ref1, _ref2, _results;
+ if (this.element === this.previewsContainer) {
+ this.element.classList.add("dz-started");
+ }
+ if (this.previewsContainer) {
+ file.previewElement = Dropzone.createElement(this.options.previewTemplate.trim());
+ file.previewTemplate = file.previewElement;
+ this.previewsContainer.appendChild(file.previewElement);
+ _ref = file.previewElement.querySelectorAll("[data-dz-name]");
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ node = _ref[_i];
+ node.textContent = this._renameFilename(file.name);
+ }
+ _ref1 = file.previewElement.querySelectorAll("[data-dz-size]");
+ for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
+ node = _ref1[_j];
+ node.innerHTML = this.filesize(file.size);
+ }
+ if (this.options.addRemoveLinks) {
+ file._removeLink = Dropzone.createElement("<a class=\"dz-remove\" href=\"javascript:undefined;\" data-dz-remove>" + this.options.dictRemoveFile + "</a>");
+ file.previewElement.appendChild(file._removeLink);
+ }
+ removeFileEvent = (function(_this) {
+ return function(e) {
+ e.preventDefault();
+ e.stopPropagation();
+ if (file.status === Dropzone.UPLOADING) {
+ return Dropzone.confirm(_this.options.dictCancelUploadConfirmation, function() {
+ return _this.removeFile(file);
+ });
+ } else {
+ if (_this.options.dictRemoveFileConfirmation) {
+ return Dropzone.confirm(_this.options.dictRemoveFileConfirmation, function() {
+ return _this.removeFile(file);
+ });
+ } else {
+ return _this.removeFile(file);
+ }
+ }
+ };
+ })(this);
+ _ref2 = file.previewElement.querySelectorAll("[data-dz-remove]");
+ _results = [];
+ for (_k = 0, _len2 = _ref2.length; _k < _len2; _k++) {
+ removeLink = _ref2[_k];
+ _results.push(removeLink.addEventListener("click", removeFileEvent));
+ }
+ return _results;
+ }
+ },
+ removedfile: function(file) {
+ var _ref;
+ if (file.previewElement) {
+ if ((_ref = file.previewElement) != null) {
+ _ref.parentNode.removeChild(file.previewElement);
+ }
+ }
+ return this._updateMaxFilesReachedClass();
+ },
+ thumbnail: function(file, dataUrl) {
+ var thumbnailElement, _i, _len, _ref;
+ if (file.previewElement) {
+ file.previewElement.classList.remove("dz-file-preview");
+ _ref = file.previewElement.querySelectorAll("[data-dz-thumbnail]");
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ thumbnailElement = _ref[_i];
+ thumbnailElement.alt = file.name;
+ thumbnailElement.src = dataUrl;
+ }
+ return setTimeout(((function(_this) {
+ return function() {
+ return file.previewElement.classList.add("dz-image-preview");
+ };
+ })(this)), 1);
+ }
+ },
+ error: function(file, message) {
+ var node, _i, _len, _ref, _results;
+ if (file.previewElement) {
+ file.previewElement.classList.add("dz-error");
+ if (typeof message !== "String" && message.error) {
+ message = message.error;
+ }
+ _ref = file.previewElement.querySelectorAll("[data-dz-errormessage]");
+ _results = [];
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ node = _ref[_i];
+ _results.push(node.textContent = message);
+ }
+ return _results;
+ }
+ },
+ errormultiple: noop,
+ processing: function(file) {
+ if (file.previewElement) {
+ file.previewElement.classList.add("dz-processing");
+ if (file._removeLink) {
+ return file._removeLink.textContent = this.options.dictCancelUpload;
+ }
+ }
+ },
+ processingmultiple: noop,
+ uploadprogress: function(file, progress, bytesSent) {
+ var node, _i, _len, _ref, _results;
+ if (file.previewElement) {
+ _ref = file.previewElement.querySelectorAll("[data-dz-uploadprogress]");
+ _results = [];
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ node = _ref[_i];
+ if (node.nodeName === 'PROGRESS') {
+ _results.push(node.value = progress);
+ } else {
+ _results.push(node.style.width = "" + progress + "%");
+ }
+ }
+ return _results;
+ }
+ },
+ totaluploadprogress: noop,
+ sending: noop,
+ sendingmultiple: noop,
+ success: function(file) {
+ if (file.previewElement) {
+ return file.previewElement.classList.add("dz-success");
+ }
+ },
+ successmultiple: noop,
+ canceled: function(file) {
+ return this.emit("error", file, "Upload canceled.");
+ },
+ canceledmultiple: noop,
+ complete: function(file) {
+ if (file._removeLink) {
+ file._removeLink.textContent = this.options.dictRemoveFile;
+ }
+ if (file.previewElement) {
+ return file.previewElement.classList.add("dz-complete");
+ }
+ },
+ completemultiple: noop,
+ maxfilesexceeded: noop,
+ maxfilesreached: noop,
+ queuecomplete: noop,
+ addedfiles: noop,
+ previewTemplate: "<div class=\"dz-preview dz-file-preview\">\n <div class=\"dz-image\"><img data-dz-thumbnail /></div>\n <div class=\"dz-details\">\n <div class=\"dz-size\"><span data-dz-size></span></div>\n <div class=\"dz-filename\"><span data-dz-name></span></div>\n </div>\n <div class=\"dz-progress\"><span class=\"dz-upload\" data-dz-uploadprogress></span></div>\n <div class=\"dz-error-message\"><span data-dz-errormessage></span></div>\n <div class=\"dz-success-mark\">\n <svg width=\"54px\" height=\"54px\" viewBox=\"0 0 54 54\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" xmlns:sketch=\"http://www.bohemiancoding.com/sketch/ns\">\n <title>Check</title>\n <defs></defs>\n <g id=\"Page-1\" stroke=\"none\" stroke-width=\"1\" fill=\"none\" fill-rule=\"evenodd\" sketch:type=\"MSPage\">\n <path d=\"M23.5,31.8431458 L17.5852419,25.9283877 C16.0248253,24.3679711 13.4910294,24.366835 11.9289322,25.9289322 C10.3700136,27.4878508 10.3665912,30.0234455 11.9283877,31.5852419 L20.4147581,40.0716123 C20.5133999,40.1702541 20.6159315,40.2626649 20.7218615,40.3488435 C22.2835669,41.8725651 24.794234,41.8626202 26.3461564,40.3106978 L43.3106978,23.3461564 C44.8771021,21.7797521 44.8758057,19.2483887 43.3137085,17.6862915 C41.7547899,16.1273729 39.2176035,16.1255422 37.6538436,17.6893022 L23.5,31.8431458 Z M27,53 C41.3594035,53 53,41.3594035 53,27 C53,12.6405965 41.3594035,1 27,1 C12.6405965,1 1,12.6405965 1,27 C1,41.3594035 12.6405965,53 27,53 Z\" id=\"Oval-2\" stroke-opacity=\"0.198794158\" stroke=\"#747474\" fill-opacity=\"0.816519475\" fill=\"#FFFFFF\" sketch:type=\"MSShapeGroup\"></path>\n </g>\n </svg>\n </div>\n <div class=\"dz-error-mark\">\n <svg width=\"54px\" height=\"54px\" viewBox=\"0 0 54 54\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" xmlns:sketch=\"http://www.bohemiancoding.com/sketch/ns\">\n <title>Error</title>\n <defs></defs>\n <g id=\"Page-1\" stroke=\"none\" stroke-width=\"1\" fill=\"none\" fill-rule=\"evenodd\" sketch:type=\"MSPage\">\n <g id=\"Check-+-Oval-2\" sketch:type=\"MSLayerGroup\" stroke=\"#747474\" stroke-opacity=\"0.198794158\" fill=\"#FFFFFF\" fill-opacity=\"0.816519475\">\n <path d=\"M32.6568542,29 L38.3106978,23.3461564 C39.8771021,21.7797521 39.8758057,19.2483887 38.3137085,17.6862915 C36.7547899,16.1273729 34.2176035,16.1255422 32.6538436,17.6893022 L27,23.3431458 L21.3461564,17.6893022 C19.7823965,16.1255422 17.2452101,16.1273729 15.6862915,17.6862915 C14.1241943,19.2483887 14.1228979,21.7797521 15.6893022,23.3461564 L21.3431458,29 L15.6893022,34.6538436 C14.1228979,36.2202479 14.1241943,38.7516113 15.6862915,40.3137085 C17.2452101,41.8726271 19.7823965,41.8744578 21.3461564,40.3106978 L27,34.6568542 L32.6538436,40.3106978 C34.2176035,41.8744578 36.7547899,41.8726271 38.3137085,40.3137085 C39.8758057,38.7516113 39.8771021,36.2202479 38.3106978,34.6538436 L32.6568542,29 Z M27,53 C41.3594035,53 53,41.3594035 53,27 C53,12.6405965 41.3594035,1 27,1 C12.6405965,1 1,12.6405965 1,27 C1,41.3594035 12.6405965,53 27,53 Z\" id=\"Oval-2\" sketch:type=\"MSShapeGroup\"></path>\n </g>\n </g>\n </svg>\n </div>\n</div>"
+ };
+
+ extend = function() {
+ var key, object, objects, target, val, _i, _len;
+ target = arguments[0], objects = 2 <= arguments.length ? __slice.call(arguments, 1) : [];
+ for (_i = 0, _len = objects.length; _i < _len; _i++) {
+ object = objects[_i];
+ for (key in object) {
+ val = object[key];
+ target[key] = val;
+ }
+ }
+ return target;
+ };
+
+ function Dropzone(element, options) {
+ var elementOptions, fallback, _ref;
+ this.element = element;
+ this.version = Dropzone.version;
+ this.defaultOptions.previewTemplate = this.defaultOptions.previewTemplate.replace(/\n*/g, "");
+ this.clickableElements = [];
+ this.listeners = [];
+ this.files = [];
+ if (typeof this.element === "string") {
+ this.element = document.querySelector(this.element);
+ }
+ if (!(this.element && (this.element.nodeType != null))) {
+ throw new Error("Invalid dropzone element.");
+ }
+ if (this.element.dropzone) {
+ throw new Error("Dropzone already attached.");
+ }
+ Dropzone.instances.push(this);
+ this.element.dropzone = this;
+ elementOptions = (_ref = Dropzone.optionsForElement(this.element)) != null ? _ref : {};
+ this.options = extend({}, this.defaultOptions, elementOptions, options != null ? options : {});
+ if (this.options.forceFallback || !Dropzone.isBrowserSupported()) {
+ return this.options.fallback.call(this);
+ }
+ if (this.options.url == null) {
+ this.options.url = this.element.getAttribute("action");
+ }
+ if (!this.options.url) {
+ throw new Error("No URL provided.");
+ }
+ if (this.options.acceptedFiles && this.options.acceptedMimeTypes) {
+ throw new Error("You can't provide both 'acceptedFiles' and 'acceptedMimeTypes'. 'acceptedMimeTypes' is deprecated.");
+ }
+ if (this.options.acceptedMimeTypes) {
+ this.options.acceptedFiles = this.options.acceptedMimeTypes;
+ delete this.options.acceptedMimeTypes;
+ }
+ this.options.method = this.options.method.toUpperCase();
+ if ((fallback = this.getExistingFallback()) && fallback.parentNode) {
+ fallback.parentNode.removeChild(fallback);
+ }
+ if (this.options.previewsContainer !== false) {
+ if (this.options.previewsContainer) {
+ this.previewsContainer = Dropzone.getElement(this.options.previewsContainer, "previewsContainer");
+ } else {
+ this.previewsContainer = this.element;
+ }
+ }
+ if (this.options.clickable) {
+ if (this.options.clickable === true) {
+ this.clickableElements = [this.element];
+ } else {
+ this.clickableElements = Dropzone.getElements(this.options.clickable, "clickable");
+ }
+ }
+ this.init();
+ }
+
+ Dropzone.prototype.getAcceptedFiles = function() {
+ var file, _i, _len, _ref, _results;
+ _ref = this.files;
+ _results = [];
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ file = _ref[_i];
+ if (file.accepted) {
+ _results.push(file);
+ }
+ }
+ return _results;
+ };
+
+ Dropzone.prototype.getRejectedFiles = function() {
+ var file, _i, _len, _ref, _results;
+ _ref = this.files;
+ _results = [];
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ file = _ref[_i];
+ if (!file.accepted) {
+ _results.push(file);
+ }
+ }
+ return _results;
+ };
+
+ Dropzone.prototype.getFilesWithStatus = function(status) {
+ var file, _i, _len, _ref, _results;
+ _ref = this.files;
+ _results = [];
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ file = _ref[_i];
+ if (file.status === status) {
+ _results.push(file);
+ }
+ }
+ return _results;
+ };
+
+ Dropzone.prototype.getQueuedFiles = function() {
+ return this.getFilesWithStatus(Dropzone.QUEUED);
+ };
+
+ Dropzone.prototype.getUploadingFiles = function() {
+ return this.getFilesWithStatus(Dropzone.UPLOADING);
+ };
+
+ Dropzone.prototype.getAddedFiles = function() {
+ return this.getFilesWithStatus(Dropzone.ADDED);
+ };
+
+ Dropzone.prototype.getActiveFiles = function() {
+ var file, _i, _len, _ref, _results;
+ _ref = this.files;
+ _results = [];
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ file = _ref[_i];
+ if (file.status === Dropzone.UPLOADING || file.status === Dropzone.QUEUED) {
+ _results.push(file);
+ }
+ }
+ return _results;
+ };
+
+ Dropzone.prototype.init = function() {
+ var eventName, noPropagation, setupHiddenFileInput, _i, _len, _ref, _ref1;
+ if (this.element.tagName === "form") {
+ this.element.setAttribute("enctype", "multipart/form-data");
+ }
+ if (this.element.classList.contains("dropzone") && !this.element.querySelector(".dz-message")) {
+ this.element.appendChild(Dropzone.createElement("<div class=\"dz-default dz-message\"><span>" + this.options.dictDefaultMessage + "</span></div>"));
+ }
+ if (this.clickableElements.length) {
+ setupHiddenFileInput = (function(_this) {
+ return function() {
+ if (_this.hiddenFileInput) {
+ _this.hiddenFileInput.parentNode.removeChild(_this.hiddenFileInput);
+ }
+ _this.hiddenFileInput = document.createElement("input");
+ _this.hiddenFileInput.setAttribute("type", "file");
+ if ((_this.options.maxFiles == null) || _this.options.maxFiles > 1) {
+ _this.hiddenFileInput.setAttribute("multiple", "multiple");
+ }
+ _this.hiddenFileInput.className = "dz-hidden-input";
+ if (_this.options.acceptedFiles != null) {
+ _this.hiddenFileInput.setAttribute("accept", _this.options.acceptedFiles);
+ }
+ if (_this.options.capture != null) {
+ _this.hiddenFileInput.setAttribute("capture", _this.options.capture);
+ }
+ _this.hiddenFileInput.style.visibility = "hidden";
+ _this.hiddenFileInput.style.position = "absolute";
+ _this.hiddenFileInput.style.top = "0";
+ _this.hiddenFileInput.style.left = "0";
+ _this.hiddenFileInput.style.height = "0";
+ _this.hiddenFileInput.style.width = "0";
+ document.querySelector(_this.options.hiddenInputContainer).appendChild(_this.hiddenFileInput);
+ return _this.hiddenFileInput.addEventListener("change", function() {
+ var file, files, _i, _len;
+ files = _this.hiddenFileInput.files;
+ if (files.length) {
+ for (_i = 0, _len = files.length; _i < _len; _i++) {
+ file = files[_i];
+ _this.addFile(file);
+ }
+ }
+ _this.emit("addedfiles", files);
+ return setupHiddenFileInput();
+ });
+ };
+ })(this);
+ setupHiddenFileInput();
+ }
+ this.URL = (_ref = window.URL) != null ? _ref : window.webkitURL;
+ _ref1 = this.events;
+ for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
+ eventName = _ref1[_i];
+ this.on(eventName, this.options[eventName]);
+ }
+ this.on("uploadprogress", (function(_this) {
+ return function() {
+ return _this.updateTotalUploadProgress();
+ };
+ })(this));
+ this.on("removedfile", (function(_this) {
+ return function() {
+ return _this.updateTotalUploadProgress();
+ };
+ })(this));
+ this.on("canceled", (function(_this) {
+ return function(file) {
+ return _this.emit("complete", file);
+ };
+ })(this));
+ this.on("complete", (function(_this) {
+ return function(file) {
+ if (_this.getAddedFiles().length === 0 && _this.getUploadingFiles().length === 0 && _this.getQueuedFiles().length === 0) {
+ return setTimeout((function() {
+ return _this.emit("queuecomplete");
+ }), 0);
+ }
+ };
+ })(this));
+ noPropagation = function(e) {
+ e.stopPropagation();
+ if (e.preventDefault) {
+ return e.preventDefault();
+ } else {
+ return e.returnValue = false;
+ }
+ };
+ this.listeners = [
+ {
+ element: this.element,
+ events: {
+ "dragstart": (function(_this) {
+ return function(e) {
+ return _this.emit("dragstart", e);
+ };
+ })(this),
+ "dragenter": (function(_this) {
+ return function(e) {
+ noPropagation(e);
+ return _this.emit("dragenter", e);
+ };
+ })(this),
+ "dragover": (function(_this) {
+ return function(e) {
+ var efct;
+ try {
+ efct = e.dataTransfer.effectAllowed;
+ } catch (_error) {}
+ e.dataTransfer.dropEffect = 'move' === efct || 'linkMove' === efct ? 'move' : 'copy';
+ noPropagation(e);
+ return _this.emit("dragover", e);
+ };
+ })(this),
+ "dragleave": (function(_this) {
+ return function(e) {
+ return _this.emit("dragleave", e);
+ };
+ })(this),
+ "drop": (function(_this) {
+ return function(e) {
+ noPropagation(e);
+ return _this.drop(e);
+ };
+ })(this),
+ "dragend": (function(_this) {
+ return function(e) {
+ return _this.emit("dragend", e);
+ };
+ })(this)
+ }
+ }
+ ];
+ this.clickableElements.forEach((function(_this) {
+ return function(clickableElement) {
+ return _this.listeners.push({
+ element: clickableElement,
+ events: {
+ "click": function(evt) {
+ if ((clickableElement !== _this.element) || (evt.target === _this.element || Dropzone.elementInside(evt.target, _this.element.querySelector(".dz-message")))) {
+ _this.hiddenFileInput.click();
+ }
+ return true;
+ }
+ }
+ });
+ };
+ })(this));
+ this.enable();
+ return this.options.init.call(this);
+ };
+
+ Dropzone.prototype.destroy = function() {
+ var _ref;
+ this.disable();
+ this.removeAllFiles(true);
+ if ((_ref = this.hiddenFileInput) != null ? _ref.parentNode : void 0) {
+ this.hiddenFileInput.parentNode.removeChild(this.hiddenFileInput);
+ this.hiddenFileInput = null;
+ }
+ delete this.element.dropzone;
+ return Dropzone.instances.splice(Dropzone.instances.indexOf(this), 1);
+ };
+
+ Dropzone.prototype.updateTotalUploadProgress = function() {
+ var activeFiles, file, totalBytes, totalBytesSent, totalUploadProgress, _i, _len, _ref;
+ totalBytesSent = 0;
+ totalBytes = 0;
+ activeFiles = this.getActiveFiles();
+ if (activeFiles.length) {
+ _ref = this.getActiveFiles();
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ file = _ref[_i];
+ totalBytesSent += file.upload.bytesSent;
+ totalBytes += file.upload.total;
+ }
+ totalUploadProgress = 100 * totalBytesSent / totalBytes;
+ } else {
+ totalUploadProgress = 100;
+ }
+ return this.emit("totaluploadprogress", totalUploadProgress, totalBytes, totalBytesSent);
+ };
+
+ Dropzone.prototype._getParamName = function(n) {
+ if (typeof this.options.paramName === "function") {
+ return this.options.paramName(n);
+ } else {
+ return "" + this.options.paramName + (this.options.uploadMultiple ? "[" + n + "]" : "");
+ }
+ };
+
+ Dropzone.prototype._renameFilename = function(name) {
+ if (typeof this.options.renameFilename !== "function") {
+ return name;
+ }
+ return this.options.renameFilename(name);
+ };
+
+ Dropzone.prototype.getFallbackForm = function() {
+ var existingFallback, fields, fieldsString, form;
+ if (existingFallback = this.getExistingFallback()) {
+ return existingFallback;
+ }
+ fieldsString = "<div class=\"dz-fallback\">";
+ if (this.options.dictFallbackText) {
+ fieldsString += "<p>" + this.options.dictFallbackText + "</p>";
+ }
+ fieldsString += "<input type=\"file\" name=\"" + (this._getParamName(0)) + "\" " + (this.options.uploadMultiple ? 'multiple="multiple"' : void 0) + " /><input type=\"submit\" value=\"Upload!\"></div>";
+ fields = Dropzone.createElement(fieldsString);
+ if (this.element.tagName !== "FORM") {
+ form = Dropzone.createElement("<form action=\"" + this.options.url + "\" enctype=\"multipart/form-data\" method=\"" + this.options.method + "\"></form>");
+ form.appendChild(fields);
+ } else {
+ this.element.setAttribute("enctype", "multipart/form-data");
+ this.element.setAttribute("method", this.options.method);
+ }
+ return form != null ? form : fields;
+ };
+
+ Dropzone.prototype.getExistingFallback = function() {
+ var fallback, getFallback, tagName, _i, _len, _ref;
+ getFallback = function(elements) {
+ var el, _i, _len;
+ for (_i = 0, _len = elements.length; _i < _len; _i++) {
+ el = elements[_i];
+ if (/(^| )fallback($| )/.test(el.className)) {
+ return el;
+ }
+ }
+ };
+ _ref = ["div", "form"];
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ tagName = _ref[_i];
+ if (fallback = getFallback(this.element.getElementsByTagName(tagName))) {
+ return fallback;
+ }
+ }
+ };
+
+ Dropzone.prototype.setupEventListeners = function() {
+ var elementListeners, event, listener, _i, _len, _ref, _results;
+ _ref = this.listeners;
+ _results = [];
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ elementListeners = _ref[_i];
+ _results.push((function() {
+ var _ref1, _results1;
+ _ref1 = elementListeners.events;
+ _results1 = [];
+ for (event in _ref1) {
+ listener = _ref1[event];
+ _results1.push(elementListeners.element.addEventListener(event, listener, false));
+ }
+ return _results1;
+ })());
+ }
+ return _results;
+ };
+
+ Dropzone.prototype.removeEventListeners = function() {
+ var elementListeners, event, listener, _i, _len, _ref, _results;
+ _ref = this.listeners;
+ _results = [];
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ elementListeners = _ref[_i];
+ _results.push((function() {
+ var _ref1, _results1;
+ _ref1 = elementListeners.events;
+ _results1 = [];
+ for (event in _ref1) {
+ listener = _ref1[event];
+ _results1.push(elementListeners.element.removeEventListener(event, listener, false));
+ }
+ return _results1;
+ })());
+ }
+ return _results;
+ };
+
+ Dropzone.prototype.disable = function() {
+ var file, _i, _len, _ref, _results;
+ this.clickableElements.forEach(function(element) {
+ return element.classList.remove("dz-clickable");
+ });
+ this.removeEventListeners();
+ _ref = this.files;
+ _results = [];
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ file = _ref[_i];
+ _results.push(this.cancelUpload(file));
+ }
+ return _results;
+ };
+
+ Dropzone.prototype.enable = function() {
+ this.clickableElements.forEach(function(element) {
+ return element.classList.add("dz-clickable");
+ });
+ return this.setupEventListeners();
+ };
+
+ Dropzone.prototype.filesize = function(size) {
+ var cutoff, i, selectedSize, selectedUnit, unit, units, _i, _len;
+ selectedSize = 0;
+ selectedUnit = "b";
+ if (size > 0) {
+ units = ['TB', 'GB', 'MB', 'KB', 'b'];
+ for (i = _i = 0, _len = units.length; _i < _len; i = ++_i) {
+ unit = units[i];
+ cutoff = Math.pow(this.options.filesizeBase, 4 - i) / 10;
+ if (size >= cutoff) {
+ selectedSize = size / Math.pow(this.options.filesizeBase, 4 - i);
+ selectedUnit = unit;
+ break;
+ }
+ }
+ selectedSize = Math.round(10 * selectedSize) / 10;
+ }
+ return "<strong>" + selectedSize + "</strong> " + selectedUnit;
+ };
+
+ Dropzone.prototype._updateMaxFilesReachedClass = function() {
+ if ((this.options.maxFiles != null) && this.getAcceptedFiles().length >= this.options.maxFiles) {
+ if (this.getAcceptedFiles().length === this.options.maxFiles) {
+ this.emit('maxfilesreached', this.files);
+ }
+ return this.element.classList.add("dz-max-files-reached");
+ } else {
+ return this.element.classList.remove("dz-max-files-reached");
+ }
+ };
+
+ Dropzone.prototype.drop = function(e) {
+ var files, items;
+ if (!e.dataTransfer) {
+ return;
+ }
+ this.emit("drop", e);
+ files = e.dataTransfer.files;
+ this.emit("addedfiles", files);
+ if (files.length) {
+ items = e.dataTransfer.items;
+ if (items && items.length && (items[0].webkitGetAsEntry != null)) {
+ this._addFilesFromItems(items);
+ } else {
+ this.handleFiles(files);
+ }
+ }
+ };
+
+ Dropzone.prototype.paste = function(e) {
+ var items, _ref;
+ if ((e != null ? (_ref = e.clipboardData) != null ? _ref.items : void 0 : void 0) == null) {
+ return;
+ }
+ this.emit("paste", e);
+ items = e.clipboardData.items;
+ if (items.length) {
+ return this._addFilesFromItems(items);
+ }
+ };
+
+ Dropzone.prototype.handleFiles = function(files) {
+ var file, _i, _len, _results;
+ _results = [];
+ for (_i = 0, _len = files.length; _i < _len; _i++) {
+ file = files[_i];
+ _results.push(this.addFile(file));
+ }
+ return _results;
+ };
+
+ Dropzone.prototype._addFilesFromItems = function(items) {
+ var entry, item, _i, _len, _results;
+ _results = [];
+ for (_i = 0, _len = items.length; _i < _len; _i++) {
+ item = items[_i];
+ if ((item.webkitGetAsEntry != null) && (entry = item.webkitGetAsEntry())) {
+ if (entry.isFile) {
+ _results.push(this.addFile(item.getAsFile()));
+ } else if (entry.isDirectory) {
+ _results.push(this._addFilesFromDirectory(entry, entry.name));
+ } else {
+ _results.push(void 0);
+ }
+ } else if (item.getAsFile != null) {
+ if ((item.kind == null) || item.kind === "file") {
+ _results.push(this.addFile(item.getAsFile()));
+ } else {
+ _results.push(void 0);
+ }
+ } else {
+ _results.push(void 0);
+ }
+ }
+ return _results;
+ };
+
+ Dropzone.prototype._addFilesFromDirectory = function(directory, path) {
+ var dirReader, errorHandler, readEntries;
+ dirReader = directory.createReader();
+ errorHandler = function(error) {
+ return typeof console !== "undefined" && console !== null ? typeof console.log === "function" ? console.log(error) : void 0 : void 0;
+ };
+ readEntries = (function(_this) {
+ return function() {
+ return dirReader.readEntries(function(entries) {
+ var entry, _i, _len;
+ if (entries.length > 0) {
+ for (_i = 0, _len = entries.length; _i < _len; _i++) {
+ entry = entries[_i];
+ if (entry.isFile) {
+ entry.file(function(file) {
+ if (_this.options.ignoreHiddenFiles && file.name.substring(0, 1) === '.') {
+ return;
+ }
+ file.fullPath = "" + path + "/" + file.name;
+ return _this.addFile(file);
+ });
+ } else if (entry.isDirectory) {
+ _this._addFilesFromDirectory(entry, "" + path + "/" + entry.name);
+ }
+ }
+ readEntries();
+ }
+ return null;
+ }, errorHandler);
+ };
+ })(this);
+ return readEntries();
+ };
+
+ Dropzone.prototype.accept = function(file, done) {
+ if (file.size > this.options.maxFilesize * 1024 * 1024) {
+ return done(this.options.dictFileTooBig.replace("{{filesize}}", Math.round(file.size / 1024 / 10.24) / 100).replace("{{maxFilesize}}", this.options.maxFilesize));
+ } else if (!Dropzone.isValidFile(file, this.options.acceptedFiles)) {
+ return done(this.options.dictInvalidFileType);
+ } else if ((this.options.maxFiles != null) && this.getAcceptedFiles().length >= this.options.maxFiles) {
+ done(this.options.dictMaxFilesExceeded.replace("{{maxFiles}}", this.options.maxFiles));
+ return this.emit("maxfilesexceeded", file);
+ } else {
+ return this.options.accept.call(this, file, done);
+ }
+ };
+
+ Dropzone.prototype.addFile = function(file) {
+ file.upload = {
+ progress: 0,
+ total: file.size,
+ bytesSent: 0
+ };
+ this.files.push(file);
+ file.status = Dropzone.ADDED;
+ this.emit("addedfile", file);
+ this._enqueueThumbnail(file);
+ return this.accept(file, (function(_this) {
+ return function(error) {
+ if (error) {
+ file.accepted = false;
+ _this._errorProcessing([file], error);
+ } else {
+ file.accepted = true;
+ if (_this.options.autoQueue) {
+ _this.enqueueFile(file);
+ }
+ }
+ return _this._updateMaxFilesReachedClass();
+ };
+ })(this));
+ };
+
+ Dropzone.prototype.enqueueFiles = function(files) {
+ var file, _i, _len;
+ for (_i = 0, _len = files.length; _i < _len; _i++) {
+ file = files[_i];
+ this.enqueueFile(file);
+ }
+ return null;
+ };
+
+ Dropzone.prototype.enqueueFile = function(file) {
+ if (file.status === Dropzone.ADDED && file.accepted === true) {
+ file.status = Dropzone.QUEUED;
+ if (this.options.autoProcessQueue) {
+ return setTimeout(((function(_this) {
+ return function() {
+ return _this.processQueue();
+ };
+ })(this)), 0);
+ }
+ } else {
+ throw new Error("This file can't be queued because it has already been processed or was rejected.");
+ }
+ };
+
+ Dropzone.prototype._thumbnailQueue = [];
+
+ Dropzone.prototype._processingThumbnail = false;
+
+ Dropzone.prototype._enqueueThumbnail = function(file) {
+ if (this.options.createImageThumbnails && file.type.match(/image.*/) && file.size <= this.options.maxThumbnailFilesize * 1024 * 1024) {
+ this._thumbnailQueue.push(file);
+ return setTimeout(((function(_this) {
+ return function() {
+ return _this._processThumbnailQueue();
+ };
+ })(this)), 0);
+ }
+ };
+
+ Dropzone.prototype._processThumbnailQueue = function() {
+ if (this._processingThumbnail || this._thumbnailQueue.length === 0) {
+ return;
+ }
+ this._processingThumbnail = true;
+ return this.createThumbnail(this._thumbnailQueue.shift(), (function(_this) {
+ return function() {
+ _this._processingThumbnail = false;
+ return _this._processThumbnailQueue();
+ };
+ })(this));
+ };
+
+ Dropzone.prototype.removeFile = function(file) {
+ if (file.status === Dropzone.UPLOADING) {
+ this.cancelUpload(file);
+ }
+ this.files = without(this.files, file);
+ this.emit("removedfile", file);
+ if (this.files.length === 0) {
+ return this.emit("reset");
+ }
+ };
+
+ Dropzone.prototype.removeAllFiles = function(cancelIfNecessary) {
+ var file, _i, _len, _ref;
+ if (cancelIfNecessary == null) {
+ cancelIfNecessary = false;
+ }
+ _ref = this.files.slice();
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ file = _ref[_i];
+ if (file.status !== Dropzone.UPLOADING || cancelIfNecessary) {
+ this.removeFile(file);
+ }
+ }
+ return null;
+ };
+
+ Dropzone.prototype.createThumbnail = function(file, callback) {
+ var fileReader;
+ fileReader = new FileReader;
+ fileReader.onload = (function(_this) {
+ return function() {
+ if (file.type === "image/svg+xml") {
+ _this.emit("thumbnail", file, fileReader.result);
+ if (callback != null) {
+ callback();
+ }
+ return;
+ }
+ return _this.createThumbnailFromUrl(file, fileReader.result, callback);
+ };
+ })(this);
+ return fileReader.readAsDataURL(file);
+ };
+
+ Dropzone.prototype.createThumbnailFromUrl = function(file, imageUrl, callback, crossOrigin) {
+ var img;
+ img = document.createElement("img");
+ if (crossOrigin) {
+ img.crossOrigin = crossOrigin;
+ }
+ img.onload = (function(_this) {
+ return function() {
+ var canvas, ctx, resizeInfo, thumbnail, _ref, _ref1, _ref2, _ref3;
+ file.width = img.width;
+ file.height = img.height;
+ resizeInfo = _this.options.resize.call(_this, file);
+ if (resizeInfo.trgWidth == null) {
+ resizeInfo.trgWidth = resizeInfo.optWidth;
+ }
+ if (resizeInfo.trgHeight == null) {
+ resizeInfo.trgHeight = resizeInfo.optHeight;
+ }
+ canvas = document.createElement("canvas");
+ ctx = canvas.getContext("2d");
+ canvas.width = resizeInfo.trgWidth;
+ canvas.height = resizeInfo.trgHeight;
+ drawImageIOSFix(ctx, img, (_ref = resizeInfo.srcX) != null ? _ref : 0, (_ref1 = resizeInfo.srcY) != null ? _ref1 : 0, resizeInfo.srcWidth, resizeInfo.srcHeight, (_ref2 = resizeInfo.trgX) != null ? _ref2 : 0, (_ref3 = resizeInfo.trgY) != null ? _ref3 : 0, resizeInfo.trgWidth, resizeInfo.trgHeight);
+ thumbnail = canvas.toDataURL("image/png");
+ _this.emit("thumbnail", file, thumbnail);
+ if (callback != null) {
+ return callback();
+ }
+ };
+ })(this);
+ if (callback != null) {
+ img.onerror = callback;
+ }
+ return img.src = imageUrl;
+ };
+
+ Dropzone.prototype.processQueue = function() {
+ var i, parallelUploads, processingLength, queuedFiles;
+ parallelUploads = this.options.parallelUploads;
+ processingLength = this.getUploadingFiles().length;
+ i = processingLength;
+ if (processingLength >= parallelUploads) {
+ return;
+ }
+ queuedFiles = this.getQueuedFiles();
+ if (!(queuedFiles.length > 0)) {
+ return;
+ }
+ if (this.options.uploadMultiple) {
+ return this.processFiles(queuedFiles.slice(0, parallelUploads - processingLength));
+ } else {
+ while (i < parallelUploads) {
+ if (!queuedFiles.length) {
+ return;
+ }
+ this.processFile(queuedFiles.shift());
+ i++;
+ }
+ }
+ };
+
+ Dropzone.prototype.processFile = function(file) {
+ return this.processFiles([file]);
+ };
+
+ Dropzone.prototype.processFiles = function(files) {
+ var file, _i, _len;
+ for (_i = 0, _len = files.length; _i < _len; _i++) {
+ file = files[_i];
+ file.processing = true;
+ file.status = Dropzone.UPLOADING;
+ this.emit("processing", file);
+ }
+ if (this.options.uploadMultiple) {
+ this.emit("processingmultiple", files);
+ }
+ return this.uploadFiles(files);
+ };
+
+ Dropzone.prototype._getFilesWithXhr = function(xhr) {
+ var file, files;
+ return files = (function() {
+ var _i, _len, _ref, _results;
+ _ref = this.files;
+ _results = [];
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ file = _ref[_i];
+ if (file.xhr === xhr) {
+ _results.push(file);
+ }
+ }
+ return _results;
+ }).call(this);
+ };
+
+ Dropzone.prototype.cancelUpload = function(file) {
+ var groupedFile, groupedFiles, _i, _j, _len, _len1, _ref;
+ if (file.status === Dropzone.UPLOADING) {
+ groupedFiles = this._getFilesWithXhr(file.xhr);
+ for (_i = 0, _len = groupedFiles.length; _i < _len; _i++) {
+ groupedFile = groupedFiles[_i];
+ groupedFile.status = Dropzone.CANCELED;
+ }
+ file.xhr.abort();
+ for (_j = 0, _len1 = groupedFiles.length; _j < _len1; _j++) {
+ groupedFile = groupedFiles[_j];
+ this.emit("canceled", groupedFile);
+ }
+ if (this.options.uploadMultiple) {
+ this.emit("canceledmultiple", groupedFiles);
+ }
+ } else if ((_ref = file.status) === Dropzone.ADDED || _ref === Dropzone.QUEUED) {
+ file.status = Dropzone.CANCELED;
+ this.emit("canceled", file);
+ if (this.options.uploadMultiple) {
+ this.emit("canceledmultiple", [file]);
+ }
+ }
+ if (this.options.autoProcessQueue) {
+ return this.processQueue();
+ }
+ };
+
+ resolveOption = function() {
+ var args, option;
+ option = arguments[0], args = 2 <= arguments.length ? __slice.call(arguments, 1) : [];
+ if (typeof option === 'function') {
+ return option.apply(this, args);
+ }
+ return option;
+ };
+
+ Dropzone.prototype.uploadFile = function(file) {
+ return this.uploadFiles([file]);
+ };
+
+ Dropzone.prototype.uploadFiles = function(files) {
+ var file, formData, handleError, headerName, headerValue, headers, i, input, inputName, inputType, key, method, option, progressObj, response, updateProgress, url, value, xhr, _i, _j, _k, _l, _len, _len1, _len2, _len3, _m, _ref, _ref1, _ref2, _ref3, _ref4, _ref5;
+ xhr = new XMLHttpRequest();
+ for (_i = 0, _len = files.length; _i < _len; _i++) {
+ file = files[_i];
+ file.xhr = xhr;
+ }
+ method = resolveOption(this.options.method, files);
+ url = resolveOption(this.options.url, files);
+ xhr.open(method, url, true);
+ xhr.withCredentials = !!this.options.withCredentials;
+ response = null;
+ handleError = (function(_this) {
+ return function() {
+ var _j, _len1, _results;
+ _results = [];
+ for (_j = 0, _len1 = files.length; _j < _len1; _j++) {
+ file = files[_j];
+ _results.push(_this._errorProcessing(files, response || _this.options.dictResponseError.replace("{{statusCode}}", xhr.status), xhr));
+ }
+ return _results;
+ };
+ })(this);
+ updateProgress = (function(_this) {
+ return function(e) {
+ var allFilesFinished, progress, _j, _k, _l, _len1, _len2, _len3, _results;
+ if (e != null) {
+ progress = 100 * e.loaded / e.total;
+ for (_j = 0, _len1 = files.length; _j < _len1; _j++) {
+ file = files[_j];
+ file.upload = {
+ progress: progress,
+ total: e.total,
+ bytesSent: e.loaded
+ };
+ }
+ } else {
+ allFilesFinished = true;
+ progress = 100;
+ for (_k = 0, _len2 = files.length; _k < _len2; _k++) {
+ file = files[_k];
+ if (!(file.upload.progress === 100 && file.upload.bytesSent === file.upload.total)) {
+ allFilesFinished = false;
+ }
+ file.upload.progress = progress;
+ file.upload.bytesSent = file.upload.total;
+ }
+ if (allFilesFinished) {
+ return;
+ }
+ }
+ _results = [];
+ for (_l = 0, _len3 = files.length; _l < _len3; _l++) {
+ file = files[_l];
+ _results.push(_this.emit("uploadprogress", file, progress, file.upload.bytesSent));
+ }
+ return _results;
+ };
+ })(this);
+ xhr.onload = (function(_this) {
+ return function(e) {
+ var _ref;
+ if (files[0].status === Dropzone.CANCELED) {
+ return;
+ }
+ if (xhr.readyState !== 4) {
+ return;
+ }
+ response = xhr.responseText;
+ if (xhr.getResponseHeader("content-type") && ~xhr.getResponseHeader("content-type").indexOf("application/json")) {
+ try {
+ response = JSON.parse(response);
+ } catch (_error) {
+ e = _error;
+ response = "Invalid JSON response from server.";
+ }
+ }
+ updateProgress();
+ if (!((200 <= (_ref = xhr.status) && _ref < 300))) {
+ return handleError();
+ } else {
+ return _this._finished(files, response, e);
+ }
+ };
+ })(this);
+ xhr.onerror = (function(_this) {
+ return function() {
+ if (files[0].status === Dropzone.CANCELED) {
+ return;
+ }
+ return handleError();
+ };
+ })(this);
+ progressObj = (_ref = xhr.upload) != null ? _ref : xhr;
+ progressObj.onprogress = updateProgress;
+ headers = {
+ "Accept": "application/json",
+ "Cache-Control": "no-cache",
+ "X-Requested-With": "XMLHttpRequest"
+ };
+ if (this.options.headers) {
+ extend(headers, this.options.headers);
+ }
+ for (headerName in headers) {
+ headerValue = headers[headerName];
+ if (headerValue) {
+ xhr.setRequestHeader(headerName, headerValue);
+ }
+ }
+ formData = new FormData();
+ if (this.options.params) {
+ _ref1 = this.options.params;
+ for (key in _ref1) {
+ value = _ref1[key];
+ formData.append(key, value);
+ }
+ }
+ for (_j = 0, _len1 = files.length; _j < _len1; _j++) {
+ file = files[_j];
+ this.emit("sending", file, xhr, formData);
+ }
+ if (this.options.uploadMultiple) {
+ this.emit("sendingmultiple", files, xhr, formData);
+ }
+ if (this.element.tagName === "FORM") {
+ _ref2 = this.element.querySelectorAll("input, textarea, select, button");
+ for (_k = 0, _len2 = _ref2.length; _k < _len2; _k++) {
+ input = _ref2[_k];
+ inputName = input.getAttribute("name");
+ inputType = input.getAttribute("type");
+ if (input.tagName === "SELECT" && input.hasAttribute("multiple")) {
+ _ref3 = input.options;
+ for (_l = 0, _len3 = _ref3.length; _l < _len3; _l++) {
+ option = _ref3[_l];
+ if (option.selected) {
+ formData.append(inputName, option.value);
+ }
+ }
+ } else if (!inputType || ((_ref4 = inputType.toLowerCase()) !== "checkbox" && _ref4 !== "radio") || input.checked) {
+ formData.append(inputName, input.value);
+ }
+ }
+ }
+ for (i = _m = 0, _ref5 = files.length - 1; 0 <= _ref5 ? _m <= _ref5 : _m >= _ref5; i = 0 <= _ref5 ? ++_m : --_m) {
+ formData.append(this._getParamName(i), files[i], this._renameFilename(files[i].name));
+ }
+ return this.submitRequest(xhr, formData, files);
+ };
+
+ Dropzone.prototype.submitRequest = function(xhr, formData, files) {
+ return xhr.send(formData);
+ };
+
+ Dropzone.prototype._finished = function(files, responseText, e) {
+ var file, _i, _len;
+ for (_i = 0, _len = files.length; _i < _len; _i++) {
+ file = files[_i];
+ file.status = Dropzone.SUCCESS;
+ this.emit("success", file, responseText, e);
+ this.emit("complete", file);
+ }
+ if (this.options.uploadMultiple) {
+ this.emit("successmultiple", files, responseText, e);
+ this.emit("completemultiple", files);
+ }
+ if (this.options.autoProcessQueue) {
+ return this.processQueue();
+ }
+ };
+
+ Dropzone.prototype._errorProcessing = function(files, message, xhr) {
+ var file, _i, _len;
+ for (_i = 0, _len = files.length; _i < _len; _i++) {
+ file = files[_i];
+ file.status = Dropzone.ERROR;
+ this.emit("error", file, message, xhr);
+ this.emit("complete", file);
+ }
+ if (this.options.uploadMultiple) {
+ this.emit("errormultiple", files, message, xhr);
+ this.emit("completemultiple", files);
+ }
+ if (this.options.autoProcessQueue) {
+ return this.processQueue();
+ }
+ };
+
+ return Dropzone;
+
+ })(Emitter);
+
+ Dropzone.version = "4.3.0";
+
+ Dropzone.options = {};
+
+ Dropzone.optionsForElement = function(element) {
+ if (element.getAttribute("id")) {
+ return Dropzone.options[camelize(element.getAttribute("id"))];
+ } else {
+ return void 0;
+ }
+ };
+
+ Dropzone.instances = [];
+
+ Dropzone.forElement = function(element) {
+ if (typeof element === "string") {
+ element = document.querySelector(element);
+ }
+ if ((element != null ? element.dropzone : void 0) == null) {
+ throw new Error("No Dropzone found for given element. This is probably because you're trying to access it before Dropzone had the time to initialize. Use the `init` option to setup any additional observers on your Dropzone.");
+ }
+ return element.dropzone;
+ };
+
+ Dropzone.autoDiscover = true;
+
+ Dropzone.discover = function() {
+ var checkElements, dropzone, dropzones, _i, _len, _results;
+ if (document.querySelectorAll) {
+ dropzones = document.querySelectorAll(".dropzone");
+ } else {
+ dropzones = [];
+ checkElements = function(elements) {
+ var el, _i, _len, _results;
+ _results = [];
+ for (_i = 0, _len = elements.length; _i < _len; _i++) {
+ el = elements[_i];
+ if (/(^| )dropzone($| )/.test(el.className)) {
+ _results.push(dropzones.push(el));
+ } else {
+ _results.push(void 0);
+ }
+ }
+ return _results;
+ };
+ checkElements(document.getElementsByTagName("div"));
+ checkElements(document.getElementsByTagName("form"));
+ }
+ _results = [];
+ for (_i = 0, _len = dropzones.length; _i < _len; _i++) {
+ dropzone = dropzones[_i];
+ if (Dropzone.optionsForElement(dropzone) !== false) {
+ _results.push(new Dropzone(dropzone));
+ } else {
+ _results.push(void 0);
+ }
+ }
+ return _results;
+ };
+
+ Dropzone.blacklistedBrowsers = [/opera.*Macintosh.*version\/12/i];
+
+ Dropzone.isBrowserSupported = function() {
+ var capableBrowser, regex, _i, _len, _ref;
+ capableBrowser = true;
+ if (window.File && window.FileReader && window.FileList && window.Blob && window.FormData && document.querySelector) {
+ if (!("classList" in document.createElement("a"))) {
+ capableBrowser = false;
+ } else {
+ _ref = Dropzone.blacklistedBrowsers;
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ regex = _ref[_i];
+ if (regex.test(navigator.userAgent)) {
+ capableBrowser = false;
+ continue;
+ }
+ }
+ }
+ } else {
+ capableBrowser = false;
+ }
+ return capableBrowser;
+ };
+
+ without = function(list, rejectedItem) {
+ var item, _i, _len, _results;
+ _results = [];
+ for (_i = 0, _len = list.length; _i < _len; _i++) {
+ item = list[_i];
+ if (item !== rejectedItem) {
+ _results.push(item);
+ }
+ }
+ return _results;
+ };
+
+ camelize = function(str) {
+ return str.replace(/[\-_](\w)/g, function(match) {
+ return match.charAt(1).toUpperCase();
+ });
+ };
+
+ Dropzone.createElement = function(string) {
+ var div;
+ div = document.createElement("div");
+ div.innerHTML = string;
+ return div.childNodes[0];
+ };
+
+ Dropzone.elementInside = function(element, container) {
+ if (element === container) {
+ return true;
+ }
+ while (element = element.parentNode) {
+ if (element === container) {
+ return true;
+ }
+ }
+ return false;
+ };
+
+ Dropzone.getElement = function(el, name) {
+ var element;
+ if (typeof el === "string") {
+ element = document.querySelector(el);
+ } else if (el.nodeType != null) {
+ element = el;
+ }
+ if (element == null) {
+ throw new Error("Invalid `" + name + "` option provided. Please provide a CSS selector or a plain HTML element.");
+ }
+ return element;
+ };
+
+ Dropzone.getElements = function(els, name) {
+ var e, el, elements, _i, _j, _len, _len1, _ref;
+ if (els instanceof Array) {
+ elements = [];
+ try {
+ for (_i = 0, _len = els.length; _i < _len; _i++) {
+ el = els[_i];
+ elements.push(this.getElement(el, name));
+ }
+ } catch (_error) {
+ e = _error;
+ elements = null;
+ }
+ } else if (typeof els === "string") {
+ elements = [];
+ _ref = document.querySelectorAll(els);
+ for (_j = 0, _len1 = _ref.length; _j < _len1; _j++) {
+ el = _ref[_j];
+ elements.push(el);
+ }
+ } else if (els.nodeType != null) {
+ elements = [els];
+ }
+ if (!((elements != null) && elements.length)) {
+ throw new Error("Invalid `" + name + "` option provided. Please provide a CSS selector, a plain HTML element or a list of those.");
+ }
+ return elements;
+ };
+
+ Dropzone.confirm = function(question, accepted, rejected) {
+ if (window.confirm(question)) {
+ return accepted();
+ } else if (rejected != null) {
+ return rejected();
+ }
+ };
+
+ Dropzone.isValidFile = function(file, acceptedFiles) {
+ var baseMimeType, mimeType, validType, _i, _len;
+ if (!acceptedFiles) {
+ return true;
+ }
+ acceptedFiles = acceptedFiles.split(",");
+ mimeType = file.type;
+ baseMimeType = mimeType.replace(/\/.*$/, "");
+ for (_i = 0, _len = acceptedFiles.length; _i < _len; _i++) {
+ validType = acceptedFiles[_i];
+ validType = validType.trim();
+ if (validType.charAt(0) === ".") {
+ if (file.name.toLowerCase().indexOf(validType.toLowerCase(), file.name.length - validType.length) !== -1) {
+ return true;
+ }
+ } else if (/\/\*$/.test(validType)) {
+ if (baseMimeType === validType.replace(/\/.*$/, "")) {
+ return true;
+ }
+ } else {
+ if (mimeType === validType) {
+ return true;
+ }
+ }
+ }
+ return false;
+ };
+
+ if (typeof jQuery !== "undefined" && jQuery !== null) {
+ jQuery.fn.dropzone = function(options) {
+ return this.each(function() {
+ return new Dropzone(this, options);
+ });
+ };
+ }
+
+ if (typeof module !== "undefined" && module !== null) {
+ module.exports = Dropzone;
+ } else {
+ window.Dropzone = Dropzone;
+ }
+
+ Dropzone.ADDED = "added";
+
+ Dropzone.QUEUED = "queued";
+
+ Dropzone.ACCEPTED = Dropzone.QUEUED;
+
+ Dropzone.UPLOADING = "uploading";
+
+ Dropzone.PROCESSING = Dropzone.UPLOADING;
+
+ Dropzone.CANCELED = "canceled";
+
+ Dropzone.ERROR = "error";
+
+ Dropzone.SUCCESS = "success";
+
+
+ /*
+
+ Bugfix for iOS 6 and 7
+ Source: http://stackoverflow.com/questions/11929099/html5-canvas-drawimage-ratio-bug-ios
+ based on the work of https://github.com/stomita/ios-imagefile-megapixel
+ */
+
+ detectVerticalSquash = function(img) {
+ var alpha, canvas, ctx, data, ey, ih, iw, py, ratio, sy;
+ iw = img.naturalWidth;
+ ih = img.naturalHeight;
+ canvas = document.createElement("canvas");
+ canvas.width = 1;
+ canvas.height = ih;
+ ctx = canvas.getContext("2d");
+ ctx.drawImage(img, 0, 0);
+ data = ctx.getImageData(0, 0, 1, ih).data;
+ sy = 0;
+ ey = ih;
+ py = ih;
+ while (py > sy) {
+ alpha = data[(py - 1) * 4 + 3];
+ if (alpha === 0) {
+ ey = py;
+ } else {
+ sy = py;
+ }
+ py = (ey + sy) >> 1;
+ }
+ ratio = py / ih;
+ if (ratio === 0) {
+ return 1;
+ } else {
+ return ratio;
+ }
+ };
+
+ drawImageIOSFix = function(ctx, img, sx, sy, sw, sh, dx, dy, dw, dh) {
+ var vertSquashRatio;
+ vertSquashRatio = detectVerticalSquash(img);
+ return ctx.drawImage(img, sx, sy, sw, sh, dx, dy, dw, dh / vertSquashRatio);
+ };
+
+
+ /*
+ * contentloaded.js
+ *
+ * Author: Diego Perini (diego.perini at gmail.com)
+ * Summary: cross-browser wrapper for DOMContentLoaded
+ * Updated: 20101020
+ * License: MIT
+ * Version: 1.2
+ *
+ * URL:
+ * http://javascript.nwbox.com/ContentLoaded/
+ * http://javascript.nwbox.com/ContentLoaded/MIT-LICENSE
+ */
+
+ contentLoaded = function(win, fn) {
+ var add, doc, done, init, poll, pre, rem, root, top;
+ done = false;
+ top = true;
+ doc = win.document;
+ root = doc.documentElement;
+ add = (doc.addEventListener ? "addEventListener" : "attachEvent");
+ rem = (doc.addEventListener ? "removeEventListener" : "detachEvent");
+ pre = (doc.addEventListener ? "" : "on");
+ init = function(e) {
+ if (e.type === "readystatechange" && doc.readyState !== "complete") {
+ return;
+ }
+ (e.type === "load" ? win : doc)[rem](pre + e.type, init, false);
+ if (!done && (done = true)) {
+ return fn.call(win, e.type || e);
+ }
+ };
+ poll = function() {
+ var e;
+ try {
+ root.doScroll("left");
+ } catch (_error) {
+ e = _error;
+ setTimeout(poll, 50);
+ return;
+ }
+ return init("poll");
+ };
+ if (doc.readyState !== "complete") {
+ if (doc.createEventObject && root.doScroll) {
+ try {
+ top = !win.frameElement;
+ } catch (_error) {}
+ if (top) {
+ poll();
+ }
+ }
+ doc[add](pre + "DOMContentLoaded", init, false);
+ doc[add](pre + "readystatechange", init, false);
+ return win[add](pre + "load", init, false);
+ }
+ };
+
+ Dropzone._autoDiscoverFunction = function() {
+ if (Dropzone.autoDiscover) {
+ return Dropzone.discover();
+ }
+ };
+
+ contentLoaded(window, Dropzone._autoDiscoverFunction);
+
+}).call(this);
diff --git a/web/src/main/java/com/gitplex/server/web/component/DepotPicker.java b/web/src/main/java/com/gitplex/server/web/component/DepotPicker.java
index e5bfb60501..28780f2703 100644
--- a/web/src/main/java/com/gitplex/server/web/component/DepotPicker.java
+++ b/web/src/main/java/com/gitplex/server/web/component/DepotPicker.java
@@ -33,7 +33,7 @@ public abstract class DepotPicker extends DropdownLink {
@Override
protected void onSelect(AjaxRequestTarget target, Depot depot) {
- close();
+ closeDropdown();
target.add(DepotPicker.this);
DepotPicker.this.onSelect(target, depot);
}
diff --git a/web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchPicker.java b/web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchPicker.java
index 296cf0daef..3a09f0fd09 100644
--- a/web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchPicker.java
+++ b/web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchPicker.java
@@ -29,7 +29,7 @@ public abstract class BranchPicker extends DropdownLink {
@Override
protected void onSelect(AjaxRequestTarget target, String branch) {
- close();
+ closeDropdown();
BranchPicker.this.branch = branch;
target.add(BranchPicker.this);
diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/DepotAttachmentSupport.java b/web/src/main/java/com/gitplex/server/web/component/comment/DepotAttachmentSupport.java
index 0fdeae080a..f4f5ed8801 100644
--- a/web/src/main/java/com/gitplex/server/web/component/comment/DepotAttachmentSupport.java
+++ b/web/src/main/java/com/gitplex/server/web/component/comment/DepotAttachmentSupport.java
@@ -28,7 +28,7 @@ public class DepotAttachmentSupport implements AttachmentSupport {
private static final long serialVersionUID = 1L;
- private static final int MAX_FILE_SIZE = 50*1024*1024; // mega bytes
+ private static final int MAX_FILE_SIZE = 20*1024*1024; // mega bytes
private static final int BUFFER_SIZE = 1024*64;
diff --git a/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteModal.java b/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteModal.java
index 5b2478de1c..564d00003c 100644
--- a/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteModal.java
+++ b/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteModal.java
@@ -18,13 +18,13 @@ public abstract class ConfirmDeleteModal extends ModalPanel {
@Override
protected void onDelete(AjaxRequestTarget target) {
- close(target);
+ close();
doDelete(target);
}
@Override
protected void onCancel(AjaxRequestTarget target) {
- close(target);
+ close();
}
@Override
diff --git a/web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchLink.java b/web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchLink.java
index 9eb1c015a3..9eed77ace9 100644
--- a/web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchLink.java
+++ b/web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchLink.java
@@ -38,13 +38,13 @@ public abstract class CreateBranchLink extends ModalLink {
@Override
protected void onCreate(AjaxRequestTarget target, String branch) {
- close(target);
+ closeModal();
CreateBranchLink.this.onCreate(target, branch);
}
@Override
protected void onCancel(AjaxRequestTarget target) {
- close(target);
+ closeModal();
}
};
diff --git a/web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagLink.java b/web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagLink.java
index 4a0dadc729..7d7638c66c 100644
--- a/web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagLink.java
+++ b/web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagLink.java
@@ -39,13 +39,13 @@ public abstract class CreateTagLink extends ModalLink {
@Override
protected void onCreate(AjaxRequestTarget target, String tag) {
- close(target);
+ closeModal();
CreateTagLink.this.onCreate(target, tag);
}
@Override
protected void onCancel(AjaxRequestTarget target) {
- close(target);
+ closeModal();
}
};
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java b/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java
index c8306064ca..a4856e9e1b 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java
@@ -490,7 +490,7 @@ public class RevisionDiffPanel extends Panel {
@Override
public void onClick(AjaxRequestTarget target) {
- close();
+ closeDropdown();
whitespaceOptionModel.setObject(each);
target.add(body);
}
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/revision/revision-diff.css b/web/src/main/java/com/gitplex/server/web/component/diff/revision/revision-diff.css
index e41d80436a..b3060522d6 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/revision/revision-diff.css
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/revision/revision-diff.css
@@ -143,5 +143,5 @@
}
.revision-diff .comment textarea {
- max-height: 250px;
+ max-height: 360px;
}
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/component/dropzonefield/DropzoneField.html b/web/src/main/java/com/gitplex/server/web/component/dropzonefield/DropzoneField.html
new file mode 100644
index 0000000000..21dd9a7a0e
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/component/dropzonefield/DropzoneField.html
@@ -0,0 +1,3 @@
+<wicket:panel>
+ <div class="dropzone dropzone-field"></div>
+</wicket:panel>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/component/dropzonefield/DropzoneField.java b/web/src/main/java/com/gitplex/server/web/component/dropzonefield/DropzoneField.java
new file mode 100644
index 0000000000..86b89a8bbc
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/component/dropzonefield/DropzoneField.java
@@ -0,0 +1,117 @@
+package com.gitplex.server.web.component.dropzonefield;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.FileUploadException;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.ajax.attributes.CallbackParameter;
+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.html.form.FormComponentPanel;
+import org.apache.wicket.markup.html.form.upload.FileUpload;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.protocol.http.servlet.MultipartServletWebRequest;
+import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
+import org.apache.wicket.request.IRequestParameters;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.util.lang.Bytes;
+
+import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;
+
+@SuppressWarnings("serial")
+public class DropzoneField extends FormComponentPanel<Collection<FileUpload>> {
+
+ private final int maxFilesize;
+
+ private AbstractPostAjaxBehavior uploadBehavior;
+
+ private AbstractPostAjaxBehavior deleteBehavior;
+
+ private List<FileItem> fileItems = new ArrayList<>();
+
+ public DropzoneField(String id, IModel<Collection<FileUpload>> model, int maxFilesize) {
+ super(id, model);
+ this.maxFilesize = maxFilesize;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(uploadBehavior = new AbstractPostAjaxBehavior() {
+
+ @Override
+ protected void respond(AjaxRequestTarget target) {
+ try {
+ ServletWebRequest webRequest = (ServletWebRequest) getRequest();
+ MultipartServletWebRequest multiPartRequest = webRequest.newMultipartWebRequest(
+ Bytes.megabytes(maxFilesize), "ignored");
+ multiPartRequest.parseFileParts();
+ fileItems.addAll(multiPartRequest.getFiles().get("file"));
+ } catch (FileUploadException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.setMultipart(true);
+ }
+
+ });
+
+ add(deleteBehavior = new AbstractPostAjaxBehavior() {
+
+ @Override
+ protected void respond(AjaxRequestTarget target) {
+ IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();
+ String fileName = params.getParameterValue("name").toString();
+ for (Iterator<FileItem> it = fileItems.iterator(); it.hasNext();) {
+ FileItem fileItem = it.next();
+ if (fileItem.getName().equals(fileName)) {
+ fileItem.delete();
+ it.remove();
+ }
+ }
+ }
+
+ });
+
+ }
+
+ @Override
+ public void convertInput() {
+ if (fileItems.isEmpty()) {
+ setConvertedInput(null);
+ } else {
+ Collection<FileUpload> uploads = new ArrayList<>();
+ for (FileItem fileItem: fileItems) {
+ uploads.add(new FileUpload(fileItem));
+ }
+ setConvertedInput(uploads);
+ }
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(JavaScriptHeaderItem.forReference(new DropzoneFieldResourceReference()));
+
+ String script = String.format(
+ "gitplex.server.onDropzoneDomReady('%s', '%s', %s, %d);",
+ getMarkupId(),
+ uploadBehavior.getCallbackUrl(),
+ deleteBehavior.getCallbackFunction(CallbackParameter.explicit("name")),
+ maxFilesize);
+
+ response.render(OnDomReadyHeaderItem.forScript(script));
+ }
+
+}
diff --git a/web/src/main/java/com/gitplex/server/web/component/dropzonefield/DropzoneFieldResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/dropzonefield/DropzoneFieldResourceReference.java
new file mode 100644
index 0000000000..28f04f307f
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/component/dropzonefield/DropzoneFieldResourceReference.java
@@ -0,0 +1,29 @@
+package com.gitplex.server.web.component.dropzonefield;
+
+import java.util.List;
+
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.HeaderItem;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+
+import com.gitplex.server.web.assets.js.dropzone.DropzoneResourceReference;
+import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;
+import com.gitplex.server.web.page.base.BaseDependentResourceReference;
+
+@SuppressWarnings("serial")
+public class DropzoneFieldResourceReference extends BaseDependentResourceReference {
+
+ public DropzoneFieldResourceReference() {
+ super(DropzoneFieldResourceReference.class, "dropzone-field.js");
+ }
+
+ @Override
+ public List<HeaderItem> getDependencies() {
+ List<HeaderItem> dependencies = super.getDependencies();
+ dependencies.add(JavaScriptHeaderItem.forReference(new DropzoneResourceReference()));
+ dependencies.add(CssHeaderItem.forReference(
+ new BaseDependentCssResourceReference(DropzoneField.class, "dropzone-field.css")));
+ return dependencies;
+ }
+
+}
diff --git a/web/src/main/java/com/gitplex/server/web/component/dropzonefield/dropzone-field.css b/web/src/main/java/com/gitplex/server/web/component/dropzonefield/dropzone-field.css
new file mode 100644
index 0000000000..1a7cf0803f
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/component/dropzonefield/dropzone-field.css
@@ -0,0 +1,8 @@
+.dropzone.dropzone-field {
+ min-height: 100px;
+ border: 2px dashed #BBB;
+}
+.dropzone-field .dz-message {
+ font-size: 20px;
+ color: #444;
+}
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/component/dropzonefield/dropzone-field.js b/web/src/main/java/com/gitplex/server/web/component/dropzonefield/dropzone-field.js
new file mode 100644
index 0000000000..aa19e445c0
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/component/dropzonefield/dropzone-field.js
@@ -0,0 +1,17 @@
+gitplex.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
+ }
+ });
+};
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/component/link/DropdownLink.java b/web/src/main/java/com/gitplex/server/web/component/link/DropdownLink.java
index 8c821c0fe5..a5a87e02e4 100644
--- a/web/src/main/java/com/gitplex/server/web/component/link/DropdownLink.java
+++ b/web/src/main/java/com/gitplex/server/web/component/link/DropdownLink.java
@@ -122,7 +122,7 @@ public abstract class DropdownLink extends AjaxLink<Void> {
}
}
- public void close() {
+ public void closeDropdown() {
if (dropdown != null)
dropdown.close();
}
diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.html b/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.html
index 637f8cfd72..09cdc807ad 100644
--- a/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.html
+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.html
@@ -8,11 +8,11 @@
<div class="content">
<label>Input Url</label>
<form wicket:id="urlForm" class="form-inline url">
- <div wicket:id="feedback" class="feedback"></div>
<div class="form-group">
<input wicket:id="url" class="form-control focusable url"></input>
- <button wicket:id="ok" type="submit" class="btn btn-primary">OK</button>
+ <button wicket:id="ok" type="submit" class="btn btn-default">OK</button>
</div>
+ <div wicket:id="feedback" class="feedback"></div>
</form>
</div>
</div>
@@ -29,10 +29,10 @@
<div class="or">-OR-</div>
<div class="content">
<form wicket:id="uploadForm" class="upload">
- <div wicket:id="feedback" class="feedback"></div>
- <span class="btn btn-default btn-file">
+ <div class="btn btn-default btn-file">
Upload File... <input wicket:id="file" type="file"></input> <button wicket:id="submit" class="hidden">submit</button>
- </span>
+ </div>
+ <div wicket:id="feedback" class="feedback"></div>
</form>
</div>
</div>
diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.java b/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.java
index 2c2f86725d..448bd44370 100644
--- a/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.java
@@ -165,7 +165,7 @@ class InsertUrlPanel extends Panel {
String relativePath = relativized.toString().replace('\\', '/').substring("../".length());
markdownEditor.insertUrl(target, isImage, relativePath, blobIdent.getName(), null);
markdownEditor.closeUrlSelector(target, InsertUrlPanel.this);
- close();
+ closeDropdown();
}
@Override
@@ -298,7 +298,7 @@ class InsertUrlPanel extends Panel {
if (attachmentSupport != null)
uploadForm.setMaxSize(Bytes.bytes(attachmentSupport.getAttachmentMaxSize()));
uploadForm.setMultiPart(true);
- uploadForm.add(new NotificationPanel("feedback", uploadForm));
+ uploadForm.add(new NotificationPanel("feedback", uploadForm).setOutputMarkupPlaceholderTag(true));
uploadForm.add(uploadField);
uploadForm.add(new AjaxButton("submit") {});
uploadForm.setVisible(attachmentSupport != null);
diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.html b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.html
index 4f353af0e3..3059f4bbc0 100644
--- a/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.html
+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.html
@@ -57,7 +57,7 @@
<div class="emojis"></div>
<div class="help">
<a href="https://guides.github.com/features/mastering-markdown/" target="_blank">GitHub flavored markdown</a> is accepted.
- <span wicket:id="canAttachFile">You may drag and drop file/image to the input box, or paste image from clipboard</span>
+ <span wicket:id="canAttachFile">You may drop file/image to the input box, or paste image from clipboard</span>
</div>
<div class="body clearfix">
<textarea wicket:id="input" class="input" rows=5></textarea>
diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.css b/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.css
index b0ce99b553..93a18f6368 100644
--- a/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.css
+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.css
@@ -67,9 +67,6 @@
.markdown-editor>.body>.preview>.message {
color: #999;
}
-.markdown-editor>.body>.preview .focusing {
- background: #FCF5DA;
-}
.markdown-editor.compact>.body>* {
width: 100%;
}
@@ -111,8 +108,19 @@
font-weight: bold;
margin: 12px 0;
}
+.insert-url>.section>.content {
+ padding: 12px;
+ border: 1px dashed #AAA;
+ border-radius: 4px;
+ background: #F9F9F9;
+}
+.insert-url>.section>.content .alert {
+ margin-bottom: 0;
+ margin-top: 20px;
+}
+
.insert-url input.url {
- width: 495px;
+ width: 480px;
margin-right: 7px;
}
.insert-url .attachments {
diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.js b/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.js
index 0d39905e06..928beb6098 100644
--- a/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.js
+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.js
@@ -5,6 +5,15 @@ gitplex.server.markdown = {
else
return "markdownEditor.splitView";
},
+ dispatchInputEvent: function($input) {
+ if(document.createEventObject) {
+ $input[0].fireEvent("input");
+ } else {
+ var evt = document.createEvent("HTMLEvents");
+ evt.initEvent("input", false, true);
+ $input[0].dispatchEvent(evt);
+ }
+ },
onDomReady: function(containerId, callback, atWhoLimit, attachmentSupport, attachmentMaxSize,
canMentionUser, canReferencePullRequest) {
var $container = $("#" + containerId);
@@ -99,16 +108,6 @@ gitplex.server.markdown = {
}
}, 500);
- function dispatchInputEvent() {
- if(document.createEventObject) {
- $input[0].fireEvent("input");
- } else {
- var evt = document.createEvent("HTMLEvents");
- evt.initEvent("input", false, true);
- $input[0].dispatchEvent(evt);
- }
- }
-
var fontSize = parseInt(getComputedStyle($input[0]).getPropertyValue('font-size'));
/*
* Padding same leading spaces as last line when add a new line. This is useful when
@@ -141,7 +140,7 @@ gitplex.server.markdown = {
$input.scrollTop(caretBottom - $input.height());
}
- dispatchInputEvent();
+ gitplex.server.markdown.dispatchInputEvent($input);
}
});
@@ -210,7 +209,7 @@ gitplex.server.markdown = {
$input.range("**strong text**").range(selected.start+2, selected.end+2+"strong text".length);
}
$input.focus();
- dispatchInputEvent();
+ gitplex.server.markdown.dispatchInputEvent($input);
});
$head.find(".do-italic").click(function() {
@@ -221,7 +220,7 @@ gitplex.server.markdown = {
$input.range("_emphasized text_").range(selected.start+1, selected.end+1+"emphasized text".length);
}
$input.focus();
- dispatchInputEvent();
+ gitplex.server.markdown.dispatchInputEvent($input);
});
$head.find(".do-header").click(function() {
@@ -232,7 +231,7 @@ gitplex.server.markdown = {
$input.range("### heading text").range(selected.start+4, selected.end+4+"heading text".length);
}
$input.focus();
- dispatchInputEvent();
+ gitplex.server.markdown.dispatchInputEvent($input);
});
$head.find(".do-list, .do-orderlist").click(function() {
@@ -251,7 +250,7 @@ gitplex.server.markdown = {
$input.range(leading + " list text here").range(selected.start+leading.length+1, selected.start+leading.length+1+"list text here".length);
}
$input.focus();
- dispatchInputEvent();
+ gitplex.server.markdown.dispatchInputEvent($input);
});
$head.find(".do-code").click(function() {
@@ -269,7 +268,7 @@ gitplex.server.markdown = {
$input.range("`code text here`").range(selected.start+1, selected.end+1+"code text here".length);
}
$input.focus();
- dispatchInputEvent();
+ gitplex.server.markdown.dispatchInputEvent($input);
});
$head.find(".do-quote").click(function() {
@@ -279,7 +278,7 @@ gitplex.server.markdown = {
else
$input.range("> quote here").range(selected.start+2, selected.start+2+"quote here".length);
$input.focus();
- dispatchInputEvent();
+ gitplex.server.markdown.dispatchInputEvent($input);
});
$head.find(".do-emoji").click(function() {
@@ -315,7 +314,7 @@ gitplex.server.markdown = {
$input.caret(" " + atChar);
}
$input.atwho("run");
- dispatchInputEvent();
+ gitplex.server.markdown.dispatchInputEvent($input);
});
$head.find(".do-image, .do-link").click(function() {
@@ -490,7 +489,6 @@ gitplex.server.markdown = {
if (sourceStart <= caret) {
$blockNearCaret = $(this);
}
- $(this).removeClass("focusing");
});
if ($blockNearCaret) {
@@ -522,8 +520,6 @@ gitplex.server.markdown = {
scrollTop = blockTop;
}
}
- // Highlight the block so that user can easily find matching block while editing
- $blockNearCaret.addClass("focusing");
} else {
scrollTop = 0;
}
@@ -629,7 +625,7 @@ gitplex.server.markdown = {
return;
$input.caret(":" + $(this).attr("title") + ": ");
- dispatchInputEvent();
+ gitplex.server.markdown.dispatchInputEvent($input);
});
$(window).resize();
},
@@ -655,7 +651,7 @@ gitplex.server.markdown = {
$input.range($input.caret()-message.length+offset, $input.caret()-message.length+defaultDescription.length+offset);
}
- dispatchInputEvent();
+ gitplex.server.markdown.dispatchInputEvent($input);
},
updateUploadMessage: function($input, message, replaceMessage) {
var isError = message.indexOf("!!") == 0;
@@ -686,12 +682,13 @@ gitplex.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) {
- $upload.closest('form').prepend("<div class='alert alert-danger'>Size of upload file should be less than "
+ $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'>&times;</span></button></div>");
} else {
- $upload.closest('form').children(".alert").remove();
+ $feedback.empty();
$upload.next().click();
}
})
diff --git a/web/src/main/java/com/gitplex/server/web/component/modal/ModalLink.java b/web/src/main/java/com/gitplex/server/web/component/modal/ModalLink.java
index bfde581984..6d485e89dc 100644
--- a/web/src/main/java/com/gitplex/server/web/component/modal/ModalLink.java
+++ b/web/src/main/java/com/gitplex/server/web/component/modal/ModalLink.java
@@ -26,8 +26,8 @@ public abstract class ModalLink extends AjaxLink<Void> {
}
@Override
- protected void onClosed(AjaxRequestTarget target) {
- super.onClosed(target);
+ protected void onClosed() {
+ super.onClosed();
modal = null;
}
@@ -35,9 +35,9 @@ public abstract class ModalLink extends AjaxLink<Void> {
}
}
- protected void close(AjaxRequestTarget target) {
+ protected void closeModal() {
if (modal != null)
- modal.close(target);
+ modal.close();
}
protected abstract Component newContent(String id);
diff --git a/web/src/main/java/com/gitplex/server/web/component/modal/ModalPanel.java b/web/src/main/java/com/gitplex/server/web/component/modal/ModalPanel.java
index 202b789292..251004bf7f 100644
--- a/web/src/main/java/com/gitplex/server/web/component/modal/ModalPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/modal/ModalPanel.java
@@ -8,6 +8,7 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.request.cycle.RequestCycle;
import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;
import com.gitplex.server.web.page.base.BasePage;
@@ -55,7 +56,7 @@ public abstract class ModalPanel extends Panel {
@Override
protected void respond(AjaxRequestTarget target) {
ModalPanel.this.remove();
- onClosed(target);
+ onClosed();
}
@Override
@@ -80,16 +81,18 @@ public abstract class ModalPanel extends Panel {
return get(CONTENT_ID);
}
- public final void close(AjaxRequestTarget target) {
- String script = String.format("gitplex.server.modal.close($('#%s>.modal'), false);", getMarkupId(true));
- target.appendJavaScript(script);
+ public final void close() {
+ AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);
+ if (target != null) {
+ String script = String.format("gitplex.server.modal.close($('#%s>.modal'), false);", getMarkupId(true));
+ target.appendJavaScript(script);
+ }
remove();
-
- onClosed(target);
+ onClosed();
}
- protected void onClosed(AjaxRequestTarget target) {
+ protected void onClosed() {
}
diff --git a/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionPicker.java b/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionPicker.java
index 125eca2b9f..baf9850fc9 100644
--- a/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionPicker.java
+++ b/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionPicker.java
@@ -40,7 +40,7 @@ public abstract class RevisionPicker extends DropdownLink {
@Override
protected void onSelect(AjaxRequestTarget target, String revision) {
- close();
+ closeDropdown();
RevisionPicker.this.revision = revision;
target.add(RevisionPicker.this);
@@ -50,7 +50,7 @@ public abstract class RevisionPicker extends DropdownLink {
@Override
protected void onModalOpened(AjaxRequestTarget target, ModalPanel modal) {
super.onModalOpened(target, modal);
- close();
+ closeDropdown();
}
@Override
diff --git a/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionSelector.java b/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionSelector.java
index 6f212a4494..668d1f2d97 100644
--- a/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionSelector.java
+++ b/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionSelector.java
@@ -318,13 +318,13 @@ public abstract class RevisionSelector extends Panel {
@Override
protected void onCreate(AjaxRequestTarget target, String tagName) {
- close(target);
+ close();
onSelect(target, tagName);
}
@Override
protected void onCancel(AjaxRequestTarget target) {
- close(target);
+ close();
}
};
diff --git a/web/src/main/java/com/gitplex/server/web/component/sourceformat/source-format.css b/web/src/main/java/com/gitplex/server/web/component/sourceformat/source-format.css
index 03bd2ec64e..96b1b2f48e 100644
--- a/web/src/main/java/com/gitplex/server/web/component/sourceformat/source-format.css
+++ b/web/src/main/java/com/gitplex/server/web/component/sourceformat/source-format.css
@@ -1,6 +1,6 @@
.source-format select {
color: #444;
- height: 22px;
+ height: 30px;
padding: 0;
border-radius: 3px;
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorDepotListPage.java b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorDepotListPage.java
index 342737a4c7..b2e39be2c8 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorDepotListPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorDepotListPage.java
@@ -115,7 +115,7 @@ public class CollaboratorDepotListPage extends CollaboratorPage {
@Override
protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {
- close();
+ closeDropdown();
filterPrivilege = privilege;
target.add(filterContainer);
target.add(depotsContainer);
@@ -317,7 +317,7 @@ public class CollaboratorDepotListPage extends CollaboratorPage {
@Override
protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {
- close();
+ closeDropdown();
UserAuthorization authorization = item.getModelObject();
authorization.setPrivilege(privilege);
GitPlex.getInstance(UserAuthorizationManager.class).save(authorization);
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.java b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.java
index 67e67b414b..1056956458 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.java
@@ -99,7 +99,7 @@ public class CollaboratorEffectivePrivilegePage extends CollaboratorPage {
@Override
protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {
- close();
+ closeDropdown();
filterPrivilege = privilege;
target.add(filterContainer);
target.add(depotsContainer);
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberEffectivePrivilegePage.java b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberEffectivePrivilegePage.java
index 1e1b615e9d..207720c058 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberEffectivePrivilegePage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberEffectivePrivilegePage.java
@@ -99,7 +99,7 @@ public class MemberEffectivePrivilegePage extends MemberPage {
@Override
protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {
- close();
+ closeDropdown();
filterPrivilege = privilege;
target.add(filterContainer);
target.add(depotsContainer);
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberListPage.java b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberListPage.java
index 7801c29ea2..2cbd658eb0 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberListPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberListPage.java
@@ -115,7 +115,7 @@ public class MemberListPage extends AccountLayoutPage {
@Override
protected void onSelectAdmin(AjaxRequestTarget target) {
- close();
+ closeDropdown();
filterRole = ROLE_ADMIN;
target.add(filterContainer);
target.add(membersContainer);
@@ -125,7 +125,7 @@ public class MemberListPage extends AccountLayoutPage {
@Override
protected void onSelectOrdinary(AjaxRequestTarget target) {
- close();
+ closeDropdown();
filterRole = ROLE_MEMBER;
target.add(filterContainer);
target.add(membersContainer);
@@ -282,7 +282,7 @@ public class MemberListPage extends AccountLayoutPage {
@Override
protected void onSelectOrdinary(AjaxRequestTarget target) {
- close();
+ closeDropdown();
membership.setAdmin(false);
GitPlex.getInstance(OrganizationMembershipManager.class).save(membership);
target.add(pagingNavigator);
@@ -293,7 +293,7 @@ public class MemberListPage extends AccountLayoutPage {
@Override
protected void onSelectAdmin(AjaxRequestTarget target) {
- close();
+ closeDropdown();
membership.setAdmin(true);
GitPlex.getInstance(OrganizationMembershipManager.class).save(membership);
target.add(pagingNavigator);
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberPage.java b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberPage.java
index 8e6e081ba2..5e83dfcfdc 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberPage.java
@@ -108,7 +108,7 @@ public abstract class MemberPage extends AccountLayoutPage {
@Override
protected void onSelectOrdinary(AjaxRequestTarget target) {
- close();
+ closeDropdown();
getMembership().setAdmin(false);
GitPlex.getInstance(OrganizationMembershipManager.class).save(getMembership());
setResponsePage(getPageClass(), getPageParameters());
@@ -117,7 +117,7 @@ public abstract class MemberPage extends AccountLayoutPage {
@Override
protected void onSelectAdmin(AjaxRequestTarget target) {
- close();
+ closeDropdown();
getMembership().setAdmin(true);
GitPlex.getInstance(OrganizationMembershipManager.class).save(getMembership());
setResponsePage(getPageClass(), getPageParameters());
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/setting/AvatarEditPage.html b/web/src/main/java/com/gitplex/server/web/page/account/setting/AvatarEditPage.html
index 28ecac0e2f..8096cf00e0 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/setting/AvatarEditPage.html
+++ b/web/src/main/java/com/gitplex/server/web/page/account/setting/AvatarEditPage.html
@@ -4,7 +4,7 @@
<div wicket:id="feedback"></div>
<div class="clearfix">
<div class="upload pull-left">
- <span class="btn btn-primary btn-file">
+ <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>
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/setting/AvatarEditPage.java b/web/src/main/java/com/gitplex/server/web/page/account/setting/AvatarEditPage.java
index 508658b2b8..e67f9a7543 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/setting/AvatarEditPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/setting/AvatarEditPage.java
@@ -23,7 +23,7 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel
@SuppressWarnings("serial")
public class AvatarEditPage extends AccountSettingPage {
- private static final int MAX_IMAGE_SIZE = 2*1024*1024;
+ private static final int MAX_IMAGE_SIZE = 10*1024*1024;
public AvatarEditPage(PageParameters params) {
super(params);
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamDepotListPage.java b/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamDepotListPage.java
index 4f10b37ca8..985d973feb 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamDepotListPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamDepotListPage.java
@@ -120,7 +120,7 @@ public class TeamDepotListPage extends TeamPage {
@Override
protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {
- close();
+ closeDropdown();
filterPrivilege = privilege;
target.add(filterContainer);
target.add(depotsContainer);
@@ -303,7 +303,7 @@ public class TeamDepotListPage extends TeamPage {
@Override
protected void onClose(AjaxRequestTarget target) {
- close(target);
+ closeModal();
}
};
@@ -333,7 +333,7 @@ public class TeamDepotListPage extends TeamPage {
@Override
protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {
- close();
+ closeDropdown();
TeamAuthorization authorization = item.getModelObject();
authorization.setPrivilege(privilege);
GitPlex.getInstance(TeamAuthorizationManager.class).save(authorization);
diff --git a/web/src/main/java/com/gitplex/server/web/page/base/base.css b/web/src/main/java/com/gitplex/server/web/page/base/base.css
index 90156f49de..6d076a4b9b 100644
--- a/web/src/main/java/com/gitplex/server/web/page/base/base.css
+++ b/web/src/main/java/com/gitplex/server/web/page/base/base.css
@@ -510,3 +510,7 @@ input.search {
.dropdown-menu li a i {
margin-right: 4px;
}
+
+.wicket-mfu-caption {
+ margin-top: 4px;
+}
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/DepotPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/DepotPage.java
index 04f075c176..834fee5d32 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/DepotPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/DepotPage.java
@@ -209,7 +209,7 @@ public abstract class DepotPage extends AccountPage {
@Override
protected void onPromptForkOption(AjaxRequestTarget target) {
- close();
+ closeDropdown();
}
};
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/BlobUploadPanel.html b/web/src/main/java/com/gitplex/server/web/page/depot/blob/BlobUploadPanel.html
new file mode 100644
index 0000000000..624e6750ab
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/BlobUploadPanel.html
@@ -0,0 +1,27 @@
+<wicket:panel>
+ <form wicket:id="form" class="upload-blobs">
+ <div class="modal-header">
+ <h4 class="modal-title">Upload Files</h4>
+ </div>
+ <div class="modal-body">
+ <div wicket:id="feedback"></div>
+ <div class="form-group">
+ <div wicket:id="files"></div>
+ </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>
+ <div class="modal-footer">
+ <div class="form-group">
+ <button wicket:id="upload" class="btn btn-primary">Upload</button>
+ <button wicket:id="cancel" class="btn btn-default">Cancel</button>
+ </div>
+ </div>
+ </form>
+</wicket:panel>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/BlobUploadPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/BlobUploadPanel.java
new file mode 100644
index 0000000000..16a28dc001
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/BlobUploadPanel.java
@@ -0,0 +1,145 @@
+package com.gitplex.server.web.page.depot.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;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+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.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.gitplex.server.GitPlex;
+import com.gitplex.server.git.BlobContent;
+import com.gitplex.server.git.BlobEdits;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.git.exception.NotTreeException;
+import com.gitplex.server.git.exception.ObjectAlreadyExistsException;
+import com.gitplex.server.git.exception.ObsoleteCommitException;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.model.Account;
+import com.gitplex.server.web.component.dropzonefield.DropzoneField;
+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Sets;
+
+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 summaryCommitMessage;
+
+ private String detailCommitMessage;
+
+ private final Collection<FileUpload> uploads = new ArrayList<>();
+
+ public BlobUploadPanel(String id, BlobRenderContext context) {
+ super(id);
+ this.context = context;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ Form<?> form = new Form<Void>("form");
+ form.setMultiPart(true);
+ form.setFileMaxSize(Bytes.megabytes(MAX_FILE_SIZE));
+ add(form);
+
+ NotificationPanel feedback = new NotificationPanel("feedback", form);
+ feedback.setOutputMarkupPlaceholderTag(true);
+ form.add(feedback);
+
+ form.add(new DropzoneField("files",
+ new PropertyModel<Collection<FileUpload>>(this, "uploads"), MAX_FILE_SIZE).setRequired(true));
+ form.add(new AjaxButton("upload") {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+
+ Map<String, BlobContent> newBlobs = new HashMap<>();
+ for (FileUpload upload: uploads) {
+ String blobPath = upload.getClientFileName();
+ if (context.getBlobIdent().path != null)
+ blobPath = context.getBlobIdent().path + "/" + blobPath;
+ 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;
+ Account user = Preconditions.checkNotNull(GitPlex.getInstance(AccountManager.class).getCurrent());
+
+ ObjectId prevCommitId = context.getDepot().getObjectId(context.getBlobIdent().revision);
+
+ ObjectId newCommitId = null;
+ while (newCommitId == null) {
+ try {
+ newCommitId = blobEdits.commit(context.getDepot().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);
+ }
+
+ @Override
+ protected void onError(AjaxRequestTarget target, Form<?> form) {
+ super.onError(target, form);
+ target.add(feedback);
+ }
+
+ });
+
+ form.add(new TextField<String>("summaryCommitMessage",
+ new PropertyModel<String>(this, "summaryCommitMessage")));
+ form.add(new TextArea<String>("detailCommitMessage", new PropertyModel<String>(this, "detailCommitMessage")));
+ form.add(new AjaxLink<Void>("cancel") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onCancel(target);
+ }
+
+ });
+ }
+
+ abstract void onCommitted(AjaxRequestTarget target, ObjectId oldCommit, ObjectId newCommit);
+
+ abstract void onCancel(AjaxRequestTarget target);
+}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.html b/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.html
index aa6bba3478..c097c779cb 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.html
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.html
@@ -6,8 +6,8 @@
<div wicket:id="blobOperations" class="operations">
<span wicket:id="instantSearch"></span>
<a wicket:id="advancedSearch" title="Advanced search of symbols, files and texts"><i class="fa fa-binoculars"></i></a>
- <a wicket:id="add" title="Add new file"><i class="fa fa-plus"></i></a>
<a wicket:id="history" title="Commit history of current path"><i class="fa fa-history"></i></a>
+ <a wicket:id="add" title="Create or upload files"><i class="fa fa-plus"></i></a>
<a wicket:id="download" title="Download zip archive of whole repository at this revision"><i class="fa fa-download"></i></a>
</div>
</div>
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.java
index b798fea313..79ce835999 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.java
@@ -17,7 +17,6 @@ import org.apache.shiro.util.ThreadContext;
import org.apache.wicket.Component;
import org.apache.wicket.RestartResponseException;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.event.IEvent;
@@ -26,7 +25,6 @@ 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.link.Link;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.protocol.ws.api.WebSocketRequestHandler;
import org.apache.wicket.request.cycle.RequestCycle;
@@ -67,6 +65,9 @@ import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.web.PrioritizedComponentRenderer;
import com.gitplex.server.web.component.link.ArchiveMenuLink;
import com.gitplex.server.web.component.link.ViewStateAwareAjaxLink;
+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
+import com.gitplex.server.web.component.menu.MenuItem;
+import com.gitplex.server.web.component.menu.MenuLink;
import com.gitplex.server.web.component.modal.ModalLink;
import com.gitplex.server.web.component.revisionpicker.RevisionPicker;
import com.gitplex.server.web.page.depot.DepotPage;
@@ -194,10 +195,10 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {
if (!SecurityUtils.canModify(getDepot(), state.blobIdent.revision, path))
unauthorized();
}
-
+
WebRequest request = (WebRequest) RequestCycle.get().getRequest();
String accept = request.getHeader("Accept");
- if (accept != null && !accept.startsWith("text/html")) {
+ if (accept != null && !accept.startsWith("text/html") && state.blobIdent.isFile()) {
RequestCycle.get().scheduleRequestHandlerAfterCurrent(
new ResourceReferenceRequestHandler(new RawBlobResourceReference(), getPageParameters()));
}
@@ -309,17 +310,85 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {
WebMarkupContainer blobOperations = new WebMarkupContainer("blobOperations");
blobOperations.setOutputMarkupId(true);
- blobOperations.add(new ViewStateAwareAjaxLink<Void>("add") {
+ blobOperations.add(new MenuLink("add") {
@Override
- public void onClick(AjaxRequestTarget target) {
- onModeChange(target, Mode.ADD);
- }
+ protected List<MenuItem> getMenuItems() {
+ List<MenuItem> menuItems = new ArrayList<>();
+ menuItems.add(new MenuItem() {
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- }
+ @Override
+ public String getIconClass() {
+ return null;
+ }
+
+ @Override
+ public String getLabel() {
+ return "Create New File";
+ }
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new ViewStateAwareAjaxLink<Void>(id) {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onModeChange(target, Mode.ADD);
+ closeDropdown();
+ }
+
+ };
+ }
+
+ });
+
+ menuItems.add(new MenuItem() {
+
+ @Override
+ public String getIconClass() {
+ return null;
+ }
+
+ @Override
+ public String getLabel() {
+ return "Upload Files";
+ }
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new ModalLink(id) {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ super.onClick(target);
+ closeDropdown();
+ }
+
+ @Override
+ protected Component newContent(String id) {
+ return new BlobUploadPanel(id, DepotBlobPage.this) {
+
+ @Override
+ void onCancel(AjaxRequestTarget target) {
+ closeModal();
+ }
+
+ @Override
+ void onCommitted(AjaxRequestTarget target, ObjectId oldCommit, ObjectId newCommit) {
+ DepotBlobPage.this.onCommitted(target, oldCommit, newCommit);
+ closeModal();
+ }
+
+ };
+ }
+
+ };
+ }
+
+ });
+ return menuItems;
+ }
+
@Override
protected void onConfigure() {
super.onConfigure();
@@ -372,12 +441,12 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {
protected void onSearchComplete(AjaxRequestTarget target, List<QueryHit> hits) {
newSearchResult(target, hits);
resizeWindow(target);
- close(target);
+ closeModal();
}
@Override
protected void onCancel(AjaxRequestTarget target) {
- close(target);
+ closeModal();
}
@Override
@@ -390,15 +459,17 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {
});
- blobOperations.add(new Link<Void>("history") {
+ DepotCommitsPage.State commitsState = new DepotCommitsPage.State();
+ commitsState.setCompareWith(resolvedRevision.name());
+ if (state.blobIdent.path != null)
+ commitsState.setQuery(String.format("path(%s)", DepotBlobPage.this.state.blobIdent.path));
+ blobOperations.add(new ViewStateAwarePageLink<Void>("history", DepotCommitsPage.class,
+ DepotCommitsPage.paramsOf(getDepot(), commitsState)) {
@Override
- public void onClick() {
- DepotCommitsPage.State state = new DepotCommitsPage.State();
- state.setCompareWith(resolvedRevision.name());
- if (DepotBlobPage.this.state.blobIdent.path != null)
- state.setQuery(String.format("path(%s)", DepotBlobPage.this.state.blobIdent.path));
- setResponsePage(DepotCommitsPage.class, DepotCommitsPage.paramsOf(getDepot(), state));
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(state.blobIdent.isTree());
}
});
@@ -410,6 +481,12 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {
return state.blobIdent.revision;
}
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(state.blobIdent.path == null);
+ }
+
});
if (target != null) {
@@ -766,7 +843,7 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {
@Override
public RevCommit getCommit() {
- return getDepot().getRevCommit(getBlobIdent().revision);
+ return getDepot().getRevCommit(resolvedRevision);
}
@Override
@@ -870,8 +947,11 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {
} catch (IOException e) {
throw new RuntimeException(e);
}
- } else {
+ } else if (state.mode == Mode.EDIT) {
newBlobIdent = new BlobIdent(branch, getNewPath(), FileMode.REGULAR_FILE.getBits());
+ } else {
+ // We've uploaded some files
+ newBlobIdent = null;
}
GitPlex.getInstance(UnitOfWork.class).doAsync(new Runnable() {
@@ -893,13 +973,15 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {
if (state.requestCompareInfo != null) {
showRequestChanges(target, oldCommit, newCommit);
- } else {
+ } else if (newBlobIdent != null) {
state.blobIdent = newBlobIdent;
state.mark = null;
state.commentId = null;
state.mode = Mode.VIEW;
onResolvedRevisionChange(target);
pushState(target);
+ } else {
+ onResolvedRevisionChange(target);
}
// fix the issue that sometimes indexing indicator of new commit does not disappear
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobResourceReference.java
index ec74c75c8f..b97b315d7f 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobResourceReference.java
@@ -7,6 +7,7 @@ import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import com.gitplex.server.web.assets.js.cookies.CookiesResourceReference;
+import com.gitplex.server.web.assets.js.dropzone.DropzoneResourceReference;
import com.gitplex.server.web.assets.js.jqueryui.JQueryUIResourceReference;
import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;
import com.gitplex.server.web.page.base.BaseDependentResourceReference;
@@ -24,6 +25,7 @@ public class DepotBlobResourceReference extends BaseDependentResourceReference {
List<HeaderItem> dependencies = super.getDependencies();
dependencies.add(JavaScriptHeaderItem.forReference(new CookiesResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new JQueryUIResourceReference()));
+ dependencies.add(JavaScriptHeaderItem.forReference(new DropzoneResourceReference()));
dependencies.add(CssHeaderItem.forReference(
new BaseDependentCssResourceReference(DepotBlobResourceReference.class, "depot-blob.css")));
return dependencies;
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/BlobNavigator.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/BlobNavigator.java
index a732c8d497..206f01ec53 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/BlobNavigator.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/BlobNavigator.java
@@ -208,7 +208,7 @@ public class BlobNavigator extends Panel {
@Override
public void onClick(AjaxRequestTarget target) {
context.onSelect(target, model.getObject(), null);
- close();
+ closeDropdown();
}
@Override
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.html b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.html
index 0941e33eca..d0ca8e6f5d 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.html
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.html
@@ -42,6 +42,6 @@
</form>
</wicket:fragment>
<wicket:fragment wicket:id="actionsFrag">
- <a wicket:id="outline" class="btn btn-default btn-xs outline-toggle"><i class="fa fa-list-ul"></i> Outline</a>
+ <a wicket:id="outline" class="btn btn-default btn-sm outline-toggle"><i class="fa fa-list-ul"></i> Outline</a>
</wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-edit.css b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-edit.css
index f4fac9cf86..115e686402 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-edit.css
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-edit.css
@@ -1,5 +1,5 @@
.blob-edit>.head .source-format {
- margin: 8px 12px 0 0;
+ margin: 2px 12px 0 0;
}
.blob-edit .source-edit .input {
display: none;
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.css b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.css
index 77bc987d0a..faa9344a9e 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.css
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.css
@@ -141,5 +141,5 @@
}
.source-view .comment textarea {
- max-height: 250px;
+ max-height: 360px;
}
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewPanel.html b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewPanel.html
index 41010e2200..de2f8c4540 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewPanel.html
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewPanel.html
@@ -15,15 +15,16 @@
<wicket:enclosure child="changeActions">
<div class="change pull-left">
<div wicket:id="changeActions" class="btn-group">
- <a wicket:id="edit" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>
- <a wicket:id="delete" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a>
+ <a wicket:id="edit" class="btn btn-default btn-sm"><i class="fa fa-pencil"></i> Edit</a>
+ <a wicket:id="delete" class="btn btn-default btn-sm"><i class="fa fa-trash"></i> Delete</a>
</div>
</div>
</wicket:enclosure>
<div class="others pull-left">
<div class="btn-group">
- <a wicket:id="raw" class="btn btn-default btn-xs"><i class="fa fa-file-o"></i> Raw</a>
- <a wicket:id="blame" class="btn btn-default btn-xs"><i class="fa fa-user"></i> Blame</a>
+ <a wicket:id="raw" class="btn btn-default btn-sm"><i class="fa fa-file-o"></i> Raw</a>
+ <a wicket:id="blame" class="btn btn-default btn-sm"><i class="fa fa-user"></i> Blame</a>
+ <a wicket:id="history" class="btn btn-default btn-sm"><i class="fa fa-history"></i> History</a>
<wicket:container wicket:id="extraActions"></wicket:container>
</div>
</div>
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewPanel.java
index d6c0545673..4b2830db51 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewPanel.java
@@ -20,8 +20,10 @@ import com.gitplex.server.git.BlobIdent;
import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.util.FileUtils;
import com.gitplex.server.web.component.link.ViewStateAwareAjaxLink;
+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;
import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext.Mode;
+import com.gitplex.server.web.page.depot.commit.DepotCommitsPage;
import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;
import com.gitplex.server.web.util.resource.RawBlobResource;
import com.gitplex.server.web.util.resource.RawBlobResourceReference;
@@ -187,6 +189,12 @@ public abstract class BlobViewPanel extends Panel {
}
})));
+
+ DepotCommitsPage.State state = new DepotCommitsPage.State();
+ state.setCompareWith(context.getCommit().name());
+ state.setQuery(String.format("path(%s)", context.getBlobIdent().path));
+ add(new ViewStateAwarePageLink<>("history", DepotCommitsPage.class,
+ DepotCommitsPage.paramsOf(context.getDepot(), state)));
add(newAdditionalActions("extraActions"));
newChangeActions(null);
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/blob-view.css b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/blob-view.css
index f42e453ef5..5e8856def2 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/blob-view.css
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/blob-view.css
@@ -1,11 +1,12 @@
.blob-view>.head {
border-bottom: 1px solid #BBB;
- padding: 6px 12px;
+ padding: 4px 12px;
}
.blob-view>.body {
overflow: auto;
}
.blob-view>.head>.info {
+ margin-top: 4px;
color: #666;
}
.blob-view>.head>.info .separator {
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesPage.java
index cbc24b85d7..b123ab9c71 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesPage.java
@@ -374,7 +374,7 @@ public class DepotBranchesPage extends DepotPage {
target.add(form);
} else {
depotModel.getObject().createBranch(branchName, branchRevision);
- close(target);
+ closeModal();
target.add(branchesContainer);
target.add(pagingNavigator);
target.add(noBranchesContainer);
@@ -388,7 +388,7 @@ public class DepotBranchesPage extends DepotPage {
@Override
public void onClick(AjaxRequestTarget target) {
- close(target);
+ closeModal();
}
});
@@ -659,7 +659,7 @@ public class DepotBranchesPage extends DepotPage {
target.add(pagingNavigator);
target.add(branchesContainer);
target.add(noBranchesContainer);
- close(target);
+ closeModal();
}
});
@@ -667,7 +667,7 @@ public class DepotBranchesPage extends DepotPage {
@Override
public void onClick(AjaxRequestTarget target) {
- close(target);
+ closeModal();
}
});
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/MoreInfoPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/MoreInfoPanel.java
index 053597b145..8755c37e20 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/MoreInfoPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/MoreInfoPanel.java
@@ -172,7 +172,7 @@ public abstract class MoreInfoPanel extends Panel {
@Override
protected void onClose(AjaxRequestTarget target) {
- close(target);
+ closeModal();
}
};
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.java
index 01cc4975b4..de3da48bb0 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.java
@@ -235,7 +235,7 @@ public class RequestChangesPage extends RequestDetailPage implements CommentSupp
target.add(head);
newRevisionDiff(target);
pushState(target);
- close();
+ closeDropdown();
}
};
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotCollaboratorListPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotCollaboratorListPage.java
index 141fc99252..98e1f87e0c 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotCollaboratorListPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotCollaboratorListPage.java
@@ -94,7 +94,7 @@ public class DepotCollaboratorListPage extends DepotSettingPage {
@Override
protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {
- close();
+ closeDropdown();
filterPrivilege = privilege;
target.add(filterContainer);
target.add(collaboratorsContainer);
@@ -292,7 +292,7 @@ public class DepotCollaboratorListPage extends DepotSettingPage {
@Override
protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {
- close();
+ closeDropdown();
UserAuthorization authorization = item.getModelObject();
authorization.setPrivilege(privilege);
GitPlex.getInstance(UserAuthorizationManager.class).save(authorization);
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.java
index 1faa54aec5..6321c19311 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.java
@@ -106,7 +106,7 @@ public class DepotEffectivePrivilegePage extends DepotSettingPage {
@Override
protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {
- close();
+ closeDropdown();
filterPrivilege = privilege;
target.add(filterContainer);
target.add(usersContainer);
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotTeamListPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotTeamListPage.java
index f5a982addf..bfffb4f36f 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotTeamListPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotTeamListPage.java
@@ -94,7 +94,7 @@ public class DepotTeamListPage extends DepotSettingPage {
@Override
protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {
- close();
+ closeDropdown();
filterPrivilege = privilege;
target.add(filterContainer);
target.add(teamsContainer);
@@ -271,7 +271,7 @@ public class DepotTeamListPage extends DepotSettingPage {
@Override
protected void onClose(AjaxRequestTarget target) {
- close(target);
+ closeModal();
}
};
@@ -301,7 +301,7 @@ public class DepotTeamListPage extends DepotSettingPage {
@Override
protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {
- close();
+ closeDropdown();
TeamAuthorization authorization = item.getModelObject();
authorization.setPrivilege(privilege);
GitPlex.getInstance(TeamAuthorizationManager.class).save(authorization);
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperLink.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperLink.java
index e2b50ca3a4..b65b99b16e 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperLink.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperLink.java
@@ -44,7 +44,7 @@ abstract class GateKeeperLink extends DropdownLink {
@Override
protected void onSelect(AjaxRequestTarget target, Class<? extends GateKeeper> gateKeeperClass) {
- close();
+ closeDropdown();
GateKeeperLink.this.onSelect(target, gateKeeperClass);
}
};
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperPage.java
index 7ebd9c903c..e6835b4d35 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperPage.java
@@ -73,12 +73,12 @@ public class GateKeeperPage extends DepotSettingPage {
@Override
protected void onCancel(AjaxRequestTarget target) {
- close(target);
+ close();
}
@Override
protected void onSave(AjaxRequestTarget target, GateKeeper gateKeeper) {
- close(target);
+ close();
getDepot().getGateKeepers().add(gateKeeper);
onGateKeeperChanged(target);
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperPanel.java
index a483339266..42fa461254 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperPanel.java
@@ -84,12 +84,12 @@ abstract class GateKeeperPanel extends Panel {
@Override
protected void onCancel(AjaxRequestTarget target) {
- close(target);
+ closeModal();
}
@Override
protected void onSave(AjaxRequestTarget target, GateKeeper gateKeeper) {
- close(target);
+ closeModal();
GateKeeperPanel.this.onChange(target, gateKeeper);
}
@@ -186,12 +186,12 @@ abstract class GateKeeperPanel extends Panel {
@Override
protected void onCancel(AjaxRequestTarget target) {
- close(target);
+ close();
}
@Override
protected void onSave(AjaxRequestTarget target, GateKeeper gateKeeper) {
- close(target);
+ close();
fragment.replace(new WebMarkupContainer("childEditor").setOutputMarkupPlaceholderTag(true).setVisible(true));
andOrGateKeeper.getGateKeepers().add(gateKeeper);
GateKeeperPanel.this.onChange(target, andOrGateKeeper);
@@ -237,12 +237,12 @@ abstract class GateKeeperPanel extends Panel {
@Override
protected void onCancel(AjaxRequestTarget target) {
- close(target);
+ close();
}
@Override
protected void onSave(AjaxRequestTarget target, GateKeeper gateKeeper) {
- close(target);
+ close();
fragment.replace(new WebMarkupContainer("gateKeeperEditor").setOutputMarkupPlaceholderTag(true).setVisible(true));
notGateKeeper.setGateKeeper(gateKeeper);
GateKeeperPanel.this.onChange(target, notGateKeeper);
@@ -311,12 +311,12 @@ abstract class GateKeeperPanel extends Panel {
@Override
protected void onCancel(AjaxRequestTarget target) {
- close(target);
+ close();
}
@Override
protected void onSave(AjaxRequestTarget target, GateKeeper gateKeeper) {
- close(target);
+ close();
fragment.replace(new WebMarkupContainer("ifEditor").setOutputMarkupPlaceholderTag(true).setVisible(true));
ifThenGateKeeper.setIfGate(gateKeeper);
GateKeeperPanel.this.onChange(target, ifThenGateKeeper);
@@ -381,12 +381,12 @@ abstract class GateKeeperPanel extends Panel {
@Override
protected void onCancel(AjaxRequestTarget target) {
- close(target);
+ close();
}
@Override
protected void onSave(AjaxRequestTarget target, GateKeeper gateKeeper) {
- close(target);
+ close();
fragment.replace(new WebMarkupContainer("thenEditor").setOutputMarkupPlaceholderTag(true).setVisible(true));
ifThenGateKeeper.setThenGate(gateKeeper);
GateKeeperPanel.this.onChange(target, ifThenGateKeeper);
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/general/GeneralSettingPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/general/GeneralSettingPage.java
index 22c9a74543..49ce62d43a 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/general/GeneralSettingPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/general/GeneralSettingPage.java
@@ -174,7 +174,7 @@ public class GeneralSettingPage extends DepotSettingPage {
@Override
public void onClick(AjaxRequestTarget target) {
- close(target);
+ close();
}
});
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsPage.java
index 1bca41bcdb..784b5e9677 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsPage.java
@@ -184,7 +184,7 @@ public class DepotTagsPage extends DepotPage {
target.add(form);
} else {
getDepot().tag(tagName, tagRevision, getLoginUser().asPerson(), tagMessage);
- close(target);
+ closeModal();
target.add(tagsContainer);
target.add(pagingNavigator);
target.add(noTagsContainer);
@@ -198,7 +198,7 @@ public class DepotTagsPage extends DepotPage {
@Override
public void onClick(AjaxRequestTarget target) {
- close(target);
+ closeModal();
}
});
diff --git a/web/src/main/java/com/gitplex/server/web/page/test/TestPage.html b/web/src/main/java/com/gitplex/server/web/page/test/TestPage.html
index 27fed9a026..795b443f3a 100644
--- a/web/src/main/java/com/gitplex/server/web/page/test/TestPage.html
+++ b/web/src/main/java/com/gitplex/server/web/page/test/TestPage.html
@@ -1,5 +1,3 @@
<wicket:extend>
- <form wicket:id="form" style="padding: 50px;">
- <div wicket:id="comment"></div>
- </form>
+ <a wicket:id="test">test</a>
</wicket:extend>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java b/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java
index 66c2e5c520..f019111d19 100644
--- a/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java
@@ -1,79 +1,24 @@
package com.gitplex.server.web.page.test;
-import java.util.UUID;
+import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.model.IModel;
-import org.eclipse.jgit.lib.FileMode;
-
-import com.gitplex.server.GitPlex;
-import com.gitplex.server.git.BlobIdent;
-import com.gitplex.server.manager.DepotManager;
-import com.gitplex.server.model.Depot;
-import com.gitplex.server.web.component.comment.CommentInput;
-import com.gitplex.server.web.component.comment.DepotAttachmentSupport;
-import com.gitplex.server.web.component.markdown.AttachmentSupport;
-import com.gitplex.server.web.component.markdown.BlobReferenceSupport;
import com.gitplex.server.web.page.base.BasePage;
@SuppressWarnings("serial")
public class TestPage extends BasePage {
- private String comment;
-
- private static String ATTACHMENT_UUID = UUID.randomUUID().toString();
-
@Override
protected void onInitialize() {
super.onInitialize();
-
- Form<?> form = new Form<Void>("form");
- form.add(new CommentInput("comment", new IModel<String>() {
-
- @Override
- public void detach() {
- }
-
- @Override
- public String getObject() {
- return comment;
- }
-
- @Override
- public void setObject(String object) {
- comment = object;
- }
-
- }, false) {
-
- @Override
- protected AttachmentSupport getAttachmentSupport() {
- return new DepotAttachmentSupport(GitPlex.getInstance(DepotManager.class).load(1L), ATTACHMENT_UUID);
- }
- @Override
- protected BlobReferenceSupport getBlobReferenceSupport() {
- return new BlobReferenceSupport() {
-
- @Override
- public Depot getDepot() {
- return GitPlex.getInstance(DepotManager.class).load(1L);
- }
-
- @Override
- public BlobIdent getBaseBlobIdent() {
- return new BlobIdent("master", "readme.md", FileMode.TYPE_FILE);
- }
- };
- }
+ add(new Link<Void>("test") {
@Override
- protected Depot getDepot() {
- return GitPlex.getInstance(DepotManager.class).load(1L);
+ public void onClick() {
+ System.gc();
}
});
- add(form);
}
}
diff --git a/web/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java b/web/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java
new file mode 100644
index 0000000000..a9b8808844
--- /dev/null
+++ b/web/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java
@@ -0,0 +1,711 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.fileupload.disk;
+
+import static java.lang.String.format;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.FileItemHeaders;
+import org.apache.commons.fileupload.FileUploadException;
+import org.apache.commons.fileupload.ParameterParser;
+import org.apache.commons.fileupload.util.Streams;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.io.output.DeferredFileOutputStream;
+
+/**
+ * <p> The default implementation of the
+ * {@link org.apache.commons.fileupload.FileItem FileItem} interface.
+ *
+ * <p> After retrieving an instance of this class from a {@link
+ * DiskFileItemFactory} instance (see
+ * {@link org.apache.commons.fileupload.servlet.ServletFileUpload
+ * #parseRequest(javax.servlet.http.HttpServletRequest)}), you may
+ * either request all contents of file at once using {@link #get()} or
+ * request an {@link java.io.InputStream InputStream} with
+ * {@link #getInputStream()} and process the file without attempting to load
+ * it into memory, which may come handy with large files.
+ *
+ * <p>Temporary files, which are created for file items, should be
+ * deleted later on. The best way to do this is using a
+ * {@link org.apache.commons.io.FileCleaningTracker}, which you can set on the
+ * {@link DiskFileItemFactory}. However, if you do use such a tracker,
+ * then you must consider the following: Temporary files are automatically
+ * deleted as soon as they are no longer needed. (More precisely, when the
+ * corresponding instance of {@link java.io.File} is garbage collected.)
+ * This is done by the so-called reaper thread, which is started and stopped
+ * automatically by the {@link org.apache.commons.io.FileCleaningTracker} when
+ * there are files to be tracked.
+ * It might make sense to terminate that thread, for example, if
+ * your web application ends. See the section on "Resource cleanup"
+ * in the users guide of commons-fileupload.</p>
+ *
+ * @since FileUpload 1.1
+ *
+ * @version $Id: DiskFileItem.java 1565192 2014-02-06 12:14:16Z markt $
+ */
+public class DiskFileItem
+ implements FileItem {
+
+ // ----------------------------------------------------- Manifest constants
+
+ /**
+ * The UID to use when serializing this instance.
+ */
+ private static final long serialVersionUID = 2237570099615271025L;
+
+ /**
+ * Default content charset to be used when no explicit charset
+ * parameter is provided by the sender. Media subtypes of the
+ * "text" type are defined to have a default charset value of
+ * "ISO-8859-1" when received via HTTP.
+ */
+ public static final String DEFAULT_CHARSET = "ISO-8859-1";
+
+ // ----------------------------------------------------------- Data members
+
+ /**
+ * UID used in unique file name generation.
+ */
+ private static final String UID =
+ UUID.randomUUID().toString().replace('-', '_');
+
+ /**
+ * Counter used in unique identifier generation.
+ */
+ private static final AtomicInteger COUNTER = new AtomicInteger(0);
+
+ /**
+ * The name of the form field as provided by the browser.
+ */
+ private String fieldName;
+
+ /**
+ * The content type passed by the browser, or <code>null</code> if
+ * not defined.
+ */
+ private final String contentType;
+
+ /**
+ * Whether or not this item is a simple form field.
+ */
+ private boolean isFormField;
+
+ /**
+ * The original filename in the user's filesystem.
+ */
+ private final String fileName;
+
+ /**
+ * The size of the item, in bytes. This is used to cache the size when a
+ * file item is moved from its original location.
+ */
+ private long size = -1;
+
+
+ /**
+ * The threshold above which uploads will be stored on disk.
+ */
+ private final int sizeThreshold;
+
+ /**
+ * The directory in which uploaded files will be stored, if stored on disk.
+ */
+ private final File repository;
+
+ /**
+ * Cached contents of the file.
+ */
+ private byte[] cachedContent;
+
+ /**
+ * Output stream for this item.
+ */
+ private transient DeferredFileOutputStream dfos;
+
+ /**
+ * The temporary file to use.
+ */
+ private transient File tempFile;
+
+ /**
+ * File to allow for serialization of the content of this item.
+ */
+ private File dfosFile;
+
+ /**
+ * The file items headers.
+ */
+ private FileItemHeaders headers;
+
+ // ----------------------------------------------------------- Constructors
+
+ /**
+ * Constructs a new <code>DiskFileItem</code> instance.
+ *
+ * @param fieldName The name of the form field.
+ * @param contentType The content type passed by the browser or
+ * <code>null</code> if not specified.
+ * @param isFormField Whether or not this item is a plain form field, as
+ * opposed to a file upload.
+ * @param fileName The original filename in the user's filesystem, or
+ * <code>null</code> if not specified.
+ * @param sizeThreshold The threshold, in bytes, below which items will be
+ * retained in memory and above which they will be
+ * stored as a file.
+ * @param repository The data repository, which is the directory in
+ * which files will be created, should the item size
+ * exceed the threshold.
+ */
+ public DiskFileItem(String fieldName,
+ String contentType, boolean isFormField, String fileName,
+ int sizeThreshold, File repository) {
+ this.fieldName = fieldName;
+ this.contentType = contentType;
+ this.isFormField = isFormField;
+ this.fileName = fileName;
+ this.sizeThreshold = sizeThreshold;
+ this.repository = repository;
+ }
+
+ // ------------------------------- Methods from javax.activation.DataSource
+
+ /**
+ * Returns an {@link java.io.InputStream InputStream} that can be
+ * used to retrieve the contents of the file.
+ *
+ * @return An {@link java.io.InputStream InputStream} that can be
+ * used to retrieve the contents of the file.
+ *
+ * @throws IOException if an error occurs.
+ */
+ public InputStream getInputStream()
+ throws IOException {
+ if (!isInMemory()) {
+ return new FileInputStream(dfos.getFile());
+ }
+
+ if (cachedContent == null) {
+ cachedContent = dfos.getData();
+ }
+ return new ByteArrayInputStream(cachedContent);
+ }
+
+ /**
+ * Returns the content type passed by the agent or <code>null</code> if
+ * not defined.
+ *
+ * @return The content type passed by the agent or <code>null</code> if
+ * not defined.
+ */
+ public String getContentType() {
+ return contentType;
+ }
+
+ /**
+ * Returns the content charset passed by the agent or <code>null</code> if
+ * not defined.
+ *
+ * @return The content charset passed by the agent or <code>null</code> if
+ * not defined.
+ */
+ public String getCharSet() {
+ ParameterParser parser = new ParameterParser();
+ parser.setLowerCaseNames(true);
+ // Parameter parser can handle null input
+ Map<String, String> params = parser.parse(getContentType(), ';');
+ return params.get("charset");
+ }
+
+ /**
+ * Returns the original filename in the client's filesystem.
+ *
+ * @return The original filename in the client's filesystem.
+ * @throws org.apache.commons.fileupload.InvalidFileNameException The file name contains a NUL character,
+ * which might be an indicator of a security attack. If you intend to
+ * use the file name anyways, catch the exception and use
+ * {@link org.apache.commons.fileupload.InvalidFileNameException#getName()}.
+ */
+ public String getName() {
+ return Streams.checkFileName(fileName);
+ }
+
+ // ------------------------------------------------------- FileItem methods
+
+ /**
+ * Provides a hint as to whether or not the file contents will be read
+ * from memory.
+ *
+ * @return <code>true</code> if the file contents will be read
+ * from memory; <code>false</code> otherwise.
+ */
+ public boolean isInMemory() {
+ if (cachedContent != null) {
+ return true;
+ }
+ return dfos.isInMemory();
+ }
+
+ /**
+ * Returns the size of the file.
+ *
+ * @return The size of the file, in bytes.
+ */
+ public long getSize() {
+ if (size >= 0) {
+ return size;
+ } else if (cachedContent != null) {
+ return cachedContent.length;
+ } else if (dfos.isInMemory()) {
+ return dfos.getData().length;
+ } else {
+ return dfos.getFile().length();
+ }
+ }
+
+ /**
+ * Returns the contents of the file as an array of bytes. If the
+ * contents of the file were not yet cached in memory, they will be
+ * loaded from the disk storage and cached.
+ *
+ * @return The contents of the file as an array of bytes.
+ */
+ public byte[] get() {
+ if (isInMemory()) {
+ if (cachedContent == null) {
+ cachedContent = dfos.getData();
+ }
+ return cachedContent;
+ }
+
+ byte[] fileData = new byte[(int) getSize()];
+ InputStream fis = null;
+
+ try {
+ fis = new BufferedInputStream(new FileInputStream(dfos.getFile()));
+ fis.read(fileData);
+ } catch (IOException e) {
+ fileData = null;
+ } finally {
+ if (fis != null) {
+ try {
+ fis.close();
+ } catch (IOException e) {
+ // ignore
+ }
+ }
+ }
+
+ return fileData;
+ }
+
+ /**
+ * Returns the contents of the file as a String, using the specified
+ * encoding. This method uses {@link #get()} to retrieve the
+ * contents of the file.
+ *
+ * @param charset The charset to use.
+ *
+ * @return The contents of the file, as a string.
+ *
+ * @throws UnsupportedEncodingException if the requested character
+ * encoding is not available.
+ */
+ public String getString(final String charset)
+ throws UnsupportedEncodingException {
+ return new String(get(), charset);
+ }
+
+ /**
+ * Returns the contents of the file as a String, using the default
+ * character encoding. This method uses {@link #get()} to retrieve the
+ * contents of the file.
+ *
+ * <b>TODO</b> Consider making this method throw UnsupportedEncodingException.
+ *
+ * @return The contents of the file, as a string.
+ */
+ public String getString() {
+ byte[] rawdata = get();
+ String charset = getCharSet();
+ if (charset == null) {
+ charset = DEFAULT_CHARSET;
+ }
+ try {
+ return new String(rawdata, charset);
+ } catch (UnsupportedEncodingException e) {
+ return new String(rawdata);
+ }
+ }
+
+ /**
+ * A convenience method to write an uploaded item to disk. The client code
+ * is not concerned with whether or not the item is stored in memory, or on
+ * disk in a temporary location. They just want to write the uploaded item
+ * to a file.
+ * <p>
+ * This implementation first attempts to rename the uploaded item to the
+ * specified destination file, if the item was originally written to disk.
+ * Otherwise, the data will be copied to the specified file.
+ * <p>
+ * This method is only guaranteed to work <em>once</em>, the first time it
+ * is invoked for a particular item. This is because, in the event that the
+ * method renames a temporary file, that file will no longer be available
+ * to copy or rename again at a later time.
+ *
+ * @param file The <code>File</code> into which the uploaded item should
+ * be stored.
+ *
+ * @throws Exception if an error occurs.
+ */
+ public void write(File file) throws Exception {
+ if (isInMemory()) {
+ FileOutputStream fout = null;
+ try {
+ fout = new FileOutputStream(file);
+ fout.write(get());
+ } finally {
+ if (fout != null) {
+ fout.close();
+ }
+ }
+ } else {
+ File outputFile = getStoreLocation();
+ if (outputFile != null) {
+ // Save the length of the file
+ size = outputFile.length();
+ /*
+ * The uploaded file is being stored on disk
+ * in a temporary location so move it to the
+ * desired file.
+ */
+ if (!outputFile.renameTo(file)) {
+ BufferedInputStream in = null;
+ BufferedOutputStream out = null;
+ try {
+ in = new BufferedInputStream(
+ new FileInputStream(outputFile));
+ out = new BufferedOutputStream(
+ new FileOutputStream(file));
+ IOUtils.copy(in, out);
+ } finally {
+ if (in != null) {
+ try {
+ in.close();
+ } catch (IOException e) {
+ // ignore
+ }
+ }
+ if (out != null) {
+ try {
+ out.close();
+ } catch (IOException e) {
+ // ignore
+ }
+ }
+ }
+ }
+ } else {
+ /*
+ * For whatever reason we cannot write the
+ * file to disk.
+ */
+ throw new FileUploadException(
+ "Cannot write uploaded file to disk!");
+ }
+ }
+ }
+
+ /**
+ * Deletes the underlying storage for a file item, including deleting any
+ * associated temporary disk file. Although this storage will be deleted
+ * automatically when the <code>FileItem</code> instance is garbage
+ * collected, this method can be used to ensure that this is done at an
+ * earlier time, thus preserving system resources.
+ */
+ public void delete() {
+ cachedContent = null;
+ File outputFile = getStoreLocation();
+ if (outputFile != null && outputFile.exists()) {
+ outputFile.delete();
+ }
+ }
+
+ /**
+ * Returns the name of the field in the multipart form corresponding to
+ * this file item.
+ *
+ * @return The name of the form field.
+ *
+ * @see #setFieldName(java.lang.String)
+ *
+ */
+ public String getFieldName() {
+ return fieldName;
+ }
+
+ /**
+ * Sets the field name used to reference this file item.
+ *
+ * @param fieldName The name of the form field.
+ *
+ * @see #getFieldName()
+ *
+ */
+ public void setFieldName(String fieldName) {
+ this.fieldName = fieldName;
+ }
+
+ /**
+ * Determines whether or not a <code>FileItem</code> instance represents
+ * a simple form field.
+ *
+ * @return <code>true</code> if the instance represents a simple form
+ * field; <code>false</code> if it represents an uploaded file.
+ *
+ * @see #setFormField(boolean)
+ *
+ */
+ public boolean isFormField() {
+ return isFormField;
+ }
+
+ /**
+ * Specifies whether or not a <code>FileItem</code> instance represents
+ * a simple form field.
+ *
+ * @param state <code>true</code> if the instance represents a simple form
+ * field; <code>false</code> if it represents an uploaded file.
+ *
+ * @see #isFormField()
+ *
+ */
+ public void setFormField(boolean state) {
+ isFormField = state;
+ }
+
+ /**
+ * Returns an {@link java.io.OutputStream OutputStream} that can
+ * be used for storing the contents of the file.
+ *
+ * @return An {@link java.io.OutputStream OutputStream} that can be used
+ * for storing the contensts of the file.
+ *
+ * @throws IOException if an error occurs.
+ */
+ public OutputStream getOutputStream()
+ throws IOException {
+ if (dfos == null) {
+ File outputFile = getTempFile();
+ dfos = new DeferredFileOutputStream(sizeThreshold, outputFile);
+ }
+ return dfos;
+ }
+
+ // --------------------------------------------------------- Public methods
+
+ /**
+ * Returns the {@link java.io.File} object for the <code>FileItem</code>'s
+ * data's temporary location on the disk. Note that for
+ * <code>FileItem</code>s that have their data stored in memory,
+ * this method will return <code>null</code>. When handling large
+ * files, you can use {@link java.io.File#renameTo(java.io.File)} to
+ * move the file to new location without copying the data, if the
+ * source and destination locations reside within the same logical
+ * volume.
+ *
+ * @return The data file, or <code>null</code> if the data is stored in
+ * memory.
+ */
+ public File getStoreLocation() {
+ if (dfos == null) {
+ return null;
+ }
+ return dfos.getFile();
+ }
+
+ // ------------------------------------------------------ Protected methods
+
+ /**
+ * Removes the file contents from the temporary storage.
+ */
+ @Override
+ protected void finalize() {
+ File outputFile = dfos.getFile();
+
+ if (outputFile != null && outputFile.exists()) {
+ outputFile.delete();
+ }
+ }
+
+ /**
+ * Creates and returns a {@link java.io.File File} representing a uniquely
+ * named temporary file in the configured repository path. The lifetime of
+ * the file is tied to the lifetime of the <code>FileItem</code> instance;
+ * the file will be deleted when the instance is garbage collected.
+ *
+ * @return The {@link java.io.File File} to be used for temporary storage.
+ */
+ protected File getTempFile() {
+ if (tempFile == null) {
+ File tempDir = repository;
+ if (tempDir == null) {
+ tempDir = new File(System.getProperty("java.io.tmpdir"));
+ }
+
+ String tempFileName = format("upload_%s_%s.tmp", UID, getUniqueId());
+
+ tempFile = new File(tempDir, tempFileName);
+ }
+ return tempFile;
+ }
+
+ // -------------------------------------------------------- Private methods
+
+ /**
+ * Returns an identifier that is unique within the class loader used to
+ * load this class, but does not have random-like apearance.
+ *
+ * @return A String with the non-random looking instance identifier.
+ */
+ private static String getUniqueId() {
+ final int limit = 100000000;
+ int current = COUNTER.getAndIncrement();
+ String id = Integer.toString(current);
+
+ // If you manage to get more than 100 million of ids, you'll
+ // start getting ids longer than 8 characters.
+ if (current < limit) {
+ id = ("00000000" + id).substring(id.length());
+ }
+ return id;
+ }
+
+ /**
+ * Returns a string representation of this object.
+ *
+ * @return a string representation of this object.
+ */
+ @Override
+ public String toString() {
+ return format("name=%s, StoreLocation=%s, size=%s bytes, isFormField=%s, FieldName=%s",
+ getName(), getStoreLocation(), Long.valueOf(getSize()),
+ Boolean.valueOf(isFormField()), getFieldName());
+ }
+
+ // -------------------------------------------------- Serialization methods
+
+ /**
+ * Writes the state of this object during serialization.
+ *
+ * @param out The stream to which the state should be written.
+ *
+ * @throws IOException if an error occurs.
+ */
+ private void writeObject(ObjectOutputStream out) throws IOException {
+ // Read the data
+ if (dfos.isInMemory()) {
+ cachedContent = get();
+ } else {
+ cachedContent = null;
+ dfosFile = dfos.getFile();
+ }
+
+ // write out values
+ out.defaultWriteObject();
+ }
+
+ /**
+ * Reads the state of this object during deserialization.
+ *
+ * @param in The stream from which the state should be read.
+ *
+ * @throws IOException if an error occurs.
+ * @throws ClassNotFoundException if class cannot be found.
+ */
+ private void readObject(ObjectInputStream in)
+ throws IOException, ClassNotFoundException {
+ // read values
+ in.defaultReadObject();
+
+ /* One expected use of serialization is to migrate HTTP sessions
+ * containing a DiskFileItem between JVMs. Particularly if the JVMs are
+ * on different machines It is possible that the repository location is
+ * not valid so validate it.
+ */
+ if (repository != null) {
+ if (repository.isDirectory()) {
+ // Check path for nulls
+ if (repository.getPath().contains("\0")) {
+ throw new IOException(format(
+ "The repository [%s] contains a null character",
+ repository.getPath()));
+ }
+ } else {
+ throw new IOException(format(
+ "The repository [%s] is not a directory",
+ repository.getAbsolutePath()));
+ }
+ }
+
+ OutputStream output = getOutputStream();
+ if (cachedContent != null) {
+ output.write(cachedContent);
+ } else if (dfosFile.exists()) {
+ FileInputStream input = new FileInputStream(dfosFile);
+ IOUtils.copy(input, output);
+ input.close();
+ dfosFile.delete();
+ dfosFile = null;
+ }
+ output.close();
+
+ cachedContent = null;
+ }
+
+ /**
+ * Returns the file item headers.
+ * @return The file items headers.
+ */
+ public FileItemHeaders getHeaders() {
+ return headers;
+ }
+
+ /**
+ * Sets the file item headers.
+ * @param pHeaders The file items headers.
+ */
+ public void setHeaders(FileItemHeaders pHeaders) {
+ headers = pHeaders;
+ }
+
+}