Add ability to set string format via options. #150

Bump version.
jdorn · Jun 26, 2014 · 5c8c99b · 5c8c99b
1 parent fb180e6
commit 5c8c99b
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 11 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "json-editor",
-  "version": "0.6.17",
+  "version": "0.6.18",
   "authors": [
     "Jeremy Dorn <[email protected]>"
   ],

diff --git a/dist/jsoneditor.js b/dist/jsoneditor.js
@@ -1,8 +1,8 @@
-/*! JSON Editor v0.6.17 - JSON Schema -> HTML Editor
+/*! JSON Editor v0.6.18 - JSON Schema -> HTML Editor
  * By Jeremy Dorn - https://github.com/jdorn/json-editor/
  * Released under the MIT license
  *
- * Date: 2014-06-22
+ * Date: 2014-06-26
  */
 
 /**
@@ -1931,6 +1931,12 @@ JSONEditor.defaults.editors.string = JSONEditor.AbstractEditor.extend({
     if(!this.format && this.schema.media && this.schema.media.type) {
       this.format = this.schema.media.type.replace(/(^(application|text)\/(x-)?(script\.)?)|(-source$)/g,'');
     }
+    if(!this.format && this.options.default_format) {
+      this.format = this.options.default_format;
+    }
+    if(this.options.format) {
+      this.format = this.options.format;
+    }
 
     // Select box
     if(this.schema.enum) {

diff --git a/dist/jsoneditor.min.js b/dist/jsoneditor.min.js
diff --git a/src/editors/string.js b/src/editors/string.js
@@ -91,6 +91,12 @@ JSONEditor.defaults.editors.string = JSONEditor.AbstractEditor.extend({
     if(!this.format && this.schema.media && this.schema.media.type) {
       this.format = this.schema.media.type.replace(/(^(application|text)\/(x-)?(script\.)?)|(-source$)/g,'');
     }
+    if(!this.format && this.options.default_format) {
+      this.format = this.options.default_format;
+    }
+    if(this.options.format) {
+      this.format = this.options.format;
+    }
 
     // Select box
     if(this.schema.enum) {

diff --git a/src/intro.js b/src/intro.js
@@ -1,8 +1,8 @@
-/*! JSON Editor v0.6.17 - JSON Schema -> HTML Editor
+/*! JSON Editor v0.6.18 - JSON Schema -> HTML Editor
  * By Jeremy Dorn - https://github.com/jdorn/json-editor/
  * Released under the MIT license
  *
- * Date: 2014-06-22
+ * Date: 2014-06-26
  */
 
 /**