diff options
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | src/client/util/request-image-size.js | 2 | ||||
| -rw-r--r-- | src/client/views/search/Pager.tsx | 78 | ||||
| -rw-r--r-- | src/client/views/search/SearchItem.tsx | 6 |
4 files changed, 6 insertions, 82 deletions
diff --git a/package.json b/package.json index caf2c469f..0ff9306b3 100644 --- a/package.json +++ b/package.json @@ -217,4 +217,4 @@ "xoauth2": "^1.2.0", "youtube": "^0.1.0" } -}
\ No newline at end of file +} diff --git a/src/client/util/request-image-size.js b/src/client/util/request-image-size.js index 257990811..27605d167 100644 --- a/src/client/util/request-image-size.js +++ b/src/client/util/request-image-size.js @@ -10,7 +10,7 @@ */ const request = require('request'); -// const imageSize = require('image-size'); +const imageSize = require('image-size'); const HttpError = require('standard-http-error'); module.exports = function requestImageSize(options) { diff --git a/src/client/views/search/Pager.tsx b/src/client/views/search/Pager.tsx deleted file mode 100644 index 9bcfb1676..000000000 --- a/src/client/views/search/Pager.tsx +++ /dev/null @@ -1,78 +0,0 @@ -import * as React from 'react'; -import { observer } from 'mobx-react'; -import { faArrowCircleRight, faArrowCircleLeft } from '@fortawesome/free-solid-svg-icons'; -import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; -import { library } from '@fortawesome/fontawesome-svg-core'; -import "./Pager.scss"; -import { SearchBox } from './SearchBox'; -import { observable, action } from 'mobx'; -import { FilterBox } from './FilterBox'; - -library.add(faArrowCircleRight); -library.add(faArrowCircleLeft); - -@observer -export class Pager extends React.Component { - - @observable _leftHover: boolean = false; - @observable _rightHover: boolean = false; - - @action - onLeftClick(e: React.PointerEvent) { - FilterBox.Instance._pointerTime = e.timeStamp; - if (SearchBox.Instance._pageNum > 0) { - SearchBox.Instance._pageNum -= 1; - } - } - - @action - onRightClick(e: React.PointerEvent) { - FilterBox.Instance._pointerTime = e.timeStamp; - if (SearchBox.Instance._pageNum + 1 < SearchBox.Instance._maxNum) { - SearchBox.Instance._pageNum += 1; - } - } - - @action.bound - mouseInLeft() { - this._leftHover = true; - } - - @action.bound - mouseOutLeft() { - this._leftHover = false; - } - - @action.bound - mouseInRight() { - this._rightHover = true; - } - - @action.bound - mouseOutRight() { - this._rightHover = false; - } - - render() { - return ( - <div className="search-pager"> - <div className="search-arrows"> - <div className = "arrow" - onPointerDown = {this.onLeftClick} style = {SearchBox.Instance._pageNum === 0 ? {opacity: .2} : this._leftHover ? {opacity: 1} : {opacity: .7}} - onMouseEnter = {this.mouseInLeft} onMouseLeave = {this.mouseOutLeft}> - <FontAwesomeIcon className="fontawesome-icon" icon={faArrowCircleLeft} /> - </div> - <div className="pager-title"> - page {SearchBox.Instance._pageNum + 1} of {SearchBox.Instance._maxNum} - </div> - <div className = "arrow" - onPointerDown = {this.onRightClick} style = {SearchBox.Instance._pageNum === SearchBox.Instance._maxNum-1 ? {opacity: .2} : this._rightHover ? {opacity: 1} : {opacity: .7}} - onMouseEnter = {this.mouseInRight} onMouseLeave = {this.mouseOutRight}> - <FontAwesomeIcon className="fontawesome-icon" icon={faArrowCircleRight} /> - </div> - </div> - </div> - ); - } - -}
\ No newline at end of file diff --git a/src/client/views/search/SearchItem.tsx b/src/client/views/search/SearchItem.tsx index bdf13b144..0390359b3 100644 --- a/src/client/views/search/SearchItem.tsx +++ b/src/client/views/search/SearchItem.tsx @@ -340,6 +340,8 @@ export class SearchItem extends React.Component<SearchItemProps> { } render() { + const doc1 = Cast(this.props.doc.anchor1, Doc); + const doc2 = Cast(this.props.doc.anchor2, Doc); return ( <div className="search-overview" onPointerDown={this.pointerDown} onContextMenu={this.onContextMenu}> <div className="search-item" onPointerEnter={this.highlightDoc} onPointerLeave={this.unHighlightDoc} id="result" @@ -363,8 +365,8 @@ export class SearchItem extends React.Component<SearchItemProps> { </div> </div> <div className="searchBox-instances"> - {this.props.doc.type === DocumentType.LINK ? <LinkContextMenu doc1={Cast(this.props.doc.anchor1, Doc, new Doc())} doc2={Cast(this.props.doc.anchor2, Doc, new Doc())} /> : - <SelectorContextMenu {...this.props} />} + {(doc1 instanceof Doc && doc2 instanceof Doc) ? this.props.doc.type === DocumentType.LINK ? <LinkContextMenu doc1={doc1} doc2={doc2} /> : + <SelectorContextMenu {...this.props} /> : null} </div> </div> ); |