Released v5.5.11

HISTORY.md

@@ -3,7 +3,7 @@
 https://github.com/josdejong/jsoneditor
 
 
-## (not yet released), version 5.5.11
+## 2017-01-06, version 5.5.11
 
 - Fixed embedded version of jsoneditor ace theme not being loaded in
   minimalist version (see #55).

NOTICE

@@ -1,7 +1,7 @@
 JSON Editor
 https://github.com/josdejong/jsoneditor
 
-Copyright (C) 2011-2015 Jos de Jong
+Copyright (C) 2011-2017 Jos de Jong
 
 
 Licensed under the Apache License, Version 2.0 (the "License");

dist/jsoneditor-minimalist.js

@@ -21,11 +21,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  *
- * Copyright (c) 2011-2016 Jos de Jong, http://jsoneditoronline.org
+ * Copyright (c) 2011-2017 Jos de Jong, http://jsoneditoronline.org
  *
  * @author  Jos de Jong, <[email protected]>
- * @version 5.5.10
- * @date    2016-11-02
+ * @version 5.5.11
+ * @date    2017-01-06
  */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
@@ -7999,6 +7999,8 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var MAX_ERRORS = 3; // maximum number of displayed errors at the bottom
 
+	var DEFAULT_THEME = 'ace/theme/jsoneditor';
+
 	/**
 	 * Create a text editor
 	 * @param {Element} container
@@ -8046,7 +8048,10 @@ return /******/ (function(modules) { // webpackBootstrap
 	  }
 
 	  // determine theme
-	  this.theme = options.theme || 'ace/theme/jsoneditor';
+	  this.theme = options.theme || DEFAULT_THEME;
+	  if (this.theme === DEFAULT_THEME && window.ace) {
+	    __webpack_require__(17);
+	  }
 
 	  var me = this;
 	  this.container = container;
@@ -8484,7 +8489,6 @@ return /******/ (function(modules) { // webpackBootstrap
 	// load required ace modules
 	__webpack_require__(14);
 	__webpack_require__(16);
-	__webpack_require__(17);
 
 	module.exports = ace;
 

dist/jsoneditor.css

@@ -1,11 +1,11 @@
 /* reset styling (prevent conflicts with bootstrap, materialize.css, etc.) */
 
-div.jsoneditor input {
+div.jsoneditor .jsoneditor-search input {
   height: auto;
   border: inherit;
 }
 
-div.jsoneditor input:focus {
+div.jsoneditor .jsoneditor-search input:focus {
   border: none !important;
   box-shadow: none !important;
 }
@@ -219,6 +219,7 @@ div.jsoneditor-tree table.jsoneditor-tree {
 }
 
 div.jsoneditor-outer {
+  position: static;
   width: 100%;
   height: 100%;
   margin: -35px 0 0 0;

dist/jsoneditor.js

@@ -21,11 +21,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  *
- * Copyright (c) 2011-2016 Jos de Jong, http://jsoneditoronline.org
+ * Copyright (c) 2011-2017 Jos de Jong, http://jsoneditoronline.org
  *
  * @author  Jos de Jong, <[email protected]>
- * @version 5.5.10
- * @date    2016-11-02
+ * @version 5.5.11
+ * @date    2017-01-06
  */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
@@ -15898,6 +15898,8 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var MAX_ERRORS = 3; // maximum number of displayed errors at the bottom
 
+	var DEFAULT_THEME = 'ace/theme/jsoneditor';
+
 	/**
 	 * Create a text editor
 	 * @param {Element} container
@@ -15945,7 +15947,10 @@ return /******/ (function(modules) { // webpackBootstrap
 	  }
 
 	  // determine theme
-	  this.theme = options.theme || 'ace/theme/jsoneditor';
+	  this.theme = options.theme || DEFAULT_THEME;
+	  if (this.theme === DEFAULT_THEME && window.ace) {
+	    __webpack_require__(70);
+	  }
 
 	  var me = this;
 	  this.container = container;
@@ -16383,7 +16388,6 @@ return /******/ (function(modules) { // webpackBootstrap
 	// load required ace modules
 	__webpack_require__(67);
 	__webpack_require__(69);
-	__webpack_require__(70);
 
 	module.exports = ace;
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsoneditor",
-  "version": "5.5.10",
+  "version": "5.5.11",
   "main": "./index",
   "description": "A web-based tool to view, edit, format, and validate JSON",
   "tags": [

src/js/header.js

@@ -21,7 +21,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  *
- * Copyright (c) 2011-2016 Jos de Jong, http://jsoneditoronline.org
+ * Copyright (c) 2011-2017 Jos de Jong, http://jsoneditoronline.org
  *
  * @author  Jos de Jong, <[email protected]>
  * @version @@version