added discard changes shortcut

ZeroX-DG · ZeroX-DG · commit b0efd98d74cd · 2018-08-01T17:11:00.000+07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ Every notable changes in each version will be listed in this file.
 
 - **Interface**: New tags input with tag auto complete
 - **Core**: Save snippet with keyboard shortcut `ctrl + s` ([84f1e45](https://github.com/ZeroX-DG/SnippetStore/commit/84f1e45))
+- **Core**: Discard changes snippet with keyboard shortcut `esc`
 
 ## Improvements:
 
diff --git a/browser/core/functions/keyboard.js b/browser/core/functions/keyboard.js
@@ -34,6 +34,12 @@ const actions = [
     action: () => {
       eventEmitter.emit('snippets:saveAll')
     }
+  },
+  {
+    name: 'CancelEditSnippets',
+    action: () => {
+      eventEmitter.emit('snippets:unSave')
+    }
   }
 ]
 
diff --git a/browser/lib/config-manager.js b/browser/lib/config-manager.js
@@ -36,7 +36,8 @@ const DEFAULT_CONFIG = {
     openSetting: OSX ? 'Cmd + ,' : 'Ctrl + ,',
     toggleSidebar: OSX ? 'Cmd + B' : 'Ctrl + B',
     closeAllModals: 'Esc',
-    SaveAllSnippets: OSX ? 'Cmd + S' : 'Ctrl + S'
+    SaveAllSnippets: OSX ? 'Cmd + S' : 'Ctrl + S',
+    CancelEditSnippets: 'Esc'
   }
 }
 
diff --git a/browser/render/layouts/list-and-detail/snippet-detail-multi-file/index.jsx b/browser/render/layouts/list-and-detail/snippet-detail-multi-file/index.jsx
@@ -28,7 +28,14 @@ export default class SnippetDetailMultiFile extends React.Component {
 
   componentDidMount () {
     eventEmitter.on('snippets:saveAll', () => {
-      this.handleSaveChangesClick()
+      if (this.state.isEditing) {
+        this.handleSaveChangesClick()
+      }
+    })
+    eventEmitter.on('snippets:unSave', () => {
+      if (this.state.isEditing) {
+        this.handleDiscardChangesClick()
+      }
     })
   }
 
diff --git a/browser/render/layouts/list-and-detail/snippet-detail/index.jsx b/browser/render/layouts/list-and-detail/snippet-detail/index.jsx
@@ -26,7 +26,14 @@ export default class SnippetDetail extends React.Component {
 
   componentDidMount () {
     eventEmitter.on('snippets:saveAll', () => {
-      this.handleSaveChangesClick()
+      if (this.state.isEditing) {
+        this.handleSaveChangesClick()
+      }
+    })
+    eventEmitter.on('snippets:unSave', () => {
+      if (this.state.isEditing) {
+        this.handleDiscardChangesClick()
+      }
     })
   }
 
diff --git a/browser/render/layouts/original/snippet-item-multi-files/index.jsx b/browser/render/layouts/original/snippet-item-multi-files/index.jsx
@@ -32,6 +32,11 @@ export default class SnippetItemMultiFiles extends React.Component {
         this.handleSaveChangesClick()
       }
     })
+    eventEmitter.on('snippets:unSave', () => {
+      if (this.state.isEditing) {
+        this.handleDiscardChangesClick()
+      }
+    })
   }
 
   renderHeader () {
diff --git a/browser/render/layouts/original/snippet-item/index.jsx b/browser/render/layouts/original/snippet-item/index.jsx
@@ -30,6 +30,11 @@ export default class SnippetItem extends React.Component {
         this.handleSaveChangesClick()
       }
     })
+    eventEmitter.on('snippets:unSave', () => {
+      if (this.state.isEditing) {
+        this.handleDiscardChangesClick()
+      }
+    })
   }
 
   handleSnippetLangChange () {

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,12 @@ const actions = [`
`34`	`34`	`action: () => {`
`35`	`35`	`eventEmitter.emit('snippets:saveAll')`
`36`	`36`	`}`
	`37`	`+ },`
	`38`	`+ {`
	`39`	`+ name: 'CancelEditSnippets',`
	`40`	`+ action: () => {`
	`41`	`+ eventEmitter.emit('snippets:unSave')`
	`42`	`+ }`
`37`	`43`	`}`
`38`	`44`	`]`
`39`	`45`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,8 @@ const DEFAULT_CONFIG = {`
`36`	`36`	`openSetting: OSX ? 'Cmd + ,' : 'Ctrl + ,',`
`37`	`37`	`toggleSidebar: OSX ? 'Cmd + B' : 'Ctrl + B',`
`38`	`38`	`closeAllModals: 'Esc',`
`39`		`- SaveAllSnippets: OSX ? 'Cmd + S' : 'Ctrl + S'`
	`39`	`+ SaveAllSnippets: OSX ? 'Cmd + S' : 'Ctrl + S',`
	`40`	`+ CancelEditSnippets: 'Esc'`
`40`	`41`	`}`
`41`	`42`	`}`
`42`	`43`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,11 @@ export default class SnippetItemMultiFiles extends React.Component {`
`32`	`32`	`this.handleSaveChangesClick()`
`33`	`33`	`}`
`34`	`34`	`})`
	`35`	`+ eventEmitter.on('snippets:unSave', () => {`
	`36`	`+ if (this.state.isEditing) {`
	`37`	`+ this.handleDiscardChangesClick()`
	`38`	`+ }`
	`39`	`+ })`
`35`	`40`	`}`
`36`	`41`
`37`	`42`	`renderHeader () {`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,11 @@ export default class SnippetItem extends React.Component {`
`30`	`30`	`this.handleSaveChangesClick()`
`31`	`31`	`}`
`32`	`32`	`})`
	`33`	`+ eventEmitter.on('snippets:unSave', () => {`
	`34`	`+ if (this.state.isEditing) {`
	`35`	`+ this.handleDiscardChangesClick()`
	`36`	`+ }`
	`37`	`+ })`
`33`	`38`	`}`
`34`	`39`
`35`	`40`	`handleSnippetLangChange () {`