diff --git a/public/index.html b/public/index.html index c009e128..647288a0 100755 --- a/public/index.html +++ b/public/index.html @@ -73,11 +73,7 @@ window.location.hash = $(this).attr("name"); return false; }); - } - // window.addEventListener("popstate", function(e) { - // console.log("popstate",e); - // history.go(-2); - // }, false); + } diff --git a/src/modules/page/layers/ImageLayerOfCommentHOC.js b/src/modules/page/layers/ImageLayerOfCommentHOC.js index a2482612..3e51d8c1 100644 --- a/src/modules/page/layers/ImageLayerOfCommentHOC.js +++ b/src/modules/page/layers/ImageLayerOfCommentHOC.js @@ -16,20 +16,25 @@ export function ImageLayerOfCommentHOC(options = {}) { onDelegateClick = (event) => { const imageSrc = event.target.src || event.target.getAttribute('src') || event.target.getAttribute('href') // 判断imageSrc是否是图片 - const fileName = event.target.innerHTML.trim() - if (isImageExtension(imageSrc.trim()) || isImageExtension(fileName) || event.target.tagName == 'IMG') { - // 非回复里的头像图片; 非emoticons - if (imageSrc.indexOf('/images/avatars/User') === -1 && - imageSrc.indexOf('kindeditor/plugins/emoticons') === -1) { - this.setState({ - showImage: true, - imageSrc, - }) + const fileName = event.target.innerHTML.trim(); + const parentNodeUrl = event.target.parentNode && event.target.parentNode.getAttribute('href'); + if(parentNodeUrl){ + window.location.href = parentNodeUrl; + }else{ + if (isImageExtension(imageSrc.trim()) || isImageExtension(fileName) || event.target.tagName == 'IMG') { + // 非回复里的头像图片; 非emoticons + if (imageSrc.indexOf('/images/avatars/User') === -1 && + imageSrc.indexOf('kindeditor/plugins/emoticons') === -1) { + this.setState({ + showImage: true, + imageSrc, + }) + } + event.stopPropagation() + event.preventDefault && event.preventDefault() + event.originalEvent.preventDefault() + return false; } - event.stopPropagation() - event.preventDefault && event.preventDefault() - event.originalEvent.preventDefault() - return false; } }