diff --git a/browser/components/MarkdownPreview.js b/browser/components/MarkdownPreview.js index 55b36243..4be33c51 100755 --- a/browser/components/MarkdownPreview.js +++ b/browser/components/MarkdownPreview.js @@ -1020,7 +1020,8 @@ export default class MarkdownPreview extends React.Component { if (!href) return - const regexNoteInternalLink = /main.html#(.+)/ + const regexNoteInternalLink = process.env.NODE_ENV === 'production' ? /main.production.html#(.+)/ : /main.development.html#(.+)/ + if (regexNoteInternalLink.test(linkHash)) { const targetId = mdurl.encode(linkHash.match(regexNoteInternalLink)[1]) const targetElement = this.refs.root.contentWindow.document.getElementById( diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js index 3fda675b..31c6e174 100644 --- a/browser/main/Detail/SnippetNoteDetail.js +++ b/browser/main/Detail/SnippetNoteDetail.js @@ -8,7 +8,6 @@ import StarButton from './StarButton' import TagSelect from './TagSelect' import FolderSelect from './FolderSelect' import dataApi from 'browser/main/lib/dataApi' -// import {hashHistory} from 'react-router' import { history } from 'browser/main/store' import ee from 'browser/main/lib/eventEmitter' import CodeMirror from 'codemirror' diff --git a/browser/main/Main.js b/browser/main/Main.js index 0742cd03..45e9b795 100644 --- a/browser/main/Main.js +++ b/browser/main/Main.js @@ -12,7 +12,6 @@ import _ from 'lodash' import ConfigManager from 'browser/main/lib/ConfigManager' import mobileAnalytics from 'browser/main/lib/AwsMobileAnalyticsConfig' import eventEmitter from 'browser/main/lib/eventEmitter' -// import { hashHistory } from 'react-router' import { store, history } from 'browser/main/store' import i18n from 'browser/lib/i18n' import { getLocales } from 'browser/lib/Languages' diff --git a/browser/main/NewNoteButton/index.js b/browser/main/NewNoteButton/index.js index 63dab8d1..115d9530 100644 --- a/browser/main/NewNoteButton/index.js +++ b/browser/main/NewNoteButton/index.js @@ -22,19 +22,14 @@ class NewNoteButton extends React.Component { } this.handleNewNoteButtonClick = this.handleNewNoteButtonClick.bind(this) - - // why is there a newNoteHandler?! - this.newNoteHandler = () => { - this.handleNewNoteButtonClick() - } } componentDidMount () { - eventEmitter.on('top:new-note', this.newNoteHandler) + eventEmitter.on('top:new-note', this.handleNewNoteButtonClick) } componentWillUnmount () { - eventEmitter.off('top:new-note', this.newNoteHandler) + eventEmitter.off('top:new-note', this.handleNewNoteButtonClick) } handleNewNoteButtonClick (e) { diff --git a/browser/main/store.js b/browser/main/store.js index 91152aff..c708c3ad 100644 --- a/browser/main/store.js +++ b/browser/main/store.js @@ -469,16 +469,11 @@ function getOrInitItem (target, key) { const history = createHistory() -// Query not available in HashHistory with ReactRouter >= v4 -// Relevant Issue https://github.com/ReactTraining/react-router/issues/4410#issuecomment-293772446 -// --> moved from query to search - so we only need query-string parsing/stringify for noteKey. -// (No need to add query to history with a listener) - const reducer = combineReducers({ data, config, status, - router: connectRouter(history) // I think we could also go with-out connected-router as we're using history with imports directly + router: connectRouter(history) }) const store = createStore(reducer, undefined, compose( diff --git a/lib/main-window.js b/lib/main-window.js index 614127e1..e650cb92 100644 --- a/lib/main-window.js +++ b/lib/main-window.js @@ -54,8 +54,7 @@ const mainWindow = new BrowserWindow({ }, icon: path.resolve(__dirname, '../resources/app.png') }) - -const url = path.resolve(__dirname, './main.html') +const url = path.resolve(__dirname, process.env.NODE_ENV === 'production' ? './main.production.html' : './main.development.html') mainWindow.loadURL('file://' + url) mainWindow.setMenuBarVisibility(false) diff --git a/lib/main.html b/lib/main.development.html similarity index 100% rename from lib/main.html rename to lib/main.development.html diff --git a/lib/main.production.html b/lib/main.production.html new file mode 100644 index 00000000..ffd9eec3 --- /dev/null +++ b/lib/main.production.html @@ -0,0 +1,157 @@ + + + +
+ + + + + + + + + + +
+
+