Skip to content

Commit 0db2c35

Browse files
committed
Using brace to load Ace. Ace and jsonlint are now packed by default with JSONEditor. Removed all redundant build stuff for the assets.
1 parent c18145f commit 0db2c35

29 files changed

+20536
-796
lines changed

HISTORY.md

+6
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
https://github.com/josdejong/jsoneditor
44

55

6+
## not yet released, version 4.0.0
7+
8+
- Ace editor and jsonlint are now packed with jsoneditor.js by default.
9+
- Reworked the source code to CommonJS modules, using `brace` to load Ace.
10+
11+
612
## 2015-01-25, version 3.2.0
713

814
- Implemented shortcut keys `Ctrl+\` to format and `Ctrl+Shift+\` to compact

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,12 @@ download:
7474
<html>
7575
<head>
7676
<link rel="stylesheet" type="text/css" href="jsoneditor/jsoneditor.min.css">
77-
<script type="text/javascript" src="jsoneditor/jsoneditor.min.js"></script>
77+
<script src="jsoneditor/jsoneditor.min.js"></script>
7878
</head>
7979
<body>
8080
<div id="jsoneditor" style="width: 400px; height: 400px;"></div>
8181

82-
<script type="text/javascript" >
82+
<script>
8383
// create the editor
8484
var container = document.getElementById("jsoneditor");
8585
var editor = new JSONEditor(container);

asset/ace/ace.js

-148
This file was deleted.

asset/ace/ext-searchbox.js

-1
This file was deleted.

0 commit comments

Comments
 (0)