Skip to content

Commit

Permalink
Version bump to 0.7.16
Browse files Browse the repository at this point in the history
  • Loading branch information
jdorn committed Feb 22, 2015
1 parent ee4a6e6 commit f123a15
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 14 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "json-editor",
"version": "0.7.15",
"version": "0.7.16",
"authors": [
"Jeremy Dorn <[email protected]>"
],
Expand Down
11 changes: 7 additions & 4 deletions dist/jsoneditor.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*! JSON Editor v0.7.15 - JSON Schema -> HTML Editor
/*! JSON Editor v0.7.16 - JSON Schema -> HTML Editor
* By Jeremy Dorn - https://github.com/jdorn/json-editor/
* Released under the MIT license
*
* Date: 2015-02-02
* Date: 2015-02-22
*/

/**
Expand Down Expand Up @@ -197,6 +197,9 @@ var $triggerc = function(el,event) {
};

var JSONEditor = function(element,options) {
if (!(element instanceof Element)) {
throw new Error('element should be an instance of Element');
}
options = $extend({},JSONEditor.defaults.options,options||{});
this.element = element;
this.options = options;
Expand Down Expand Up @@ -526,7 +529,7 @@ JSONEditor.prototype = {
}
};

if(schema.$ref && schema.$ref.substr(0,1) !== "#" && !this.refs[schema.$ref]) {
if(schema.$ref && typeof schema.$ref !== "object" && schema.$ref.substr(0,1) !== "#" && !this.refs[schema.$ref]) {
refs[schema.$ref] = true;
}

Expand Down Expand Up @@ -3439,7 +3442,7 @@ JSONEditor.defaults.editors.array = JSONEditor.AbstractEditor.extend({

$each(this.rows,function(i,editor) {
// Hide the move down button for the last row
if(editor.movedown_buttons) {
if(editor.movedown_button) {
if(i === self.rows.length - 1) {
editor.movedown_button.style.display = 'none';
}
Expand Down
12 changes: 6 additions & 6 deletions dist/jsoneditor.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "json-editor",
"title": "JSONEditor",
"description": "JSON Schema based editor",
"version": "0.7.15",
"version": "0.7.16",
"main": "dist/jsoneditor.js",
"author": {
"name": "Jeremy Dorn",
Expand Down
4 changes: 2 additions & 2 deletions src/intro.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*! JSON Editor v0.7.15 - JSON Schema -> HTML Editor
/*! JSON Editor v0.7.16 - JSON Schema -> HTML Editor
* By Jeremy Dorn - https://github.com/jdorn/json-editor/
* Released under the MIT license
*
* Date: 2015-02-02
* Date: 2015-02-22
*/

/**
Expand Down

0 comments on commit f123a15

Please sign in to comment.