Updated to v0.8.21

4 files changed, 91 insertions, 88 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1b338703202b..410d890e0812 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = boostnote
 	pkgdesc = Open source note-taking app for programmers
-	pkgver = 0.8.20
+	pkgver = 0.8.21
 	pkgrel = 1
 	url = https://boostnote.io/
 	arch = any
@@ -10,18 +10,16 @@ pkgbase = boostnote
 	makedepends = git
 	depends = electron
 	depends = nodejs
-	source = boostnote-0.8.20.tar.gz::https://github.com/BoostIO/Boostnote/archive/v0.8.20.tar.gz
+	source = boostnote-0.8.21.tar.gz::https://github.com/BoostIO/Boostnote/archive/v0.8.21.tar.gz
 	source = boostnote.js
 	source = boostnote.desktop
 	source = warning-fix.patch
 	source = remove-analytics.patch
-	source = insertion-fix.patch
-	sha512sums = 508cd053aa27da9a5f9e137724b75f09342e6eb915c49d4b2d387caa60c357341a697b894f7e064747b1e33d1a1994d04f73f5e6c24fcb59d2f2c3b7cce093ee
+	sha512sums = 82cf2b0fa64564eec4570ded23eedaf99609571500478caa58c60e155ba6244de42f87f7eb581f5af4442a13fca1c83398dd64c87c510429cf9da405fc6a9fe0
 	sha512sums = f0abbdcca34d7f74d3dc66ffc2d0995416e7708c715d55fa58c4c2abc31d191ea42f3434e3105292b4817f83ac0ca89f456f5f93007ae80ab2426c8941f615f9
 	sha512sums = 18bcda13580da8ceeaa86793a77ec00a053b8fd51451dad7e2b1a19553fe1a467ac647b44b789212e783f3f6a80968cc9404e884ef7ff6b1f6588473b3229d40
-	sha512sums = 5f40a234515a35f0460d127049c9b24a000da8883d06560781a922df8564f47b91227c0aadb67cd41ea2b4eba388da4251a7eda8e021dc11e08662b2e397cab0
-	sha512sums = f41fc7cbfd04bc6b52e5df64d0b977289c33292cdb48685998ea1c7e038d9de868fc5f7eb21cde4cd18bf5d81b4fed674d0f2f10896ea2eadb3b952c124376ce
-	sha512sums = 0afb34bc1364879c0ff16913cf14cd69ba1ddce858f3f8736653873acdd90af70ee8911a40ce1ff9e150a71a75abc1f83afcaee013f0dc9e56509d943d3fc67d
+	sha512sums = d5b3611f0f8890e0f417caaa530f77505bf37cb7cccbb36a6caf99ba846da413fd740797e08cf8790685c8a1513aa0db7c8b8ada47bc17afb6e95a382cc9c75c
+	sha512sums = 1f65de3b814e23f73b4c627c50dea7b11d13ad1bcfa37f56332d6d6fd8f39f402ffe94dfb8fac30af185c4eca4fc6c1fee48ada05da8920cefc3d743749f3fb8
 
 pkgname = boostnote
 
diff --git a/PKGBUILD b/PKGBUILD
index c58d906558a4..d68ef6ed191c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 # Contributor: Romain Bazile <gromain {dot} baz {at} gmail {dot} com>
 pkgname=boostnote
 _pkgname=Boostnote
-pkgver=0.8.20
+pkgver=0.8.21
 pkgrel=1
 pkgdesc="Open source note-taking app for programmers"
 arch=('any')
@@ -20,22 +20,17 @@ source=(
   "${pkgname}.desktop"
   "warning-fix.patch"
   "remove-analytics.patch"
-  "insertion-fix.patch"
   )
 
