Author: solomax
Date: Wed Jan 18 05:00:15 2017
New Revision: 1779289
URL: http://svn.apache.org/viewvc?rev=1779289&view=rev
Log:
[OPENMEETINGS-1527] key modifiers are passed to server
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java?rev=1779289&r1=1779288&r2=1779289&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java
Wed Jan 18 05:00:15 2017
@@ -40,6 +40,9 @@ import com.googlecode.wicket.jquery.ui.m
public class FileItemTree extends DefaultNestedTree<FileItem> {
private static final long serialVersionUID = 1L;
private final static String CSS_CLASS_FILE = "file ";
+ private final static String PARAM_MOD = "mod";
+ private final static String PARAM_SHIFT = "s";
+ private final static String PARAM_CTRL = "c";
final FileTreePanel treePanel;
public FileItemTree(String id, FileTreePanel treePanel,
ITreeProvider<FileItem> tp) {
@@ -49,12 +52,12 @@ public class FileItemTree extends Defaul
}
private void onClick(AjaxRequestTarget target, FileItem f) {
- String mod =
getRequest().getRequestParameters().getParameterValue("modifiers").toOptionalString();
+ String mod =
getRequest().getRequestParameters().getParameterValue(PARAM_MOD).toOptionalString();
boolean shift = false, ctrl = false;
if (!Strings.isEmpty(mod)) {
JSONObject o = new JSONObject(mod);
- shift = o.optBoolean("shift");
- ctrl = o.optBoolean("ctrl");
+ shift = o.optBoolean(PARAM_SHIFT);
+ ctrl = o.optBoolean(PARAM_CTRL);
}
treePanel.setSelected(f, target, shift, ctrl);
if (Type.Folder == f.getType() && getState(f) ==
State.COLLAPSED) {
@@ -114,7 +117,9 @@ public class FileItemTree extends Defaul
@Override
protected void
updateAjaxAttributes(AjaxRequestAttributes attributes) {
super.updateAjaxAttributes(attributes);
-
attributes.getDynamicExtraParameters().add("return {modifiers:
JSON.stringify({shift: attrs.event.shiftKey, ctrl: attrs.event.ctrlKey})};");
+
attributes.getDynamicExtraParameters().add(
+
String.format("return {%s: JSON.stringify({%s: attrs.event.shiftKey, %s:
attrs.event.ctrlKey})};"
+
, PARAM_MOD, PARAM_SHIFT, PARAM_CTRL));
}
};
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java?rev=1779289&r1=1779288&r2=1779289&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java
Wed Jan 18 05:00:15 2017
@@ -40,6 +40,9 @@ import com.googlecode.wicket.jquery.ui.m
public class FileItemTree extends DefaultNestedTree<FileItem> {
private static final long serialVersionUID = 1L;
private final static String CSS_CLASS_FILE = "file ";
+ private final static String PARAM_MOD = "mod";
+ private final static String PARAM_SHIFT = "s";
+ private final static String PARAM_CTRL = "c";
final FileTreePanel treePanel;
public FileItemTree(String id, FileTreePanel treePanel,
ITreeProvider<FileItem> tp) {
@@ -49,12 +52,12 @@ public class FileItemTree extends Defaul
}
private void onClick(AjaxRequestTarget target, FileItem f) {
- String mod =
getRequest().getRequestParameters().getParameterValue("modifiers").toOptionalString();
+ String mod =
getRequest().getRequestParameters().getParameterValue(PARAM_MOD).toOptionalString();
boolean shift = false, ctrl = false;
if (!Strings.isEmpty(mod)) {
JSONObject o = new JSONObject(mod);
- shift = o.optBoolean("shift");
- ctrl = o.optBoolean("ctrl");
+ shift = o.optBoolean(PARAM_SHIFT);
+ ctrl = o.optBoolean(PARAM_CTRL);
}
treePanel.setSelected(f, target, shift, ctrl);
if (Type.Folder == f.getType() && getState(f) ==
State.COLLAPSED) {
@@ -114,7 +117,9 @@ public class FileItemTree extends Defaul
@Override
protected void
updateAjaxAttributes(AjaxRequestAttributes attributes) {
super.updateAjaxAttributes(attributes);
-
attributes.getDynamicExtraParameters().add("return {modifiers:
JSON.stringify({shift: attrs.event.shiftKey, ctrl: attrs.event.ctrlKey})};");
+
attributes.getDynamicExtraParameters().add(
+
String.format("return {%s: JSON.stringify({%s: attrs.event.shiftKey, %s:
attrs.event.ctrlKey})};"
+
, PARAM_MOD, PARAM_SHIFT, PARAM_CTRL));
}
};
}
