Update to v0.11.6

1 files changed, 39 insertions, 41 deletions

diff --git a/remove-analytics.patch b/remove-analytics.patch
index 4cf49bca39fb..af25f9f153bf 100644
--- a/remove-analytics.patch
+++ b/remove-analytics.patch
@@ -1,6 +1,6 @@
 diff -ura a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js
---- a/browser/main/Detail/MarkdownNoteDetail.js	2018-03-22 15:07:28.000000000 +0100
-+++ b/browser/main/Detail/MarkdownNoteDetail.js	2018-03-22 16:05:48.568143378 +0100
+--- a/browser/main/Detail/MarkdownNoteDetail.js	2018-06-14 04:02:20.000000000 +0200
++++ b/browser/main/Detail/MarkdownNoteDetail.js	2018-06-14 08:42:29.609020608 +0200
 @@ -15,7 +15,6 @@
  import StatusBar from '../StatusBar'
  import _ from 'lodash'
@@ -9,7 +9,7 @@ diff -ura a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/Mark
  import ConfigManager from 'browser/main/lib/ConfigManager'
  import TrashButton from './TrashButton'
  import FullscreenButton from './FullscreenButton'
-@@ -112,7 +111,6 @@
+@@ -117,7 +116,6 @@
            type: 'UPDATE_NOTE',
            note: note
          })
@@ -17,7 +17,7 @@ diff -ura a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/Mark
        })
    }
  
-@@ -151,7 +149,6 @@
+@@ -156,7 +154,6 @@
  
    handleStarButtonClick (e) {
      const { note } = this.state
@@ -26,17 +26,17 @@ diff -ura a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/Mark
      note.isStarred = !note.isStarred
  
 diff -ura a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js
---- a/browser/main/Detail/SnippetNoteDetail.js	2018-03-22 15:07:28.000000000 +0100
-+++ b/browser/main/Detail/SnippetNoteDetail.js	2018-03-22 16:06:37.140689593 +0100
-@@ -18,7 +18,6 @@
- import ConfigManager from 'browser/main/lib/ConfigManager'
+--- a/browser/main/Detail/SnippetNoteDetail.js	2018-06-14 04:02:20.000000000 +0200
++++ b/browser/main/Detail/SnippetNoteDetail.js	2018-06-14 08:43:32.060939891 +0200
+@@ -19,7 +19,6 @@
  import _ from 'lodash'
  import {findNoteTitle} from 'browser/lib/findNoteTitle'
+ import convertModeName from 'browser/lib/convertModeName'
 -import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig'
  import TrashButton from './TrashButton'
  import RestoreButton from './RestoreButton'
  import PermanentDeleteButton from './PermanentDeleteButton'
-@@ -140,7 +139,6 @@
+@@ -127,7 +126,6 @@
            type: 'UPDATE_NOTE',
            note: note
          })
@@ -44,7 +44,7 @@ diff -ura a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/Snipp
        })
    }
  
-@@ -179,7 +177,6 @@
+@@ -166,7 +164,6 @@
  
    handleStarButtonClick (e) {
      const { note } = this.state
@@ -52,7 +52,7 @@ diff -ura a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/Snipp
  
      note.isStarred = !note.isStarred
  
-@@ -377,9 +374,6 @@
+@@ -364,9 +361,6 @@
      const mode = syntax != null ? syntax.name : null
      if (mode != null) {
        snippets[index].mode = mode
@@ -60,10 +60,10 @@ diff -ura a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/Snipp
 -        name: mode
 -      })
      }
-     this.setState({note: Object.assign(this.state.note, {snippets: snippets})})
+     this.setState(state => ({note: Object.assign(state.note, {snippets: snippets})}))
  
-@@ -401,10 +395,6 @@
-       }, () => {
+@@ -388,10 +382,6 @@
+       }), () => {
          this.save()
        })
 -
@@ -74,8 +74,8 @@ diff -ura a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/Snipp
    }
  
 diff -ura a/browser/main/Detail/TagSelect.js b/browser/main/Detail/TagSelect.js
