Released version 4.2.1

panzhenglian · Jun 13, 2015 · c6642a7 · c6642a7
1 parent 36fa3c4
commit c6642a7
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 11 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -3,6 +3,11 @@
 https://github.com/josdejong/jsoneditor
 
 
+## 2015-06-13, version 4.2.1
+
+- Fixed #161: Cannot select text in Ace editor on systems using Chinese fonts.
+
+
 ## 2015-05-14, version 4.2.0
 
 - Implemented option `theme`, allowing to set a custom theme for the Ace 

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "jsoneditor",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "description": "A web-based tool to view, edit and format JSON",
   "tags": [
     "json",

diff --git a/dist/jsoneditor.css b/dist/jsoneditor.css
@@ -211,7 +211,7 @@
 .jsoneditor td,
 .jsoneditor th,
 .jsoneditor textarea {
-  font-family: droid sans mono, monospace, courier new, courier, sans-serif;
+  font-family: droid sans mono, consolas, monospace, courier new, courier, sans-serif;
   font-size: 10pt;
   color: #1A1A1A;
 }

diff --git a/dist/jsoneditor.js b/dist/jsoneditor.js
@@ -23,8 +23,8 @@
  * Copyright (c) 2011-2015 Jos de Jong, http://jsoneditoronline.org
  *
  * @author  Jos de Jong, <[email protected]>
- * @version 4.2.0
- * @date    2015-05-14
+ * @version 4.2.1
+ * @date    2015-06-13
  */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
@@ -6890,7 +6890,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	}\
 	\
 	.ace-jsoneditor.ace_editor {\
-	font-family: droid sans mono, monospace, courier new, courier, sans-serif;\
+	font-family: droid sans mono, consolas, monospace, courier new, courier, sans-serif;\
 	line-height: 1.3;\
 	}\
 	.ace-jsoneditor .ace_print-margin {\

diff --git a/dist/jsoneditor.map b/dist/jsoneditor.map
diff --git a/dist/jsoneditor.min.css b/dist/jsoneditor.min.css
diff --git a/dist/jsoneditor.min.js b/dist/jsoneditor.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jsoneditor",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "main": "./index",
   "description": "A web-based tool to view, edit and format JSON",
   "tags": [