Released version 2.2.0

HISTORY.md

@@ -2,12 +2,12 @@
 
 http://jsoneditoronline.org
 
-## not yet released, version 2.2.0
+## 2013-05-04, version 2.2.0
 
 - Unified JSONFormatter and JSONEditor in one editor with a switchable mode.
 - Urls are navigable now.
 - Improved error and log handling.
-- Added jsoneditor to npm and bower.
+- Added jsoneditor to package managers npm and bower.
 
 
 ## 2013-03-11, version 2.1.1

Jakefile.js

@@ -136,6 +136,7 @@ task('zip', ['build', 'minify'], {async: true}, function () {
         JSONEDITOR_CSS_MIN,
         'img/*.*',
         'lib/**/*.*',
+        'docs/**/*.*',
         'examples/**/*.*'
     ]);
     var files = filelist.toArray();
@@ -166,7 +167,6 @@ task('webapp', ['build', 'minify'], function () {
     var webAppLib = webApp + 'lib/';
     var webAppAce = webAppLib + 'ace/';
     var webAppImg = webApp + 'img/';
-    var webAppDoc = webApp + 'doc/';
     var appJs = webApp + 'app.js';
     var appCss = webApp + 'app.css';
     var appCssMin = webApp + 'app-min.css';
@@ -181,7 +181,6 @@ task('webapp', ['build', 'minify'], function () {
     jake.mkdirP(webAppLib + 'jsoneditor/img/');
     jake.mkdirP(webAppLib + 'jsonlint/');
     jake.mkdirP(webAppImg);
-    jake.mkdirP(webAppDoc);
 
     // concatenate the javascript files
     concat({
@@ -234,7 +233,7 @@ task('webapp', ['build', 'minify'], function () {
     jake.cpR(webAppSrc + 'googlea47c4a0b36d11021.html', webApp);
     jake.cpR(webAppSrc + 'img/logo.png', webAppImg);
     jake.cpR(webAppSrc + 'img/header_background.png', webAppImg);
-    jake.cpR(webAppSrc + 'doc/', webAppDoc);
+    jake.cpR(webAppSrc + 'doc/', webApp);
 
     // update date and verison in index.html
     replacePlaceholders(webApp + 'index.html');

README.md

@@ -83,21 +83,20 @@ download:
 
 ### Documentation
 
-Documentation: [https://github.com/josdejong/jsoneditor/tree/master/docs](https://github.com/josdejong/jsoneditor/tree/master/docs)
+- Docs: [https://github.com/josdejong/jsoneditor/tree/master/docs](https://github.com/josdejong/jsoneditor/tree/master/docs)
-
+- Examples: [https://github.com/josdejong/jsoneditor/tree/master/examples](https://github.com/josdejong/jsoneditor/tree/master/examples)
-Example code: [https://github.com/josdejong/jsoneditor/tree/master/examples](https://github.com/josdejong/jsoneditor/tree/master/examples)
+- Source: [https://github.com/josdejong/jsoneditor](https://github.com/josdejong/jsoneditor)
-
+- History: [https://github.com/josdejong/jsoneditor/blob/master/HISTORY.md](https://github.com/josdejong/jsoneditor/blob/master/HISTORY.md)
-Source code: [https://github.com/josdejong/jsoneditor](https://github.com/josdejong/jsoneditor)
 
 
 ### Build
 
-The code of the JSON Editor is located in the folder `src`.
+The code of the JSON Editor is located in the folder `jsoneditor`.
 The code for the web application in `app/web`.
 To build the library from sourcecode, run
 
     jake
 
 in the root of the project. This will generate the files `jsoneditor.js`,
-`jsoneditor.css`, etc., and will create a folder `build` containing the
+`jsoneditor.css`, and minified versions, and will create a folder `build`
-zipped library and the built web application.
+containing the zipped library and the built web application.

app/web/doc/index.html

@@ -183,6 +183,7 @@
 
         <tr><td>Ctrl+D</td><td>Duplicate field</td></tr>
         <tr><td>Ctrl+Del</td><td>Remove field</td></tr>
+        <tr><td>Ctrl+Enter</td><td>Open link when on a field containing an url</td></tr>
         <tr><td>Ctrl+Ins</td><td>Insert a new field with type auto</td></tr>
         <tr><td>Ctrl+Shift+Ins</td><td>Append a new field with type auto</td></tr>
         <tr><td>Ctrl+E</td><td>Expand or collapse field</td></tr>

component.json

@@ -1,6 +1,6 @@
 {
     "name": "jsoneditor",
-    "version": "2.2.0-SNAPSHOT",
+    "version": "2.2.0",
     "description": "A web-based tool to view, edit and format JSON",
     "tags": [
         "json",

jsoneditor.js

@@ -27,7 +27,7 @@
  * Copyright (c) 2011-2013 Jos de Jong, http://jsoneditoronline.org
  *
  * @author  Jos de Jong, <wjosdejong@gmail.com>
- * @version 2.2.0-SNAPSHOT
+ * @version 2.2.0
  * @date    2013-05-04
  */
 (function () {

package.json

@@ -1,6 +1,6 @@
 {
     "name": "jsoneditor",
-    "version": "2.2.0-SNAPSHOT",
+    "version": "2.2.0",
     "description": "A web-based tool to view, edit and format JSON",
     "tags": [
         "json",