4055: Workspace Uploder enhancement: work with multiple-instances of DnD Workspace Uploader in the DOM
Task-Url: https://support.d4science.org/issues/4055 Added dynamic ids instead of static ids Updated css Updated pom version at 1.3.0 git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/widgets/workspace-uploader@128667 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
fec942629e
commit
37aa0559ba
|
|
@ -1,4 +1,8 @@
|
|||
<ReleaseNotes>
|
||||
<Changeset component="org.gcube.portlets-widgets.workspace-uploader.1-3-0"
|
||||
date="2016-05-18">
|
||||
<Change>[Feature #4055] DnD multiple instances</Change>
|
||||
</Changeset>
|
||||
<Changeset component="org.gcube.portlets-widgets.workspace-uploader.1-2-0"
|
||||
date="2016-05-09">
|
||||
<Change>[Feature #3962] Sequential upload status</Change>
|
||||
|
|
|
|||
2
pom.xml
2
pom.xml
|
|
@ -12,7 +12,7 @@
|
|||
<groupId>org.gcube.portlets.widgets</groupId>
|
||||
<artifactId>workspace-uploader</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
<version>1.2.0-SNAPSHOT</version>
|
||||
<version>1.3.0-SNAPSHOT</version>
|
||||
<name>Workspace Uploader Widget</name>
|
||||
<description>Workspace Uploader Widget allows your application to upload file/s in the gCube Workspace</description>
|
||||
<scm>
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ import org.gcube.portlets.widgets.workspaceuploader.client.uploader.DialogUpload
|
|||
import org.gcube.portlets.widgets.workspaceuploader.client.uploader.WorkspaceFieldsUploadManager;
|
||||
|
||||
import com.google.gwt.core.shared.GWT;
|
||||
import com.google.gwt.user.client.Random;
|
||||
import com.google.gwt.user.client.Window;
|
||||
import com.google.gwt.user.client.ui.HTML;
|
||||
import com.google.gwt.user.client.ui.LayoutPanel;
|
||||
|
|
@ -29,6 +30,10 @@ import com.google.gwt.user.client.ui.Widget;
|
|||
public class MultipleDNDUpload extends LayoutPanel implements
|
||||
HasWorskpaceUploadNotificationListener {
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
|
||||
// private WorkspaceFieldsUploadManager fields;
|
||||
private String idFolder;
|
||||
private UPLOAD_TYPE type;
|
||||
|
|
@ -51,20 +56,44 @@ public class MultipleDNDUpload extends LayoutPanel implements
|
|||
private String currentJsonKey;
|
||||
private boolean isLimitExceeded;
|
||||
|
||||
|
||||
/** The drop target css classes. */
|
||||
public static final String DROP_TARGET_CLASS = "drop_target";
|
||||
public static final String DROP_TARGET_OUTER_CLASS = "drop_target_outer";
|
||||
public static final String DROP_TARGET_INNER_CLASS = "drop_target_inner";
|
||||
public static final String DROP_TARGET_UNIQUE_CHILD_ID = "drop_target_unique_child";
|
||||
|
||||
/** The drop target ids. */
|
||||
private int randomInt = Random.nextInt() + Random.nextInt();
|
||||
private String dropTargetID = DROP_TARGET_CLASS +"-" + randomInt;
|
||||
private String dropTargetOuterID = DROP_TARGET_OUTER_CLASS +"-"+ randomInt;
|
||||
private String dropTargetInnerID = DROP_TARGET_INNER_CLASS +"-"+ randomInt;
|
||||
private String dropTargetUniqueChildID = DROP_TARGET_UNIQUE_CHILD_ID +"-"+ randomInt;
|
||||
|
||||
/**
|
||||
* Instantiates a new DND file reader.
|
||||
*/
|
||||
public MultipleDNDUpload() {
|
||||
this.getElement().setId("drop_target");
|
||||
HTML html = new HTML(
|
||||
"<div id=\"drop_target_outer\"><div id=\"drop_target_inner\"></div></div>");
|
||||
html.getElement().setClassName("container-drop_target");
|
||||
this.getElement().setId(dropTargetID);
|
||||
String dnd = "<div id='"+this.dropTargetOuterID+"' class='"+DROP_TARGET_OUTER_CLASS+"'><div id='"+this.dropTargetInnerID+"' class='"+DROP_TARGET_INNER_CLASS+"'></div></div>";
|
||||
GWT.log(dnd);
|
||||
HTML html = new HTML(dnd);
|
||||
this.add(html);
|
||||
|
||||
// ScriptInjector.fromUrl("workspaceuploader/dndhtmlfileupload.js")
|
||||
// .setWindow(ScriptInjector.TOP_WINDOW).inject();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Instantiates a new multiple dnd upload.
|
||||
*
|
||||
* @param parentId the parent id
|
||||
* @param uploadType the upload type
|
||||
*/
|
||||
public MultipleDNDUpload(String parentId, UPLOAD_TYPE uploadType) {
|
||||
this();
|
||||
setParameters(parentId, uploadType);
|
||||
}
|
||||
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.google.gwt.user.client.ui.LayoutPanel#onAttach()
|
||||
*/
|
||||
|
|
@ -73,7 +102,7 @@ public class MultipleDNDUpload extends LayoutPanel implements
|
|||
super.onAttach();
|
||||
|
||||
if(onlyChild!=null){
|
||||
onlyChild.getElement().setId("drop_target_only_child");
|
||||
onlyChild.getElement().setId(dropTargetUniqueChildID);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -274,6 +303,31 @@ public class MultipleDNDUpload extends LayoutPanel implements
|
|||
return type;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the dropTargetID
|
||||
*/
|
||||
public String getDropTargetID() {
|
||||
|
||||
return dropTargetID;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the dropTargetOuterID
|
||||
*/
|
||||
public String getDropTargetOuterID() {
|
||||
|
||||
return dropTargetOuterID;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @return the dropTargetInnerID
|
||||
*/
|
||||
public String getDropTargetInnerID() {
|
||||
|
||||
return dropTargetInnerID;
|
||||
}
|
||||
|
||||
/**
|
||||
* Reset panel.
|
||||
*
|
||||
|
|
@ -281,15 +335,16 @@ public class MultipleDNDUpload extends LayoutPanel implements
|
|||
* the instance
|
||||
*/
|
||||
private static native void resetPanel(MultipleDNDUpload instance) /*-{
|
||||
var drop_target_inner = instance.@org.gcube.portlets.widgets.workspaceuploader.client.uploader.dragdrop.MultipleDNDUpload::dropTargetInnerID;
|
||||
var drop_target_outer = instance.@org.gcube.portlets.widgets.workspaceuploader.client.uploader.dragdrop.MultipleDNDUpload::dropTargetOuterID;
|
||||
var drop = $wnd.$('#drop_target')[0];
|
||||
|
||||
if (drop === null || drop === undefined) {
|
||||
return;
|
||||
}
|
||||
|
||||
drop.className = "over-false";
|
||||
$wnd.$('#drop_target_inner')[0].className = "";
|
||||
$wnd.$('#drop_target_outer')[0].style.display = "none";
|
||||
$wnd.$('#'+drop_target_inner)[0].className = "";
|
||||
$wnd.$('#'+drop_target_outer)[0].style.display = "none";
|
||||
// $wnd.$('#drop_target_only_child')[0].style.display = "";
|
||||
instance.@org.gcube.portlets.widgets.workspaceuploader.client.uploader.dragdrop.MultipleDNDUpload::setVisibleOnlyChild(Z)(true);
|
||||
}-*/;
|
||||
|
|
@ -303,10 +358,13 @@ public class MultipleDNDUpload extends LayoutPanel implements
|
|||
* the file delimiter
|
||||
* @return the files selected
|
||||
*/
|
||||
public static native void initW3CFileReader(MultipleDNDUpload instance,
|
||||
String fileDelimiter) /*-{
|
||||
public static native void initW3CFileReader(MultipleDNDUpload instance, String fileDelimiter) /*-{
|
||||
|
||||
console.log("initW3CFileReader");
|
||||
var drop_target = instance.@org.gcube.portlets.widgets.workspaceuploader.client.uploader.dragdrop.MultipleDNDUpload::dropTargetID;
|
||||
var drop_target_inner = instance.@org.gcube.portlets.widgets.workspaceuploader.client.uploader.dragdrop.MultipleDNDUpload::dropTargetInnerID;
|
||||
var drop_target_outer = instance.@org.gcube.portlets.widgets.workspaceuploader.client.uploader.dragdrop.MultipleDNDUpload::dropTargetOuterID;
|
||||
var DROP_TARGET_INNER_CLASS = @org.gcube.portlets.widgets.workspaceuploader.client.uploader.dragdrop.MultipleDNDUpload::DROP_TARGET_INNER_CLASS;
|
||||
|
||||
function isFileOverwrite(url, params, msgText){
|
||||
var xhReq = new XMLHttpRequest();
|
||||
|
|
@ -368,9 +426,9 @@ public class MultipleDNDUpload extends LayoutPanel implements
|
|||
}
|
||||
|
||||
if (window.FileReader) {
|
||||
console.log("before load");
|
||||
var drop = $wnd.$('#drop_target')[0];
|
||||
$wnd.$('#drop_target_outer')[0].style.display = "none";
|
||||
console.log("before load "+drop_target);
|
||||
var drop = $wnd.$('#'+drop_target)[0];
|
||||
$wnd.$('#'+drop_target_outer)[0].style.display = "none";
|
||||
|
||||
console.log("drop is " + drop);
|
||||
|
||||
|
|
@ -419,7 +477,7 @@ public class MultipleDNDUpload extends LayoutPanel implements
|
|||
function(e) {
|
||||
console.log('dragenter');
|
||||
drop.className = "over-true";
|
||||
$wnd.$('#drop_target_inner')[0].className = "";
|
||||
$wnd.$('#'+drop_target_inner)[0].className = "";
|
||||
// $wnd.$('#drop_target_only_child')[0].style.display = "none";
|
||||
instance.@org.gcube.portlets.widgets.workspaceuploader.client.uploader.dragdrop.MultipleDNDUpload::setVisibleOnlyChild(Z)(false);
|
||||
|
||||
|
|
@ -442,8 +500,8 @@ public class MultipleDNDUpload extends LayoutPanel implements
|
|||
function(e) {
|
||||
console.log('dragleave');
|
||||
drop.className = "over-false";
|
||||
$wnd.$('#drop_target_inner')[0].className = "";
|
||||
$wnd.$('#drop_target_outer')[0].style.display = "none";
|
||||
$wnd.$('#'+drop_target_inner)[0].className = "";
|
||||
$wnd.$('#'+drop_target_outer)[0].style.display = "none";
|
||||
// $wnd.$('#drop_target_only_child')[0].style.display = "";
|
||||
instance.@org.gcube.portlets.widgets.workspaceuploader.client.uploader.dragdrop.MultipleDNDUpload::setVisibleOnlyChild(Z)(true);
|
||||
instance.@org.gcube.portlets.widgets.workspaceuploader.client.uploader.dragdrop.MultipleDNDUpload::setLimitExceeded(Z)(false);
|
||||
|
|
@ -456,7 +514,8 @@ public class MultipleDNDUpload extends LayoutPanel implements
|
|||
} //
|
||||
console.log('dragover');
|
||||
drop.className = "over-true";
|
||||
$wnd.$('#drop_target_outer')[0].style.display = "";
|
||||
$wnd.$('#'+drop_target_inner)[0].className = DROP_TARGET_INNER_CLASS;
|
||||
$wnd.$('#'+drop_target_outer)[0].style.display = "";
|
||||
instance.@org.gcube.portlets.widgets.workspaceuploader.client.uploader.dragdrop.MultipleDNDUpload::setVisibleOnlyChild(Z)(false);
|
||||
// $wnd.$('#drop_target_only_child')[0].style.display = "none";
|
||||
});
|
||||
|
|
@ -493,7 +552,7 @@ public class MultipleDNDUpload extends LayoutPanel implements
|
|||
|| uploadType === null
|
||||
|| uploadType === undefined) {
|
||||
|
||||
$wnd.$('#drop_target_inner')[0].className = "drop_target_inner_error";
|
||||
$wnd.$('#'+drop_target_inner)[0].className = "drop_target_inner_error";
|
||||
var error = "Folder destionation or upload type not specified";
|
||||
instance.@org.gcube.portlets.widgets.workspaceuploader.client.uploader.dragdrop.MultipleDNDUpload::showAlert(Ljava/lang/String;)(error);
|
||||
return;
|
||||
|
|
@ -621,7 +680,7 @@ public class MultipleDNDUpload extends LayoutPanel implements
|
|||
// addEventHandler(drop, 'dragover', cancel);
|
||||
// addEventHandler(drop, 'dragenter', cancel);
|
||||
} else {
|
||||
$wnd.$('#drop_target')[0].innerHTML = 'Your browser does not support the HTML5 FileReader.';
|
||||
$wnd.$('#'+drop_target)[0].innerHTML = 'Your browser does not support the HTML5 FileReader.';
|
||||
}
|
||||
}-*/;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
/** Add css rules here for your application. */
|
||||
/** Example rules used by the template application (remove for your app) */
|
||||
h1 {
|
||||
font-size: 2em;
|
||||
font-weight: bold;
|
||||
|
|
@ -118,9 +116,6 @@ h1 {
|
|||
/* cursor: pointer; */
|
||||
/* color: #FFF; */
|
||||
/* } */
|
||||
.container-drop_target {
|
||||
/* position: relative; */
|
||||
}
|
||||
|
||||
.textbox:hover {
|
||||
opacity: 1;
|
||||
|
|
@ -130,7 +125,14 @@ h1 {
|
|||
padding-top: 50px;
|
||||
}
|
||||
|
||||
#drop_target_outer {
|
||||
|
||||
/************ DRAG & DROP *******************/
|
||||
|
||||
.container-drop_target {
|
||||
/* position: relative; */
|
||||
}
|
||||
|
||||
.drop_target_outer {
|
||||
/* position: fixed; */
|
||||
top: 0;
|
||||
left: 0;
|
||||
|
|
@ -138,7 +140,7 @@ h1 {
|
|||
height: 100%;
|
||||
}
|
||||
|
||||
#drop_target_inner {
|
||||
.drop_target_inner {
|
||||
width: 50%;
|
||||
height: 50%;
|
||||
top: 25%;
|
||||
|
|
@ -150,8 +152,7 @@ h1 {
|
|||
/* background: orange; */
|
||||
}
|
||||
|
||||
/* Demo One */
|
||||
#drop_target {
|
||||
.drop_target {
|
||||
/* border: 5px dashed #D9D9D9; */ /* border-radius: 10px; */
|
||||
/* padding: 50%; */ /* text-align: center; */ /* display: none; */
|
||||
width: 100%;
|
||||
|
|
@ -181,7 +182,8 @@ h1 {
|
|||
|
||||
} */
|
||||
|
||||
/* Demo One */
|
||||
.drop_target_inner_error {
|
||||
background-image: url("status-error.png") !important;
|
||||
}
|
||||
|
||||
/************ END DRAG & DROP *******************/
|
||||
|
|
|
|||
Loading…
Reference in New Issue