summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java2
-rw-r--r--idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/systraygui/Bundle.properties1
-rw-r--r--idrop-web/grails-app/controllers/org/irods/mydrop/controller/BrowseController.groovy2
-rw-r--r--idrop-web/grails-app/views/browse/browseDetails.gsp100
-rw-r--r--idrop-web/release_notes.txt4
-rw-r--r--idrop-web/web-app/js/jquery.jstree.js8
-rw-r--r--idrop-web/web-app/js/mydrop/home.js100
7 files changed, 114 insertions, 103 deletions
diff --git a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java
index c64fe64..8fd48d3 100644
--- a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java
+++ b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java
@@ -1,4 +1,4 @@
package org.irods.jargon.idrop.lite;
public final class Version {
- public static String VERSION="20120828-1410";
+ public static String VERSION="20120828-1415";
}
diff --git a/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/systraygui/Bundle.properties b/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/systraygui/Bundle.properties
index b951a5f..825a534 100644
--- a/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/systraygui/Bundle.properties
+++ b/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/systraygui/Bundle.properties
@@ -114,3 +114,4 @@ IDROPConfigurationPanel.lblPort.AccessibleContext.accessibleDescription=Port num
IDROPConfigurationPanel.lblZone.AccessibleContext.accessibleDescription=Zone of currently logged in grid
IDROPConfigurationPanel.lblResource.AccessibleContext.accessibleDescription=Current default resource
IDROPConfigurationPanel.lblUserName.AccessibleContext.accessibleName=User name of currently logged in grid
+IDROPConfigurationPanel.lblResource.text=resource
diff --git a/idrop-web/grails-app/controllers/org/irods/mydrop/controller/BrowseController.groovy b/idrop-web/grails-app/controllers/org/irods/mydrop/controller/BrowseController.groovy
index dc1f952..708cf8b 100644
--- a/idrop-web/grails-app/controllers/org/irods/mydrop/controller/BrowseController.groovy
+++ b/idrop-web/grails-app/controllers/org/irods/mydrop/controller/BrowseController.groovy
@@ -265,7 +265,7 @@ class BrowseController {
if (absPath == null) {
throw new JargonException("no absolute path passed to the method")
}
-
+
log.info "displayBrowseGridDetails for absPath: ${absPath}"
try {
CollectionAndDataObjectListAndSearchAO collectionAndDataObjectListAndSearchAO = irodsAccessObjectFactory.getCollectionAndDataObjectListAndSearchAO(irodsAccount)
diff --git a/idrop-web/grails-app/views/browse/browseDetails.gsp b/idrop-web/grails-app/views/browse/browseDetails.gsp
index c449b06..bdf86d9 100644
--- a/idrop-web/grails-app/views/browse/browseDetails.gsp
+++ b/idrop-web/grails-app/views/browse/browseDetails.gsp
@@ -99,105 +99,7 @@ ${entry.displayDataSize}
$("#menuDownload").hide();
});
- /* click twistie to open details table info */
- function browseDetailsClick(minMaxIcon) {
-
- var parentOfIcon = minMaxIcon.parentNode;
-
- /*
- if (parentOfIcon == null) {
- alert("parentOfIcon is null!");
- } else {
- alert("parentOfIcon is:" + parentOfIcon);
- }*/
-
- var nTr = parentOfIcon.parentNode;
-
- /*
- if (nTr == null) {
- alert("nTr is null!");
- } else {
- alert("nTr is:" + nTr);
- }
- */
-
- if (minMaxIcon.parentNode.innerHTML.match('circle-minus')) {
- lcCloseTableNodes(dataTable);
- } else {
- try {
- browseDataDetailsFunction(minMaxIcon, nTr);
- } catch (err) {
- console.log("error in detailsClick():" + err);
- }
-
- }
- }
-
- /** called by browseDetailsClick() when it is decided that the details table row should be opened, go
- to server and get the details.
- */
- function browseDataDetailsFunction(clickedIcon, rowActionIsOn) {
- /* Open this row */
- lcCloseTableNodes(dataTable);
- // nTr points to row and has absPath in id
- var absPath = $(rowActionIsOn).attr('id');
- //alert("absPath:" + absPath);
- var detailsId = "details_" + absPath;
- var detailsHtmlDiv = "details_html_" + absPath;
- var buildDetailsLayoutVal = buildDetailsLayout(detailsId);
- clickedIcon.setAttribute("class", "ui-icon ui-icon-circle-minus");
- newRowNode = dataTable.fnOpen(rowActionIsOn,
- buildDetailsLayoutVal, 'details');
- newRowNode.setAttribute("id", detailsId);
- askForBrowseDetailsPulldown(absPath, detailsId)
-
- }
-
- /** The table row is being opened, and the query has returned from the server with the data, fill in the table row
- */
- function buildDetailsLayout(detailsId) {
- var td = document.createElement("TD");
- td.setAttribute("colspan", "4");
-
- var detailsPulldownDiv = document.createElement("DIV");
- detailsPulldownDiv.setAttribute("id", detailsId);
- detailsPulldownDiv.setAttribute("class", "detailsPulldown");
- var img = document.createElement('IMG');
- img.setAttribute("src", context + "/images/ajax-loader.gif");
- detailsPulldownDiv.appendChild(img);
- td.appendChild(detailsPulldownDiv);
- return $(td).html();
- }
-
- function askForBrowseDetailsPulldown(absPath, detailsId) {
-
- var url = "/browse/miniInfo";
- absPath = absPath;
- var params = {
- absPath:absPath
- }
-
- lcSendValueWithParamsAndPlugHtmlInDiv(url, params, ".details",
- null);
-
- }
-
- function clickOnPathInBrowseDetails(data) {
- if (data == null) {
- throw new Exception("no absolute path provided");
- }
- // show main browse tab
-
- splitPathAndPerformOperationAtGivenTreePath(data, null,
- null, function(path, dataTree, currentNode){
-
- $.jstree._reference(dataTree).open_node(currentNode);
- $.jstree._reference(dataTree).select_node(currentNode, true);
-
- });
- }
-
-
+
</script> \ No newline at end of file
diff --git a/idrop-web/release_notes.txt b/idrop-web/release_notes.txt
index d895585..f7582fe 100644
--- a/idrop-web/release_notes.txt
+++ b/idrop-web/release_notes.txt
@@ -16,7 +16,6 @@ This is a release of iDrop web version 1.0.1
Note that the following bug and feature requests are logged in GForge with related commit information [[https://code.renci.org/gf/project/irodsidrop/tracker/]]
-
==Bug Fixes==
* [#711] post copy via tree context menu - unable to browse to a location
@@ -36,6 +35,9 @@ Note that the following bug and feature requests are logged in GForge with relat
* [#942] Bulk delete of coll with children fails silently
+* [#950] unable to browse to location message in idrop web tree for new safari/mac
+** temp catch of icon assignment added as shim in jstree javascript
+
==Features==
* [#116] browse/search/tab memory
diff --git a/idrop-web/web-app/js/jquery.jstree.js b/idrop-web/web-app/js/jquery.jstree.js
index baba5e8..42fdc0c 100644
--- a/idrop-web/web-app/js/jquery.jstree.js
+++ b/idrop-web/web-app/js/jquery.jstree.js
@@ -1815,7 +1815,13 @@
if(m.language) { tmp.addClass(m.language); }
}
tmp.prepend("<ins class='jstree-icon'>&#160;</ins>");
- if(!m.icon && js.icon) { m.icon = js.icon; }
+ if(!m.icon && js.icon) {
+ // shim for safari/Mac osX 10.8 per
+ try {
+ m.icon = js.icon;
+ } catch(err) {
+ }
+ }
if(m.icon) {
if(m.icon.indexOf("/") === -1) { tmp.children("ins").addClass(m.icon); }
else { tmp.children("ins").css("background","url('" + m.icon + "') center center no-repeat"); }
diff --git a/idrop-web/web-app/js/mydrop/home.js b/idrop-web/web-app/js/mydrop/home.js
index 593abef..bc37fd5 100644
--- a/idrop-web/web-app/js/mydrop/home.js
+++ b/idrop-web/web-app/js/mydrop/home.js
@@ -2109,6 +2109,106 @@ function setTreeToRoot() {
}
+/* click twistie to open details table info */
+function browseDetailsClick(minMaxIcon) {
+
+ var parentOfIcon = minMaxIcon.parentNode;
+
+ /*
+ if (parentOfIcon == null) {
+ alert("parentOfIcon is null!");
+ } else {
+ alert("parentOfIcon is:" + parentOfIcon);
+ }*/
+
+ var nTr = parentOfIcon.parentNode;
+
+ /*
+ if (nTr == null) {
+ alert("nTr is null!");
+ } else {
+ alert("nTr is:" + nTr);
+ }
+ */
+
+ if (minMaxIcon.parentNode.innerHTML.match('circle-minus')) {
+ lcCloseTableNodes(dataTable);
+ } else {
+ try {
+ browseDataDetailsFunction(minMaxIcon, nTr);
+ } catch (err) {
+ console.log("error in detailsClick():" + err);
+ }
+
+ }
+}
+
+/** called by browseDetailsClick() when it is decided that the details table row should be opened, go
+to server and get the details.
+*/
+function browseDataDetailsFunction(clickedIcon, rowActionIsOn) {
+ /* Open this row */
+ lcCloseTableNodes(dataTable);
+ // nTr points to row and has absPath in id
+ var absPath = $(rowActionIsOn).attr('id');
+ //alert("absPath:" + absPath);
+ var detailsId = "details_" + absPath;
+ var detailsHtmlDiv = "details_html_" + absPath;
+ var buildDetailsLayoutVal = buildDetailsLayout(detailsId);
+ clickedIcon.setAttribute("class", "ui-icon ui-icon-circle-minus");
+ newRowNode = dataTable.fnOpen(rowActionIsOn,
+ buildDetailsLayoutVal, 'details');
+ newRowNode.setAttribute("id", detailsId);
+ askForBrowseDetailsPulldown(absPath, detailsId)
+
+}
+
+/** The table row is being opened, and the query has returned from the server with the data, fill in the table row
+*/
+function buildDetailsLayout(detailsId) {
+ var td = document.createElement("TD");
+ td.setAttribute("colspan", "4");
+
+ var detailsPulldownDiv = document.createElement("DIV");
+ detailsPulldownDiv.setAttribute("id", detailsId);
+ detailsPulldownDiv.setAttribute("class", "detailsPulldown");
+ var img = document.createElement('IMG');
+ img.setAttribute("src", context + "/images/ajax-loader.gif");
+ detailsPulldownDiv.appendChild(img);
+ td.appendChild(detailsPulldownDiv);
+ return $(td).html();
+}
+
+function askForBrowseDetailsPulldown(absPath, detailsId) {
+
+ var url = "/browse/miniInfo";
+ absPath = absPath;
+ var params = {
+ absPath:absPath
+ }
+
+ lcSendValueWithParamsAndPlugHtmlInDiv(url, params, ".details",
+ null);
+
+}
+
+function clickOnPathInBrowseDetails(data) {
+ if (data == null) {
+ throw new Exception("no absolute path provided");
+ }
+ // show main browse tab
+
+ splitPathAndPerformOperationAtGivenTreePath(data, null,
+ null, function(path, dataTree, currentNode){
+
+ $.jstree._reference(dataTree).open_node(currentNode);
+ $.jstree._reference(dataTree).select_node(currentNode, true);
+
+ });
+}
+
+
+
function showOverwriteOptionDialog(message) {
/*