Change setting name to paginationType

Author: cain

assets/app.css

@@ -1531,5 +1531,3 @@
 .ace_scroll-left {
   -webkit-box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.25) !important;
           box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.25) !important; }
-
-/*# sourceMappingURL=app.css.map*/

assets/app.js

@@ -999,7 +999,7 @@ public static function enqueue_scripts() {
 						'state'                        => self::get_liveblog_state(),
 						'is_liveblog_editable'         => self::is_liveblog_editable(),
 						'socketio_enabled'             => WPCOM_Liveblog_Socketio_Loader::is_enabled(),
-						'isLoadMore'                   => false,
+						'paginationType'               => 'page',
 
 						'key'                          => self::KEY,
 						'nonce_key'                    => self::NONCE_KEY,

liveblog.php

@@ -12,11 +12,11 @@ export const getEntriesPaginated = (page, scrollTo) => ({
   scrollTo,
 });
 
-export const getEntriesSuccess = (payload, renderNewEntries, isLoadMore) => ({
+export const getEntriesSuccess = (payload, renderNewEntries, paginationType) => ({
   type: types.GET_ENTRIES_SUCCESS,
   payload,
   renderNewEntries,
-  isLoadMore,
+  paginationType,
 });
 
 export const getEntriesFailed = () => ({

src/react/actions/apiActions.js

@@ -28,14 +28,14 @@ class AppContainer extends Component {
 
   render() {
     const { page, loading, entries, polling, mergePolling, config } = this.props;
-    const { isLoadMore } = config;
+    const paginationTypeLoadMore = config.paginationType === 'loadMore';
     const canEdit = config.is_liveblog_editable === '1';
 
     return (
       <div style={{ position: 'relative' }}>
-        {(page === 1 || isLoadMore) && canEdit && <EditorContainer isEditing={false} />}
+        {(page === 1 || paginationTypeLoadMore) && canEdit && <EditorContainer isEditing={false} />}
         <UpdateButton polling={polling} click={() => mergePolling()} />
-        {!isLoadMore && <PaginationContainer /> }
+        {!paginationTypeLoadMore && <PaginationContainer /> }
         <Entries loading={loading} entries={entries} />
         <PaginationContainer />
         {this.eventsContainer && <EventsContainer container={this.eventsContainer} />}

src/react/containers/AppContainer.js

@@ -7,9 +7,9 @@ import * as userActions from '../actions/userActions';
 
 class PaginationContainer extends Component {
   render() {
-    const { page, pages, getEntriesPaginated, isLoadMore } = this.props;
+    const { page, pages, getEntriesPaginated, paginationType } = this.props;
 
-    if (isLoadMore) {
+    if (paginationType === 'loadMore') {
       return (
         <div className="liveblog-pagination">
           {page !== pages &&
@@ -66,13 +66,13 @@ PaginationContainer.propTypes = {
   page: PropTypes.number,
   pages: PropTypes.number,
   getEntriesPaginated: PropTypes.func,
-  isLoadMore: PropTypes.bool,
+  paginationType: PropTypes.string,
 };
 
 const mapStateToProps = state => ({
   page: state.pagination.page,
   pages: state.pagination.pages,
-  isLoadMore: state.config.isLoadMore,
+  paginationType: state.config.paginationType,
 });
 
 const mapDispatchToProps = dispatch =>

src/react/containers/PaginationContainer.js

@@ -80,7 +80,7 @@ const getPaginatedEntriesEpic = (action$, store) =>
                 store.getState().api.entries,
                 store.getState().polling.entries,
               ),
-              store.getState().config.isLoadMore,
+              store.getState().config.paginationType,
             )),
             of(scrollToEntry(getScrollToId(res.response.entries, scrollTo))),
           ),

src/react/epics/api.js

@@ -54,7 +54,7 @@ const mergePollingEpic = (action$, store) =>
       const entries = Object.keys(polling.entries).map(key => polling.entries[key]);
       const pages = Math.max(pagination.pages, polling.pages);
 
-      if (pagination.page === 1 || config.isLoadMore) {
+      if (pagination.page === 1 || config.paginationType === 'loadMore') {
         return concat(
           of(mergePollingIntoEntries(entries, pages)),
           of(scrollToEntry(`id_${entries[entries.length - 1].id}`)),

src/react/epics/polling.js

@@ -29,7 +29,7 @@ export const api = (state = initialState, action) => {
         error: false,
         loading: false,
         entries: applyUpdate(
-          action.isLoadMore ? state.entries : {},
+          action.paginationType === 'loadMore' ? state.entries : {},
           action.payload.entries,
         ),
         newestEntry: getNewestEntry(