self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-06-15 23:00:36 +02:00
Code Issues Releases Activity

Fix build

Browse Source
This commit is contained in:
Laurent Cozic
2020-02-19 00:09:19 +00:00
parent eeb9999334
commit 2fa8e2ff09
15 changed files with 74 additions and 1232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ReactNativeClient/root.js
View File

@ -81,8 +81,8 @@ const DecryptionWorker = require('lib/services/DecryptionWorker');
const EncryptionService = require('lib/services/EncryptionService');
const MigrationService = require('lib/services/MigrationService');
import setUpQuickActions from './setUpQuickActions';
import PluginAssetsLoader from './PluginAssetsLoader';
import setUpQuickActions from './QuickActions';
let storeDispatch = function() {};
@ -216,9 +216,9 @@ const appReducer = (state = appDefaultState, action) => {
const currentRoute = state.route;
if (!historyGoingBack && historyCanGoBackTo(currentRoute, action)) {
// If the route *name* is the same (even if the other parameters are different), we
// overwrite the last route in the history with the current one. If the route name
// is different, we push a new history entry.
// If the route *name* is the same (even if the other parameters are different), we
// overwrite the last route in the history with the current one. If the route name
// is different, we push a new history entry.
if (currentRoute.routeName == action.routeName) {
// nothing
} else {