#19124 コンテンツ閲覧のインデックスが効かない問題対応

abvw/common/js/jquery.treeview.js

@@ -293,10 +293,6 @@ function TreeNode() {
     */
     */
 };
 };
 
 
-
-
-
-
 // Add category node
 // Add category node
 function AddCategory(targetTreeView, sourceTreeNode, targetTreeNode, callbackFunction) {
 function AddCategory(targetTreeView, sourceTreeNode, targetTreeNode, callbackFunction) {
 	var branches;
 	var branches;
@@ -408,7 +404,8 @@ function AddItem(targetTreeView, sourceTreeNodeItem, targetTreeNode, callbackFun
 		}
 		}
 		else {
 		else {
 			if(sourceTreeNodeItem.ContentCount == 0){
 			if(sourceTreeNodeItem.ContentCount == 0){
-				if (callbackFunction != undefined && callbackFunction != null) {
+				//#19124 インデックスのページ移動が効かなくなった対応 targetTreeView.treeViewType
+				if (callbackFunction != undefined && callbackFunction != null && targetTreeView.treeViewType == "normal") {
 					scriptCallback = ' id="' + sourceTreeNodeItem.Id + '"';
 					scriptCallback = ' id="' + sourceTreeNodeItem.Id + '"';
 				}
 				}
 				tmpClass = JQ_TREEVIEW.CLASS_FILE_ZERO;
 				tmpClass = JQ_TREEVIEW.CLASS_FILE_ZERO;
@@ -423,7 +420,8 @@ function AddItem(targetTreeView, sourceTreeNodeItem, targetTreeNode, callbackFun
 			}
 			}
 			else {
 			else {
 				if(targetTreeView.TotalCount == 0){
 				if(targetTreeView.TotalCount == 0){
-					if (callbackFunction != undefined && callbackFunction != null) {
+					//#19124 インデックスのページ移動が効かなくなった対応 targetTreeView.treeViewType
+					if (callbackFunction != undefined && callbackFunction != null && targetTreeView.treeViewType == "normal") {
 						scriptCallback = ' id="' + sourceTreeNodeItem.Id + '"';
 						scriptCallback = ' id="' + sourceTreeNodeItem.Id + '"';
 					}
 					}
 					tmpClass = JQ_TREEVIEW.CLASS_FILE_ZERO;
 					tmpClass = JQ_TREEVIEW.CLASS_FILE_ZERO;
@@ -437,7 +435,8 @@ function AddItem(targetTreeView, sourceTreeNodeItem, targetTreeNode, callbackFun
 			}
 			}
 			else {
 			else {
 				if(sourceTreeNodeItem.ContentCount == 0){
 				if(sourceTreeNodeItem.ContentCount == 0){
-					if (callbackFunction != undefined && callbackFunction != null) {
+					//#19124 インデックスのページ移動が効かなくなった対応 targetTreeView.treeViewType
+					if (callbackFunction != undefined && callbackFunction != null && targetTreeView.treeViewType == "normal") {
 						scriptCallback = ' id="' + sourceTreeNodeItem.Id + '"';
 						scriptCallback = ' id="' + sourceTreeNodeItem.Id + '"';
 					}
 					}
 					tmpClass = JQ_TREEVIEW.CLASS_FILE_ZERO;
 					tmpClass = JQ_TREEVIEW.CLASS_FILE_ZERO;
@@ -554,6 +553,7 @@ function TreeView() {
     this.IsShowTotal = true;
     this.IsShowTotal = true;
     this.ExpandNodes = [];
     this.ExpandNodes = [];
     this.CategoryTagName = "span";  // Use to expand/ not expand when clicking in
     this.CategoryTagName = "span";  // Use to expand/ not expand when clicking in
+    this.treeViewType = "normal"; //#19124 コンテンツ閲覧のインデックスでページ移動しなくなった対応のため
     this.Show = function (containerId, nodes, callbackFunctionName) {
     this.Show = function (containerId, nodes, callbackFunctionName) {
         var tree = this;
         var tree = this;
         tree.Id = containerId;
         tree.Id = containerId;
@@ -586,6 +586,7 @@ function TreeViewIndex() {
     this.TotalCount = 0;
     this.TotalCount = 0;
     this.IsShowTotal = true;
     this.IsShowTotal = true;
     this.CategoryTagName = "span";
     this.CategoryTagName = "span";
+    this.treeViewType = "index"; //#19124  コンテンツ閲覧のインデックスでページ移動しなくなった対応のため
     this.Show = function (containerId, nodes, callbackFunctionName) {
     this.Show = function (containerId, nodes, callbackFunctionName) {
         var tree = this;
         var tree = this;
         tree.Id = containerId;
         tree.Id = containerId;