-sha512sums=(
-  '508cd053aa27da9a5f9e137724b75f09342e6eb915c49d4b2d387caa60c357341a697b894f7e064747b1e33d1a1994d04f73f5e6c24fcb59d2f2c3b7cce093ee'
-  'f0abbdcca34d7f74d3dc66ffc2d0995416e7708c715d55fa58c4c2abc31d191ea42f3434e3105292b4817f83ac0ca89f456f5f93007ae80ab2426c8941f615f9'
-  '18bcda13580da8ceeaa86793a77ec00a053b8fd51451dad7e2b1a19553fe1a467ac647b44b789212e783f3f6a80968cc9404e884ef7ff6b1f6588473b3229d40'
-  '5f40a234515a35f0460d127049c9b24a000da8883d06560781a922df8564f47b91227c0aadb67cd41ea2b4eba388da4251a7eda8e021dc11e08662b2e397cab0'
-  'f41fc7cbfd04bc6b52e5df64d0b977289c33292cdb48685998ea1c7e038d9de868fc5f7eb21cde4cd18bf5d81b4fed674d0f2f10896ea2eadb3b952c124376ce'
-  '0afb34bc1364879c0ff16913cf14cd69ba1ddce858f3f8736653873acdd90af70ee8911a40ce1ff9e150a71a75abc1f83afcaee013f0dc9e56509d943d3fc67d'
-  )
+sha512sums=('82cf2b0fa64564eec4570ded23eedaf99609571500478caa58c60e155ba6244de42f87f7eb581f5af4442a13fca1c83398dd64c87c510429cf9da405fc6a9fe0'
+            'f0abbdcca34d7f74d3dc66ffc2d0995416e7708c715d55fa58c4c2abc31d191ea42f3434e3105292b4817f83ac0ca89f456f5f93007ae80ab2426c8941f615f9'
+            '18bcda13580da8ceeaa86793a77ec00a053b8fd51451dad7e2b1a19553fe1a467ac647b44b789212e783f3f6a80968cc9404e884ef7ff6b1f6588473b3229d40'
+            'd5b3611f0f8890e0f417caaa530f77505bf37cb7cccbb36a6caf99ba846da413fd740797e08cf8790685c8a1513aa0db7c8b8ada47bc17afb6e95a382cc9c75c'
+            '1f65de3b814e23f73b4c627c50dea7b11d13ad1bcfa37f56332d6d6fd8f39f402ffe94dfb8fac30af185c4eca4fc6c1fee48ada05da8920cefc3d743749f3fb8')
 
 prepare() {
   cd "${_pkgname}-${pkgver}"
 
-  patch -Np1 -i "${srcdir}/insertion-fix.patch"
   patch -Np1 -i "${srcdir}/warning-fix.patch"
   patch -Np1 -i "${srcdir}/remove-analytics.patch"
 }
diff --git a/remove-analytics.patch b/remove-analytics.patch
index a897534e5422..1af8f0678f3a 100644
--- a/remove-analytics.patch
+++ b/remove-analytics.patch
@@ -1,6 +1,6 @@
 diff -ura a/browser/finder/index.js b/browser/finder/index.js
---- a/browser/finder/index.js	2018-01-13 11:01:53.000000000 +0100
-+++ b/browser/finder/index.js	2018-01-13 14:08:29.828697553 +0100
+--- a/browser/finder/index.js	2018-02-03 07:52:51.000000000 +0100
++++ b/browser/finder/index.js	2018-02-03 15:36:52.253142218 +0100
 @@ -10,7 +10,6 @@
  import NoteList from './NoteList'
  import NoteDetail from './NoteDetail'
@@ -18,8 +18,8 @@ diff -ura a/browser/finder/index.js b/browser/finder/index.js
        e.preventDefault()
      }
 diff -ura a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js
---- a/browser/main/Detail/MarkdownNoteDetail.js	2018-01-13 11:01:53.000000000 +0100
-+++ b/browser/main/Detail/MarkdownNoteDetail.js	2018-01-13 14:08:52.058188835 +0100
+--- a/browser/main/Detail/MarkdownNoteDetail.js	2018-02-03 07:52:51.000000000 +0100
++++ b/browser/main/Detail/MarkdownNoteDetail.js	2018-02-03 15:37:11.336600303 +0100
 @@ -15,7 +15,6 @@
  import StatusBar from '../StatusBar'
  import _ from 'lodash'
