summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormconway <mconway@SILS-PC44.ad.unc.edu>2012-08-23 15:41:35 (GMT)
committer mconway <mconway@SILS-PC44.ad.unc.edu>2012-08-23 15:41:35 (GMT)
commitfd31506182165ad9243fca0d5cd1f62af224e16a (patch)
treeedca2ee464de6501d08643fb53a5ec590bd5d11f
parent72a6e254bfa85f901d7061ae3c42415956ddf622 (diff)
downloadQCG-Data-fd31506182165ad9243fca0d5cd1f62af224e16a.zip
QCG-Data-fd31506182165ad9243fca0d5cd1f62af224e16a.tar.gz
QCG-Data-fd31506182165ad9243fca0d5cd1f62af224e16a.tar.bz2
[#949] reported errors in wni7 ie
-rw-r--r--idrop-web/web-app/js/mydrop/home.js15
1 files changed, 12 insertions, 3 deletions
diff --git a/idrop-web/web-app/js/mydrop/home.js b/idrop-web/web-app/js/mydrop/home.js
index a21b69f..593abef 100644
--- a/idrop-web/web-app/js/mydrop/home.js
+++ b/idrop-web/web-app/js/mydrop/home.js
@@ -64,7 +64,6 @@ function setTreeViewToHomeDirectory() {
* @return
*/
function retrieveBrowserFirstView(type, path) {
-
if (dataTree != null) {
dataTree = null;
$("#dataTreeDiv").html("");
@@ -113,7 +112,7 @@ function retrieveBrowserFirstView(type, path) {
* @return
*/
function browserFirstViewRetrieved(data) {
-
+
baseAbsPath = data[0].attr.absPath;
baseAbsPathAsArrayOfPathElements = baseAbsPath.split("/");
dataTree = $("#dataTreeDiv").jstree(
@@ -1791,6 +1790,7 @@ function addANodeToTheParentInTheTree(parentAbsolutePath, childRelativeName) {
* irods absolute path
*/
function selectTreePathFromIrodsPath(irodsAbsolutePath) {
+
if (irodsAbsolutePath == null || irodsAbsolutePath.length == 0) {
throw "irodsAbsolutePath is missing";
}
@@ -1935,7 +1935,7 @@ function splitPathAndPerformOperationAtGivenTreePath(path, currentNode,
*/
function performOperationAtGivenTreePath(path, currentNode, currentIndex,
operationToPerform) {
-
+
if (dataTree == null) {
return false;
}
@@ -1957,6 +1957,15 @@ function performOperationAtGivenTreePath(path, currentNode, currentIndex,
currentNode = $.jstree._reference(dataTree).get_container();
var children = $.jstree._reference(dataTree)._get_children(currentNode);
currentNode = children[0];
+ // fix for a bug in ie9 that surfaces on initial load, otherwise does infinite recursion...
+ if (currentNode == null) {
+ // alert("currentNode is null");
+ return;
+ } else if (currentNode == undefined) {
+ // alert("currentNode is undefined");
+ return;
+ }
+
performOperationAtGivenTreePath(path, currentNode, currentIndex,
operationToPerform);
return;