Merge branch 'master' into table-editor

browser/main/modals/NewNoteModal.js

@@ -61,7 +61,7 @@ class NewNoteModal extends React.Component {
   handleSnippetNoteButtonClick (e) {
     AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_SNIPPET')
     AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_ALLNOTE')
-    const { storage, folder, dispatch, location } = this.props
+    const { storage, folder, dispatch, location, config } = this.props
 
     dataApi
       .createNote(storage, {
@@ -72,7 +72,7 @@ class NewNoteModal extends React.Component {
         snippets: [
           {
             name: '',
-            mode: 'text',
+            mode: config.editor.snippetDefaultLanguage || 'text',
             content: ''
           }
         ]

browser/main/modals/PreferencesModal/ConfigTab.styl

@@ -24,7 +24,7 @@
   line-height 30px
 
 .group-section-label
-  width 150px
+  width 200px
   text-align left
   margin-right 10px
   font-size 14px

browser/main/modals/PreferencesModal/UiTab.js

@@ -85,6 +85,7 @@ class UiTab extends React.Component {
         displayLineNumbers: this.refs.editorDisplayLineNumbers.checked,
         switchPreview: this.refs.editorSwitchPreview.value,
         keyMap: this.refs.editorKeyMap.value,
+        snippetDefaultLanguage: this.refs.editorSnippetDefaultLanguage.value,
         scrollPastEnd: this.refs.scrollPastEnd.checked,
         fetchUrlTitle: this.refs.editorFetchUrlTitle.checked,
         enableTableEditor: this.refs.enableTableEditor.checked
@@ -388,6 +389,22 @@ class UiTab extends React.Component {
             </div>
           </div>
 
+          <div styleName='group-section'>
+            <div styleName='group-section-label'>
+              {i18n.__('Snippet Default Language')}
+            </div>
+            <div styleName='group-section-control'>
+              <select value={config.editor.snippetDefaultLanguage}
+                ref='editorSnippetDefaultLanguage'
+                onChange={(e) => this.handleUIChange(e)}
+              >
+                {
+                  _.sortBy(CodeMirror.modeInfo.map(mode => mode.name)).map(name => (<option key={name} value={name}>{name}</option>))
+                }
+              </select>
+            </div>
+          </div>
+
           <div styleName='group-checkBoxSection'>
             <label>
               <input onChange={(e) => this.handleUIChange(e)}