---- a/browser/main/Detail/TagSelect.js	2018-03-22 15:07:28.000000000 +0100
-+++ b/browser/main/Detail/TagSelect.js	2018-03-22 16:06:54.073880422 +0100
+--- a/browser/main/Detail/TagSelect.js	2018-06-14 04:02:20.000000000 +0200
++++ b/browser/main/Detail/TagSelect.js	2018-06-14 08:43:53.187726280 +0200
 @@ -3,7 +3,6 @@
  import CSSModules from 'browser/lib/CSSModules'
  import styles from './TagSelect.styl'
@@ -84,7 +84,7 @@ diff -ura a/browser/main/Detail/TagSelect.js b/browser/main/Detail/TagSelect.js
  import i18n from 'browser/lib/i18n'
  
  class TagSelect extends React.Component {
-@@ -63,7 +62,6 @@
+@@ -56,7 +55,6 @@
    }
  
    submitTag () {
@@ -93,8 +93,8 @@ diff -ura a/browser/main/Detail/TagSelect.js b/browser/main/Detail/TagSelect.js
      let newTag = this.refs.newTag.value.trim().replace(/ +/g, '_')
      newTag = newTag.charAt(0) === '#' ? newTag.substring(1) : newTag
 diff -ura a/browser/main/Main.js b/browser/main/Main.js
---- a/browser/main/Main.js	2018-03-22 15:07:28.000000000 +0100
-+++ b/browser/main/Main.js	2018-03-22 16:07:08.159039305 +0100
+--- a/browser/main/Main.js	2018-06-14 04:02:20.000000000 +0200
++++ b/browser/main/Main.js	2018-06-14 08:44:12.834832465 +0200
 @@ -10,7 +10,6 @@
  import dataApi from 'browser/main/lib/dataApi'
  import _ from 'lodash'
@@ -103,7 +103,7 @@ diff -ura a/browser/main/Main.js b/browser/main/Main.js
  import eventEmitter from 'browser/main/lib/eventEmitter'
  import { hashHistory } from 'react-router'
  import store from 'browser/main/store'
-@@ -24,10 +23,6 @@
+@@ -26,10 +25,6 @@
    constructor (props) {
      super(props)
  
@@ -115,8 +115,8 @@ diff -ura a/browser/main/Main.js b/browser/main/Main.js
  
      this.state = {
 diff -ura a/browser/main/modals/CreateFolderModal.js b/browser/main/modals/CreateFolderModal.js
---- a/browser/main/modals/CreateFolderModal.js	2018-03-22 15:07:28.000000000 +0100
-+++ b/browser/main/modals/CreateFolderModal.js	2018-03-22 16:07:22.927206041 +0100
+--- a/browser/main/modals/CreateFolderModal.js	2018-06-14 04:02:20.000000000 +0200
++++ b/browser/main/modals/CreateFolderModal.js	2018-06-14 08:44:28.685129396 +0200
 @@ -6,7 +6,6 @@
  import store from 'browser/main/store'
  import consts from 'browser/lib/consts'
@@ -134,8 +134,8 @@ diff -ura a/browser/main/modals/CreateFolderModal.js b/browser/main/modals/Creat
        const { storage } = this.props
        const input = {
 diff -ura a/browser/main/modals/NewNoteModal.js b/browser/main/modals/NewNoteModal.js
---- a/browser/main/modals/NewNoteModal.js	2018-03-22 15:07:28.000000000 +0100
-+++ b/browser/main/modals/NewNoteModal.js	2018-03-22 16:07:43.452438010 +0100
+--- a/browser/main/modals/NewNoteModal.js	2018-06-14 04:02:20.000000000 +0200
++++ b/browser/main/modals/NewNoteModal.js	2018-06-14 08:44:53.051207268 +0200
 @@ -5,7 +5,6 @@
  import { hashHistory } from 'react-router'
  import ee from 'browser/main/lib/eventEmitter'
@@ -163,8 +163,8 @@ diff -ura a/browser/main/modals/NewNoteModal.js b/browser/main/modals/NewNoteMod
  
      dataApi
 diff -ura a/browser/main/modals/PreferencesModal/InfoTab.js b/browser/main/modals/PreferencesModal/InfoTab.js
---- a/browser/main/modals/PreferencesModal/InfoTab.js	2018-03-22 15:07:28.000000000 +0100
-+++ b/browser/main/modals/PreferencesModal/InfoTab.js	2018-03-22 16:08:39.671074712 +0100
+--- a/browser/main/modals/PreferencesModal/InfoTab.js	2018-06-14 04:02:20.000000000 +0200
++++ b/browser/main/modals/PreferencesModal/InfoTab.js	2018-06-14 08:45:38.558084370 +0200
 @@ -3,7 +3,6 @@
  import styles from './InfoTab.styl'
  import ConfigManager from 'browser/main/lib/ConfigManager'
@@ -221,12 +221,10 @@ diff -ura a/browser/main/modals/PreferencesModal/InfoTab.js b/browser/main/modal
    render () {
      return (
        <div styleName='root'>
-@@ -135,23 +93,6 @@
-             {i18n.__('License: GPL v3')}
-           </li>
+@@ -137,21 +95,6 @@
          </ul>
--
--        <hr styleName='separate-line' />
+ 
+         <hr styleName='separate-line' />
 -
 -        <div styleName='policy'>{i18n.__('Analytics')}</div>
 -        <div>{i18n.__('Boostnote collects anonymous data for the sole purpose of improving the application, and strictly does not collect any personal information such the contents of your notes.')}</div>
@@ -246,17 +244,17 @@ diff -ura a/browser/main/modals/PreferencesModal/InfoTab.js b/browser/main/modal
      )
    }
 diff -ura a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js
---- a/browser/main/NoteList/index.js	2018-03-22 15:07:28.000000000 +0100
-+++ b/browser/main/NoteList/index.js	2018-03-22 16:09:20.152534305 +0100
-@@ -15,7 +15,6 @@
+--- a/browser/main/NoteList/index.js	2018-06-14 04:02:20.000000000 +0200
++++ b/browser/main/NoteList/index.js	2018-06-14 08:46:04.138478625 +0200
+@@ -17,7 +17,6 @@
  import path from 'path'
  import { hashHistory } from 'react-router'
  import copy from 'copy-to-clipboard'
 -import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig'
  import Markdown from '../../lib/markdown'
  import i18n from 'browser/lib/i18n'
- 
-@@ -625,7 +624,6 @@
+ import { confirmDeleteNote } from 'browser/lib/confirmDeleteNote'
+@@ -636,7 +635,6 @@
              note: newNote
            })
          })
