Merge pull request #95 from lbryio/renameTvToWeb
This commit is contained in:
commit
9c2939ab37
6 changed files with 18 additions and 18 deletions
6
dist/bundle.es.js
vendored
6
dist/bundle.es.js
vendored
|
@ -3917,7 +3917,7 @@ reducers$4[UPDATE_UPLOAD_PROGRESS] = (state, action) => {
|
|||
};
|
||||
};
|
||||
|
||||
function lbrytvReducer(state = defaultState$a, action) {
|
||||
function webReducer(state = defaultState$a, action) {
|
||||
const handler = reducers$4[action.type];
|
||||
if (handler) return handler(state, action);
|
||||
return state;
|
||||
|
@ -3968,7 +3968,7 @@ const selectSyncApplyIsPending = reselect.createSelector(selectState$9, state =>
|
|||
const selectSyncApplyErrorMessage = reselect.createSelector(selectState$9, state => state.syncApplyErrorMessage);
|
||||
const selectSyncApplyPasswordError = reselect.createSelector(selectState$9, state => state.syncApplyPasswordError);
|
||||
|
||||
const selectState$a = state => state.lbrytv || {};
|
||||
const selectState$a = state => state.web || {};
|
||||
|
||||
const selectCurrentUploads = reselect.createSelector(selectState$a, state => state.currentUploads);
|
||||
const selectUploadCount = reselect.createSelector(selectCurrentUploads, currentUploads => currentUploads && Object.keys(currentUploads).length);
|
||||
|
@ -4048,7 +4048,6 @@ exports.doUserSignIn = doUserSignIn;
|
|||
exports.doUserSignUp = doUserSignUp;
|
||||
exports.filteredReducer = filteredReducer;
|
||||
exports.homepageReducer = homepageReducer;
|
||||
exports.lbrytvReducer = lbrytvReducer;
|
||||
exports.makeSelectClaimRewardError = makeSelectClaimRewardError;
|
||||
exports.makeSelectCostInfoForUri = makeSelectCostInfoForUri;
|
||||
exports.makeSelectFetchingCostInfoForUri = makeSelectFetchingCostInfoForUri;
|
||||
|
@ -4163,3 +4162,4 @@ exports.subscriptionsReducer = subscriptions;
|
|||
exports.syncReducer = syncReducer;
|
||||
exports.userReducer = userReducer;
|
||||
exports.userStateSyncMiddleware = userStateSyncMiddleware;
|
||||
exports.webReducer = webReducer;
|
||||
|
|
20
dist/bundle.js
vendored
20
dist/bundle.js
vendored
|
@ -261,8 +261,8 @@ __webpack_require__.r(__webpack_exports__);
|
|||
|
||||
/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "doSyncEncryptAndDecrypt", function() { return redux_actions_sync__WEBPACK_IMPORTED_MODULE_17__["doSyncEncryptAndDecrypt"]; });
|
||||
|
||||
/* harmony import */ var redux_actions_lbrytv__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(36);
|
||||
/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "doUpdateUploadProgress", function() { return redux_actions_lbrytv__WEBPACK_IMPORTED_MODULE_18__["doUpdateUploadProgress"]; });
|
||||
/* harmony import */ var redux_actions_web__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(36);
|
||||
/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "doUpdateUploadProgress", function() { return redux_actions_web__WEBPACK_IMPORTED_MODULE_18__["doUpdateUploadProgress"]; });
|
||||
|
||||
/* harmony import */ var redux_reducers_auth__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(37);
|
||||
/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "authReducer", function() { return redux_reducers_auth__WEBPACK_IMPORTED_MODULE_19__["authReducer"]; });
|
||||
|
@ -291,8 +291,8 @@ __webpack_require__.r(__webpack_exports__);
|
|||
/* harmony import */ var redux_reducers_sync__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(45);
|
||||
/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "syncReducer", function() { return redux_reducers_sync__WEBPACK_IMPORTED_MODULE_27__["syncReducer"]; });
|
||||
|
||||
/* harmony import */ var redux_reducers_lbrytv__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(46);
|
||||
/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "lbrytvReducer", function() { return redux_reducers_lbrytv__WEBPACK_IMPORTED_MODULE_28__["lbrytvReducer"]; });
|
||||
/* harmony import */ var redux_reducers_web__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(46);
|
||||
/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "webReducer", function() { return redux_reducers_web__WEBPACK_IMPORTED_MODULE_28__["webReducer"]; });
|
||||
|
||||
/* harmony import */ var redux_selectors_auth__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(47);
|
||||
/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "selectAuthToken", function() { return redux_selectors_auth__WEBPACK_IMPORTED_MODULE_29__["selectAuthToken"]; });
|
||||
|
@ -512,10 +512,10 @@ __webpack_require__.r(__webpack_exports__);
|
|||
|
||||
/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "selectSyncApplyPasswordError", function() { return redux_selectors_sync__WEBPACK_IMPORTED_MODULE_38__["selectSyncApplyPasswordError"]; });
|
||||
|
||||
/* harmony import */ var redux_selectors_lbrytv__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(54);
|
||||
/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "selectCurrentUploads", function() { return redux_selectors_lbrytv__WEBPACK_IMPORTED_MODULE_39__["selectCurrentUploads"]; });
|
||||
/* harmony import */ var redux_selectors_web__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(54);
|
||||
/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "selectCurrentUploads", function() { return redux_selectors_web__WEBPACK_IMPORTED_MODULE_39__["selectCurrentUploads"]; });
|
||||
|
||||
/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "selectUploadCount", function() { return redux_selectors_lbrytv__WEBPACK_IMPORTED_MODULE_39__["selectUploadCount"]; });
|
||||
/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "selectUploadCount", function() { return redux_selectors_web__WEBPACK_IMPORTED_MODULE_39__["selectUploadCount"]; });
|
||||
|
||||
|
||||
|
||||
|
@ -7983,7 +7983,7 @@ function syncReducer() {
|
|||
|
||||
"use strict";
|
||||
__webpack_require__.r(__webpack_exports__);
|
||||
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "lbrytvReducer", function() { return lbrytvReducer; });
|
||||
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "webReducer", function() { return webReducer; });
|
||||
/* harmony import */ var constants_action_types__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
|
||||
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; var ownKeys = Object.keys(source); if (typeof Object.getOwnPropertySymbols === 'function') { ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) { return Object.getOwnPropertyDescriptor(source, sym).enumerable; })); } ownKeys.forEach(function (key) { _defineProperty(target, key, source[key]); }); } return target; }
|
||||
|
||||
|
@ -8037,7 +8037,7 @@ reducers[constants_action_types__WEBPACK_IMPORTED_MODULE_0__["UPDATE_UPLOAD_PROG
|
|||
});
|
||||
};
|
||||
|
||||
function lbrytvReducer() {
|
||||
function webReducer() {
|
||||
var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultState;
|
||||
var action = arguments.length > 1 ? arguments[1] : undefined;
|
||||
var handler = reducers[action.type];
|
||||
|
@ -8279,7 +8279,7 @@ __webpack_require__.r(__webpack_exports__);
|
|||
|
||||
|
||||
var selectState = function selectState(state) {
|
||||
return state.lbrytv || {};
|
||||
return state.web || {};
|
||||
};
|
||||
|
||||
var selectCurrentUploads = Object(reselect__WEBPACK_IMPORTED_MODULE_0__["createSelector"])(selectState, function (state) {
|
||||
|
|
|
@ -89,7 +89,7 @@ export {
|
|||
doResetSync,
|
||||
doSyncEncryptAndDecrypt,
|
||||
} from 'redux/actions/sync';
|
||||
export { doUpdateUploadProgress } from 'redux/actions/lbrytv';
|
||||
export { doUpdateUploadProgress } from 'redux/actions/web';
|
||||
|
||||
// reducers
|
||||
export { authReducer } from 'redux/reducers/auth';
|
||||
|
@ -102,7 +102,7 @@ export { filteredReducer } from 'redux/reducers/filtered';
|
|||
export { homepageReducer } from 'redux/reducers/homepage';
|
||||
export { statsReducer } from 'redux/reducers/stats';
|
||||
export { syncReducer } from 'redux/reducers/sync';
|
||||
export { lbrytvReducer } from 'redux/reducers/lbrytv';
|
||||
export { webReducer } from 'redux/reducers/web';
|
||||
|
||||
// selectors
|
||||
export { selectAuthToken, selectIsAuthenticating } from 'redux/selectors/auth';
|
||||
|
@ -219,4 +219,4 @@ export {
|
|||
selectSyncApplyErrorMessage,
|
||||
selectSyncApplyPasswordError,
|
||||
} from 'redux/selectors/sync';
|
||||
export { selectCurrentUploads, selectUploadCount } from 'redux/selectors/lbrytv';
|
||||
export { selectCurrentUploads, selectUploadCount } from 'redux/selectors/web';
|
||||
|
|
|
@ -55,7 +55,7 @@ reducers[ACTIONS.UPDATE_UPLOAD_PROGRESS] = (state: TvState, action) => {
|
|||
return { ...state, currentUploads };
|
||||
};
|
||||
|
||||
export function lbrytvReducer(state = defaultState, action) {
|
||||
export function webReducer(state = defaultState, action) {
|
||||
const handler = reducers[action.type];
|
||||
if (handler) return handler(state, action);
|
||||
return state;
|
|
@ -1,6 +1,6 @@
|
|||
import { createSelector } from 'reselect';
|
||||
|
||||
const selectState = state => state.lbrytv || {};
|
||||
const selectState = state => state.web || {};
|
||||
|
||||
export const selectCurrentUploads = createSelector(selectState, state => state.currentUploads);
|
||||
|
Loading…
Reference in a new issue