From c911bb9c895211aeb3b95ccd191ee3d608ac6de8 Mon Sep 17 00:00:00 2001 From: Janusz Mordarski Date: Mon, 12 Mar 2018 11:10:33 +0100 Subject: [PATCH 1/2] Compatibility with React v15.5+ --- Pagination.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Pagination.js b/Pagination.js index 1495b36..dd3ca2a 100644 --- a/Pagination.js +++ b/Pagination.js @@ -1,4 +1,5 @@ -import React, { findDOMNode, Component, PropTypes } from 'react'; +import React, { findDOMNode, Component } from 'react'; +import PropTypes from "prop-types"; export default class Pagination extends Component { render() { From a1e5a5c7ebffa2a2051be301eefac872c6336689 Mon Sep 17 00:00:00 2001 From: Janusz Mordarski Date: Mon, 12 Mar 2018 11:11:12 +0100 Subject: [PATCH 2/2] Compatibility with the Foundation framework --- Pagination.js | 56 ++++++++++++++++++++++----------------------------- 1 file changed, 24 insertions(+), 32 deletions(-) diff --git a/Pagination.js b/Pagination.js index dd3ca2a..585bba2 100644 --- a/Pagination.js +++ b/Pagination.js @@ -9,9 +9,9 @@ export default class Pagination extends Component { if (current_page > 1) { var firstPage = ( - - this.props.onPaginationClick(1)}>« First - +
  • + this.props.onPaginationClick(1)}>First +
  • ) } else { var firstPage = ''; @@ -19,9 +19,9 @@ export default class Pagination extends Component { if (!(current_page - 1) <= 0) { var previousPage = ( - - this.props.onPaginationClick(current_page - 1)}>‹ Prev - +
  • + this.props.onPaginationClick(current_page - 1)}>Prev +
  • ) } else { var previousPage = ''; @@ -30,7 +30,7 @@ export default class Pagination extends Component { var pageWindow = []; var i = current_page - windowSize; - while(i < current_page) { + while (i < current_page) { if (i >= 1) { pageWindow.push(i); } @@ -39,21 +39,21 @@ export default class Pagination extends Component { pageWindow.push(current_page); - var i = current_page+1; - while((i <= (current_page + windowSize)) && (i <= total_pages)) { + var i = current_page + 1; + while ((i <= (current_page + windowSize)) && (i <= total_pages)) { pageWindow.push(i); i++; } if (current_page > windowSize + 1) { - var leftEllipsis = + var leftEllipsis =
  • } else { var leftEllipsis = '' } var currentWindow = []; - pageWindow.map(function(page) { + pageWindow.map(function (page) { if (current_page == page) { var link = page; } else { @@ -61,17 +61,17 @@ export default class Pagination extends Component { } currentWindow.push( - +
  • {link}{' '} - +
  • ) }, this) if (current_page + 1 <= total_pages) { var nextPage = ( - - - +
  • + +
  • ) } else { var nextPage = ''; @@ -79,44 +79,36 @@ export default class Pagination extends Component { if (current_page != total_pages) { var lastPage = ( - - this.props.onPaginationClick(total_pages)}>Last » - +
  • + this.props.onPaginationClick(total_pages)}>Last +
  • ) } else { var lastPage = ''; } if (current_page + windowSize < total_pages) { - var rightEllipsis = + var rightEllipsis =
  • } else { var rightEllipsis = '' } return ( - - - + ); } } Pagination.propTypes = { current_page: PropTypes.number.isRequired, - total_pages: PropTypes.number.isRequired, - total_count: PropTypes.number.isRequired + total_pages: PropTypes.number.isRequired, + total_count: PropTypes.number.isRequired };