@@ -45,8 +45,8 @@ 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-01-13 11:01:53.000000000 +0100
-+++ b/browser/main/Detail/SnippetNoteDetail.js	2018-01-13 14:09:33.567238910 +0100
+--- a/browser/main/Detail/SnippetNoteDetail.js	2018-02-03 07:52:51.000000000 +0100
++++ b/browser/main/Detail/SnippetNoteDetail.js	2018-02-03 15:37:47.246834593 +0100
 @@ -18,7 +18,6 @@
  import ConfigManager from 'browser/main/lib/ConfigManager'
  import _ from 'lodash'
@@ -93,8 +93,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-01-13 11:01:53.000000000 +0100
-+++ b/browser/main/Detail/TagSelect.js	2018-01-13 14:09:56.536713258 +0100
+--- a/browser/main/Detail/TagSelect.js	2018-02-03 07:52:51.000000000 +0100
++++ b/browser/main/Detail/TagSelect.js	2018-02-03 15:38:01.990263950 +0100
 @@ -3,7 +3,6 @@
  import CSSModules from 'browser/lib/CSSModules'
  import styles from './TagSelect.styl'
@@ -109,11 +109,11 @@ diff -ura a/browser/main/Detail/TagSelect.js b/browser/main/Detail/TagSelect.js
    submitTag () {
 -    AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_TAG')
      let { value } = this.props
-     const newTag = this.refs.newTag.value.trim().replace(/ +/g, '_')
- 
+     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-01-13 11:01:53.000000000 +0100
-+++ b/browser/main/Main.js	2018-01-13 14:10:12.586345968 +0100
+--- a/browser/main/Main.js	2018-02-03 07:52:51.000000000 +0100
++++ b/browser/main/Main.js	2018-02-03 15:38:15.547018829 +0100
 @@ -10,7 +10,6 @@
  import dataApi from 'browser/main/lib/dataApi'
  import _ from 'lodash'
@@ -134,8 +134,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-01-13 11:01:53.000000000 +0100
-+++ b/browser/main/modals/CreateFolderModal.js	2018-01-13 14:10:27.795997897 +0100
+--- a/browser/main/modals/CreateFolderModal.js	2018-02-03 07:52:51.000000000 +0100
++++ b/browser/main/modals/CreateFolderModal.js	2018-02-03 15:38:29.540443134 +0100
 @@ -6,7 +6,6 @@
  import store from 'browser/main/store'
  import consts from 'browser/lib/consts'
@@ -153,8 +153,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-01-13 11:01:53.000000000 +0100
-+++ b/browser/main/modals/NewNoteModal.js	2018-01-13 14:10:46.655566300 +0100
+--- a/browser/main/modals/NewNoteModal.js	2018-02-03 07:52:51.000000000 +0100
++++ b/browser/main/modals/NewNoteModal.js	2018-02-03 15:38:47.527226622 +0100
 @@ -5,7 +5,6 @@
  import { hashHistory } from 'react-router'
  import ee from 'browser/main/lib/eventEmitter'
@@ -182,8 +182,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-01-13 11:01:53.000000000 +0100
-+++ b/browser/main/modals/PreferencesModal/InfoTab.js	2018-01-13 14:11:58.000000000 +0100
+--- a/browser/main/modals/PreferencesModal/InfoTab.js	2018-02-03 07:52:51.000000000 +0100
++++ b/browser/main/modals/PreferencesModal/InfoTab.js	2018-02-03 15:39:27.410818543 +0100
 @@ -3,7 +3,6 @@
  import styles from './InfoTab.styl'
  import ConfigManager from 'browser/main/lib/ConfigManager'
@@ -203,7 +203,7 @@ diff -ura a/browser/main/modals/PreferencesModal/InfoTab.js b/browser/main/modal
 -  }
 -
 -  handleSaveButtonClick (e) {
--    let newConfig = {
+-    const newConfig = {
 -      amaEnabled: this.state.config.amaEnabled
 -    }
 -
@@ -240,38 +240,40 @@ diff -ura a/browser/main/modals/PreferencesModal/InfoTab.js b/browser/main/modal
    render () {
      return (
        <div styleName='root'>
-@@ -136,19 +94,6 @@
+@@ -136,21 +94,6 @@
          </ul>
  
          <hr styleName='separate-line' />
 -
--        <div styleName='policy'>Data collection policy</div>
--        <div>We collect only the number of DAU for Boostnote and **DO NOT collect** any detail information such as your note content.</div>
+-        <div styleName='policy'>Analytics</div>
+-        <div>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>
 -        <div>You can see how it works on <a href='https://github.com/BoostIO/Boostnote' onClick={(e) => this.handleLinkClick(e)}>GitHub</a>.</div>
--        <div>This data is only used for Boostnote improvements.</div>
+-        <br />
+-        <div>You can choose to enable or disable this option.</div>
 -        <input onChange={(e) => this.handleConfigChange(e)}
 -          checked={this.state.config.amaEnabled}
 -          ref='amaEnabled'
 -          type='checkbox'
 -        />
--        Enable to send analytics to our servers<br />
+-        Enable analytics to help improve Boostnote<br />
 -        <button styleName='policy-submit' onClick={(e) => this.handleSaveButtonClick(e)}>Save</button>
+-        <br />
 -        {this.infoMessage()}
        </div>
      )
    }
 diff -ura a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js
---- a/browser/main/NoteList/index.js	2018-01-13 11:01:53.000000000 +0100
-+++ b/browser/main/NoteList/index.js	2018-01-13 14:12:12.713596882 +0100
-@@ -15,7 +15,6 @@
- import markdown from 'browser/lib/markdownTextHelper'
- import { findNoteTitle } from 'browser/lib/findNoteTitle'
- import store from 'browser/main/store'
+--- a/browser/main/NoteList/index.js	2018-02-03 07:52:51.000000000 +0100
++++ b/browser/main/NoteList/index.js	2018-02-03 15:40:59.288078781 +0100
+@@ -13,7 +13,6 @@
+ import fs from 'fs'
+ import path from 'path'
+ import { hashHistory } from 'react-router'
 -import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig'
  
  const { remote } = require('electron')
  const { Menu, MenuItem, dialog } = remote
-@@ -535,7 +534,6 @@
+@@ -536,7 +535,6 @@
              note: newNote
            })
          })