@@ -264,7 +262,7 @@ diff -ura a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js
          console.log('Notes went to trash')
        })
        .catch((err) => {
-@@ -644,8 +642,6 @@
+@@ -655,8 +653,6 @@
      const firstNote = selectedNotes[0]
      const eventName = firstNote.type === 'MARKDOWN_NOTE' ? 'ADD_MARKDOWN' : 'ADD_SNIPPET'
  
@@ -274,14 +272,14 @@ diff -ura a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js
        .createNote(storage.key, {
          type: firstNote.type,
 diff -ura a/package.json b/package.json
---- a/package.json	2018-03-22 15:07:28.000000000 +0100
-+++ b/package.json	2018-03-22 16:09:42.000000000 +0100
-@@ -50,8 +50,6 @@
+--- a/package.json	2018-06-14 04:02:20.000000000 +0200
++++ b/package.json	2018-06-14 08:46:17.872054533 +0200
+@@ -51,8 +51,6 @@
    "dependencies": {
      "@rokt33r/markdown-it-math": "^4.0.1",
      "@rokt33r/season": "^5.3.0",
 -    "aws-sdk": "^2.48.0",
 -    "aws-sdk-mobile-analytics": "^0.9.2",
-     "codemirror": "^5.19.0",
+     "codemirror": "^5.37.0",
      "codemirror-mode-elixir": "^1.1.1",
      "electron-config": "^0.2.1",