@json-editor/json-editor 2.6.0 → 2.6.1

package/docs/cleave.html

@@ -10,7 +10,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
   <!-- jQuery -->
-  <script src="https://cdn.jsdelivr.net/npm/jquery@3.4.1/dist/jquery.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
+  <script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
 
   <!-- Bootstrap4 -->
   <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">

package/docs/datetime.html

@@ -10,7 +10,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
   <!-- jQuery -->
-  <script src="https://cdn.jsdelivr.net/npm/jquery@3.4.1/dist/jquery.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
+  <script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
 
   <!-- Bootstrap4 -->
   <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">

package/docs/describedby.html

@@ -8,7 +8,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
   <!-- jQuery -->
-  <script src="https://cdn.jsdelivr.net/npm/jquery@3.4.1/dist/jquery.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
+  <script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
 
   <!-- Bootstrap4 -->
   <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">

package/docs/index.html

@@ -364,7 +364,7 @@
       },
       sceditor: {
         js: [
-          'https://cdn.jsdelivr.net/npm/jquery@3.3.1/dist/jquery.min.js',
+          'https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js',
           'https://cdn.jsdelivr.net/npm/sceditor@2.1.3/minified/sceditor.min.js',
           'https://cdn.jsdelivr.net/npm/sceditor@2.1.3/minified/formats/bbcode.js',
           'https://cdn.jsdelivr.net/npm/sceditor@2.1.3/minified/formats/xhtml.js'
@@ -383,7 +383,7 @@
       },
       select2: {
         js: [
-          'https://cdn.jsdelivr.net/npm/jquery@3.3.1/dist/jquery.min.js',
+          'https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js',
           'https://cdn.jsdelivr.net/npm/select2@4.0.6-rc.1/dist/js/select2.min.js'
         ],
         css: [

package/docs/materialize_css.html

@@ -75,7 +75,7 @@
         </div>
     </div>
 
-    <script type="text/javascript" src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
+    <script type="text/javascript" src="https://code.jquery.com/jquery-3.5.0.min.js"></script>
     <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js"></script>
 
     <script>

package/docs/radio.html

@@ -10,7 +10,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
   <!-- jQuery -->
-  <script src="https://cdn.jsdelivr.net/npm/jquery@3.4.1/dist/jquery.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
+  <script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
 
   <!-- Bootstrap4 -->
   <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">

package/docs/select2.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <title>JSON Editor Select2 Integration Example</title>
     <!-- jQuery -->
-    <script src="https://cdn.jsdelivr.net/npm/jquery@3.4.1/dist/jquery.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
 
     <script src="https://cdn.jsdelivr.net/npm/@json-editor/json-editor@latest/dist/jsoneditor.min.js"></script>
     

package/docs/selectize.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <title>JSON Editor Selectize Integration Example</title>
     <!-- jQuery -->
-    <script src="https://cdn.jsdelivr.net/npm/jquery@3.4.1/dist/jquery.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
 
     <script src="https://cdn.jsdelivr.net/npm/@json-editor/json-editor@latest/dist/jsoneditor.min.js"></script>
     

package/docs/starrating.html

@@ -10,7 +10,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
   <!-- jQuery -->
-  <script src="https://cdn.jsdelivr.net/npm/jquery@3.4.1/dist/jquery.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
+  <script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
 
   <!-- Bootstrap4 -->
   <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">

package/docs/wysiwyg.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <title>JSON Editor WYSIWYG Example</title>
     <!-- jQuery -->
-    <script src="https://cdn.jsdelivr.net/npm/jquery@3.4.1/dist/jquery.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
 
     <script src="https://cdn.jsdelivr.net/npm/@json-editor/json-editor@latest/dist/jsoneditor.min.js"></script>
 

package/package.json

@@ -2,7 +2,7 @@
   "name": "@json-editor/json-editor",
   "title": "JSONEditor",
   "description": "JSON Schema based editor",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "main": "dist/jsoneditor.js",
   "author": {
     "name": "Jeremy Dorn",

package/src/editor.js

@@ -153,7 +153,7 @@ export class AbstractEditor {
       this.dependenciesFulfilled = false
     } else if (Array.isArray(choices)) {
       this.dependenciesFulfilled = choices.some(choice => {
-        if (value === choice) {
+        if (JSON.stringify(value) === JSON.stringify(choice)) {
           return true
         }
       })

package/src/editors/object.js

@@ -637,7 +637,7 @@ export class ObjectEditor extends AbstractEditor {
       this.addproperty_holder.appendChild(spacer)
 
       /* Close properties modal if clicked outside modal */
-      document.addEventListener('click', this.onOutsideModalClick)
+      document.addEventListener('click', this.onOutsideModalClick.bind(this))
 
       /* Description */
       if (this.schema.description) {
@@ -1042,9 +1042,8 @@ export class ObjectEditor extends AbstractEditor {
   }
 
   onOutsideModalClick (e) {
-    if (this.addproperty_holder &&
-      !this.addproperty_holder.contains(e.path[0] || e.composedPath()[0]) &&
-      this.adding_property) {
+    const path = e.path || (e.composedPath && e.composedPath())
+    if (this.addproperty_holder && !this.addproperty_holder.contains(path[0]) && this.adding_property) {
       e.preventDefault()
       e.stopPropagation()
       this.toggleAddProperty()

package/tests/codeceptjs/editors/object_test.js

@@ -231,7 +231,7 @@ Scenario('should have unique ids', (I) => {
   I.waitForText('i am actually a cat')
 })
 
-Scenario('should hide properties with unfulfilled dependencies', (I) => {
+Scenario('should hide properties with unfulfilled dependencies @dependencies', (I) => {
   I.amOnPage('object-with-dependencies.html')
   I.seeElement('[data-schemapath="root.enable_option"] input')
   I.dontSeeElement('[data-schemapath="root.make_new"] input')
@@ -243,13 +243,33 @@ Scenario('should hide properties with unfulfilled dependencies', (I) => {
   I.dontSeeElement('[data-schemapath="root.existing_name"] input')
 })
 
-Scenario('should respect multiple dependency values', (I) => {
+Scenario('should respect multiple dependency values @dependencies', (I) => {
   I.amOnPage('object-with-dependencies-array.html')
-  I.waitForVisible('[data-schemapath="root.answerB"] input', 5)
-  I.selectOption('[name="root[answerA]"]', 'C')
-  I.waitForInvisible('[data-schemapath="root.answerB"] input', 5)
-  I.selectOption('[name="root[answerA]"]', 'B')
-  I.waitForVisible('[data-schemapath="root.answerB"] input', 5)
-  I.selectOption('[name="root[answerA]"]', 'A')
-  I.waitForVisible('[data-schemapath="root.answerB"] input', 5)
+  I.waitForVisible('[data-schemapath="root.question_1"] select', 5)
+  I.selectOption('[name="root[question_1]"]', 'a')
+  I.waitForInvisible('[data-schemapath="root.question_1_feedback"]', 5)
+  I.selectOption('[name="root[question_1]"]', 'b')
+  I.waitForVisible('[data-schemapath="root.question_1_feedback"]', 5)
+  I.selectOption('[name="root[question_1]"]', 'c')
+  I.waitForInvisible('[data-schemapath="root.question_1_feedback"]', 5)
+  I.selectOption('[name="root[question_1]"]', 'd')
+  I.waitForVisible('[data-schemapath="root.question_1_feedback"]', 5)
+
+  I.waitForVisible('[data-schemapath="root.question_2"]', 5)
+  I.waitForInvisible('[data-schemapath="root.question_2_feedback"]', 5)
+  I.click('label[for="root[question_2]1"]')
+  I.click('label[for="root[question_2]2"]')
+  I.waitForVisible('[data-schemapath="root.question_2_feedback"]', 5)
+  I.click('label[for="root[question_2]0"]')
+  I.click('label[for="root[question_2]3"]')
+  I.waitForInvisible('[data-schemapath="root.question_2_feedback"]', 5)
+})
+
+Scenario('should open and close the properties modal', (I) => {
+  I.amOnPage('object.html')
+  I.seeElement('.json-editor-btn-edit_properties')
+  I.click('.json-editor-btn-edit_properties')
+  I.seeElement('.je-modal .property-selector')
+  I.click('textarea')
+  I.dontSeeElement('.je-modal .property-selector')
 })

package/tests/pages/object-with-dependencies-array.html

@@ -9,28 +9,38 @@
 <div id="editor"></div>
 <script>
   const schema = {
-    "title": "Person",
-    "type": "object",
-    "properties": {
-      "answerA": {
-        "title": "Question A:",
-        "type": "string",
-        "minLength": 1,
-        "enum": [
-          "A",
-          "B",
-          "C"
-        ]
+    'title': 'Test',
+    'type': 'object',
+    'properties': {
+      'question_1': {
+        'type': 'string',
+        'title': 'Question 1',
+        'enum': ['a', 'b', 'c', 'd']
       },
-      "answerB": {
-        "title": "Question B:",
-        "type": "string",
+      'question_1_feedback': {
+        'type': 'info',
+        'title': 'Question 1 is correct',
         "options": {
           "dependencies": {
-            "answerA": [
-              "A",
-              "B"
-            ]
+            "question_1": ['b', 'd']
+          }
+        }
+      },
+      'question_2': {
+        "type": "array",
+        "uniqueItems": true,
+        'title': 'Question 2',
+        "items": {
+          "type": "string",
+          'enum': ['a', 'b', 'c', 'd']
+        }
+      },
+      'question_2_feedback': {
+        'type': 'info',
+        'title': 'Question 2 is correct',
+        "options": {
+          "dependencies": {
+            "question_2": [['b', 'c']]
           }
         }
       }