Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
5eaea86
JSON Editor feature
lepinayl Mar 9, 2015
eb390ff
JSON Editor feature
lepinayl Mar 9, 2015
bfca602
e2e test for jsoneditor
lepinayl Mar 11, 2015
447b905
JSONEditor enable/disable flag
lepinayl Mar 12, 2015
e7b7465
Merge branch 'develop_2.0' into JSONEditor
lepinayl Mar 24, 2015
326f542
Merge branch 'develop_2.0' into JSONEditor
lepinayl Mar 27, 2015
155b450
Merge branch 'develop_2.0' into JSONEditor
lepinayl Mar 27, 2015
801acf0
Merge remote-tracking branch 'SwaggerOfficial/develop_2.0' into JSONE…
lepinayl Apr 7, 2015
f3ee0a4
Merge remote-tracking branch 'upstream/develop_2.0' into JSONEditor
lepinayl Apr 20, 2015
78c7dda
fixed jshint issues
lepinayl Apr 20, 2015
512e78c
disabled edit properties button
lepinayl May 18, 2015
f16c265
disabled edit json button
lepinayl May 18, 2015
dd5fab0
expand collapse buttons
lepinayl May 18, 2015
c51f1eb
preparing for non required properties in jsoneditor
lepinayl Jul 2, 2015
92efe42
fixes
lepinayl Jul 7, 2015
d968fda
Merge remote-tracking branch 'swagger/develop_2.0' into JSONEditorMerge
lepinayl Jul 7, 2015
2763800
labels css
lepinayl Jul 10, 2015
4288506
Fix $ref strings treated as objects by JSONEditor
gbjk Sep 8, 2015
3128da0
Merge pull request #1 from Thermeon/feature/ref_strings
lepinayl Sep 9, 2015
ea2cefa
Merge branch 'JSONEditor' into JSONEditorMaster
Sep 10, 2015
504095e
regression bug fix
Sep 16, 2015
1a8444c
regenerated dist files
lepinayl Sep 16, 2015
1367e8f
Merge remote-tracking branch 'upstream/master' into JSONEditorMaster
lepinayl Sep 21, 2015
f08e9df
fix jsoneditor render when nested object type is not defined
lepinayl Sep 21, 2015
7e82b3d
jshint
lepinayl Sep 21, 2015
50a9fc8
dont check the post body text area for as a required field when it's …
lepinayl Sep 24, 2015
c269dbd
don't override title and type if they are already defined
lepinayl Oct 5, 2015
57055ff
Merge remote-tracking branch 'upstream/master' into JSONEditorMaster
lepinayl Oct 29, 2015
51b7b1d
Merge remote-tracking branch 'upstream/master' into JSONEditorMaster
lepinayl Nov 13, 2015
41bf523
Merge remote-tracking branch 'upstream/master' into JSONEditorMaster
lepinayl Nov 16, 2015
ffbf6b2
fix corrupted images
lepinayl Nov 16, 2015
e051023
dist
lepinayl Nov 16, 2015
2c431d7
Merge remote-tracking branch 'upstream/master' into JSONEditorMaster
lepinayl Dec 16, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
*.ipr
*.iml
*.iws
*.flags.json
npm-debug.log
web/
lib/*.zip
version.properties
Expand Down
14 changes: 13 additions & 1 deletion dist/css/print.css
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
.swagger-section pre .vhdl .attribute,
.swagger-section pre .clojure .attribute,
.swagger-section pre .coffeescript .property {
color: #8888ff;
color: #88F;
}
.swagger-section pre .keyword,
.swagger-section pre .id,
Expand Down Expand Up @@ -126,6 +126,7 @@
max-width: 960px;
margin-left: auto;
margin-right: auto;
/* JSONEditor specific styling */
}
.swagger-section .swagger-ui-wrap b,
.swagger-section .swagger-ui-wrap strong {
Expand Down Expand Up @@ -458,6 +459,17 @@
.swagger-section .swagger-ui-wrap .required {
font-weight: bold;
}
.swagger-section .swagger-ui-wrap .editor_holder {
font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
font-size: 0.9em;
}
.swagger-section .swagger-ui-wrap .editor_holder label {
font-weight: normal!important;
/* JSONEditor uses bold by default for all labels, we revert that back to normal to not give the impression that by default fields are required */
}
.swagger-section .swagger-ui-wrap .editor_holder label.required {
font-weight: bold!important;
}
.swagger-section .swagger-ui-wrap input.parameter {
width: 300px;
border: 1px solid #aaa;
Expand Down
20 changes: 19 additions & 1 deletion dist/css/screen.css
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
.swagger-section pre .vhdl .attribute,
.swagger-section pre .clojure .attribute,
.swagger-section pre .coffeescript .property {
color: #8888ff;
color: #88F;
}
.swagger-section pre .keyword,
.swagger-section pre .id,
Expand Down Expand Up @@ -126,6 +126,7 @@
max-width: 960px;
margin-left: auto;
margin-right: auto;
/* JSONEditor specific styling */
}
.swagger-section .swagger-ui-wrap b,
.swagger-section .swagger-ui-wrap strong {
Expand Down Expand Up @@ -458,6 +459,17 @@
.swagger-section .swagger-ui-wrap .required {
font-weight: bold;
}
.swagger-section .swagger-ui-wrap .editor_holder {
font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
font-size: 0.9em;
}
.swagger-section .swagger-ui-wrap .editor_holder label {
font-weight: normal!important;
/* JSONEditor uses bold by default for all labels, we revert that back to normal to not give the impression that by default fields are required */
}
.swagger-section .swagger-ui-wrap .editor_holder label.required {
font-weight: bold!important;
}
.swagger-section .swagger-ui-wrap input.parameter {
width: 300px;
border: 1px solid #aaa;
Expand Down Expand Up @@ -1280,3 +1292,9 @@
text-align: center;
padding-top: 10px;
}
.swagger-section .swagger-collapse:before {
content: "-";
}
.swagger-section .swagger-expand:before {
content: "+";
}
Binary file modified dist/fonts/DroidSans-Bold.ttf
Binary file not shown.
Binary file modified dist/fonts/DroidSans.ttf
Binary file not shown.
Binary file added dist/images/collapse.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dist/images/expand.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions dist/index.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

<!DOCTYPE html>
<html>
<head>
Expand All @@ -19,6 +20,7 @@
<script src='lib/backbone-min.js' type='text/javascript'></script>
<script src='swagger-ui.js' type='text/javascript'></script>
<script src='lib/highlight.7.3.pack.js' type='text/javascript'></script>
<script src='lib/jsoneditor.min.js' type='text/javascript'></script>
<script src='lib/marked.js' type='text/javascript'></script>
<script src='lib/swagger-oauth.js' type='text/javascript'></script>

Expand Down Expand Up @@ -70,6 +72,7 @@
log("Unable to Load SwaggerUI");
},
docExpansion: "none",
jsonEditor:true,
apisSorter: "alpha",
defaultModelRendering: 'schema',
showRequestHeaders: false
Expand Down
28 changes: 14 additions & 14 deletions dist/lib/backbone-min.js

Large diffs are not rendered by default.

54 changes: 27 additions & 27 deletions dist/lib/handlebars-2.0.0.js

Large diffs are not rendered by default.

34 changes: 17 additions & 17 deletions dist/lib/jquery.ba-bbq.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/lib/jquery.slideto.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions dist/lib/jquery.wiggle.min.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
jQuery Wiggle
Author: WonderGroup, Jordan Thomas
URL: http://labs.wondergroup.com/demos/mini-ui/index.html
License: MIT (http://en.wikipedia.org/wiki/MIT_License)
*/
jQuery.fn.wiggle=function(o){var d={speed:50,wiggles:3,travel:5,callback:null};var o=jQuery.extend(d,o);return this.each(function(){var cache=this;var wrap=jQuery(this).wrap('<div class="wiggle-wrap"></div>').css("position","relative");var calls=0;for(i=1;i<=o.wiggles;i++){jQuery(this).animate({left:"-="+o.travel},o.speed).animate({left:"+="+o.travel*2},o.speed*2).animate({left:"-="+o.travel},o.speed,function(){calls++;if(jQuery(cache).parent().hasClass('wiggle-wrap')){jQuery(cache).parent().replaceWith(cache);}
/*
jQuery Wiggle
Author: WonderGroup, Jordan Thomas
URL: http://labs.wondergroup.com/demos/mini-ui/index.html
License: MIT (http://en.wikipedia.org/wiki/MIT_License)
*/
jQuery.fn.wiggle=function(o){var d={speed:50,wiggles:3,travel:5,callback:null};var o=jQuery.extend(d,o);return this.each(function(){var cache=this;var wrap=jQuery(this).wrap('<div class="wiggle-wrap"></div>').css("position","relative");var calls=0;for(i=1;i<=o.wiggles;i++){jQuery(this).animate({left:"-="+o.travel},o.speed).animate({left:"+="+o.travel*2},o.speed*2).animate({left:"-="+o.travel},o.speed,function(){calls++;if(jQuery(cache).parent().hasClass('wiggle-wrap')){jQuery(cache).parent().replaceWith(cache);}
if(calls==o.wiggles&&jQuery.isFunction(o.callback)){o.callback();}});}});};
11 changes: 11 additions & 0 deletions dist/lib/jsoneditor.min.js

Large diffs are not rendered by default.

Loading