@@ -279,15 +281,24 @@ diff -ura a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js
          console.log('Notes went to trash')
        })
        .catch((err) => {
+@@ -555,8 +553,6 @@
+     const firstNote = selectedNotes[0]
+     const eventName = firstNote.type === 'MARKDOWN_NOTE' ? 'ADD_MARKDOWN' : 'ADD_SNIPPET'
+ 
+-    AwsMobileAnalyticsConfig.recordDynamicCustomEvent(eventName)
+-    AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_ALLNOTE')
+     dataApi
+       .createNote(storage.key, {
+         type: firstNote.type,
 diff -ura a/package.json b/package.json
---- a/package.json	2018-01-13 14:04:26.504265000 +0100
-+++ b/package.json	2018-01-13 14:12:26.173288861 +0100
+--- a/package.json	2018-02-03 07:52:51.000000000 +0100
++++ b/package.json	2018-02-03 15:41:10.458150760 +0100
 @@ -50,8 +50,6 @@
    "dependencies": {
-     "@rokt33r/markdown-it-math": "4.0.2",
-     "@rokt33r/season": "5.3.1",
--    "aws-sdk": "2.48.0",
--    "aws-sdk-mobile-analytics": "0.9.2",
-     "codemirror": "5.26.0",
-     "codemirror-mode-elixir": "1.1.1",
-     "electron-config": "0.2.1",
+     "@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-mode-elixir": "^1.1.1",
+     "electron-config": "^0.2.1",
diff --git a/warning-fix.patch b/warning-fix.patch
index 7711e083b11e..b57aa720389c 100644
--- a/warning-fix.patch
+++ b/warning-fix.patch
@@ -1,6 +1,6 @@
 diff -ura a/gruntfile.js b/gruntfile.js
---- a/gruntfile.js	2018-01-13 11:01:53.000000000 +0100
-+++ b/gruntfile.js	2018-01-13 14:05:16.263127255 +0100
+--- a/gruntfile.js	2018-02-03 07:52:51.000000000 +0100
++++ b/gruntfile.js	2018-02-03 15:32:55.558244353 +0100
 @@ -6,6 +6,7 @@
  
  module.exports = function (grunt) {
@@ -31,39 +31,38 @@ diff -ura a/gruntfile.js b/gruntfile.js
    grunt.registerTask('compile', function () {
      var done = this.async()
 diff -ura a/package.json b/package.json
---- a/package.json	2018-01-13 13:57:16.534105000 +0100
-+++ b/package.json	2018-01-13 14:04:26.504265975 +0100
-@@ -103,7 +103,7 @@
-     "css-loader": "0.19.0",
-     "devtron": "1.4.0",
-     "dom-storage": "2.0.2",
--    "electron-packager": "6.0.2",
-+    "electron-packager": "8.6.0",
+--- a/package.json	2018-02-03 07:52:51.000000000 +0100
++++ b/package.json	2018-02-03 15:33:42.268555991 +0100
+@@ -104,14 +104,14 @@
+     "devtron": "^1.1.0",
+     "dom-storage": "^2.0.2",
      "electron": "1.7.10",
-     "eslint": "3.19.0",
-     "eslint-config-standard": "6.2.1",
-@@ -111,7 +111,7 @@
-     "eslint-plugin-react": "7.2.0",
-     "eslint-plugin-standard": "3.0.1",
-     "faker": "3.1.0",
--    "grunt": "0.4.5",
-+    "grunt": "1.0.1",
+-    "electron-packager": "^6.0.0",
++    "electron-packager": "^8.6.0",
+     "eslint": "^3.13.1",
+     "eslint-config-standard": "^6.2.1",
+     "eslint-config-standard-jsx": "^3.2.0",
+     "eslint-plugin-react": "^7.2.0",
+     "eslint-plugin-standard": "^3.0.1",
+     "faker": "^3.1.0",
+-    "grunt": "^0.4.5",
++    "grunt": "^1.0.1",
      "grunt-electron-installer": "2.1.0",
-     "history": "1.17.0",
-     "jsdom": "9.12.0",
+     "history": "^1.17.0",
+     "jsdom": "^9.4.2",
 @@ -125,15 +125,11 @@
-     "react-router-redux": "4.0.8",
-     "standard": "8.6.0",
-     "style-loader": "0.12.4",
--    "stylus": "0.52.4",
-+    "stylus": "0.54.4",
-     "stylus-loader": "2.5.1",
-     "webpack": "1.15.0",
-     "webpack-dev-server": "1.16.5"
+     "react-router-redux": "^4.0.4",
+     "standard": "^8.4.0",
+     "style-loader": "^0.12.4",
+-    "stylus": "^0.52.4",
++    "stylus": "^0.54.4",
+     "stylus-loader": "^2.3.1",
+     "webpack": "^1.12.2",
+     "webpack-dev-server": "^1.12.0"
    },
 -  "optionalDependencies": {
--    "grunt-electron-installer-debian": "0.2.0",
--    "grunt-electron-installer-redhat": "0.3.1"
+-    "grunt-electron-installer-debian": "^0.2.0",
+-    "grunt-electron-installer-redhat": "^0.3.1"
 -  },
    "optional": false,
    "ava": {