Skip to content

Commit a035016

Browse files
jcenturionjcenturion
committed
Start rendering special chars in query parameters
1 parent 2f112ad commit a035016

File tree

7 files changed

+33
-35
lines changed

7 files changed

+33
-35
lines changed

‎dist/examples/leagues.raml‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,27 +67,25 @@ securedBy: [ null, basic, digest_auth, oauth_2_0, custom_scheme_1, custom_scheme
6767
queryParam:
6868
type: string
6969
enum:
70-
- UPGRADE
71-
- PORT_NUMBER
72-
- UPDATE_FEATURES
70+
- value
7371
required: true
72+
$foo:
73+
maxLength: 35
74+
required: true
75+
example: hola
7476
headers:
7577
header:
7678
type: string
7779
enum:
78-
- UPGRADE
79-
- PORT_NUMBER
80-
- UPDATE_FEATURES
80+
- value
8181
required: false
8282
body:
8383
application/x-www-form-urlencoded:
8484
formParameters:
8585
formParam:
8686
type: string
8787
enum:
88-
- UPGRADE
89-
- PORT_NUMBER
90-
- UPDATE_FEATURES
88+
- value
9189
required: false
9290

9391
/teams:

‎dist/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<link href="styles/api-console-light-theme.css" rel="stylesheet" class="theme">
88
</head>
99
<body ng-app="ramlConsoleApp" ng-cloak class="raml-console-body">
10-
<raml-initializer></raml-initializer>
10+
<raml-console src="http://localhost:9000/examples/leagues.raml"></raml-console>
1111
<script src="scripts/api-console-vendor.js"></script>
1212
<script src="scripts/api-console.js"></script>
1313
<script>

‎dist/scripts/api-console.js‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3463,19 +3463,21 @@ RAML.Inspector = (function() {
34633463
var NamedParameters = function(plain, parameterized) {
34643464
this.plain = copy(plain);
34653465
this.parameterized = parameterized;
3466-
3467-
var that = this;
3468-
34693466
Object.keys(this.plain).map(function (key) {
3470-
var data = that.plain[key].definitions[0];
3467+
var data = this.plain[key].definitions[0];
34713468

34723469
if (typeof data.enum !== 'undefined') {
34733470
if (!data.required) {
34743471
var temp = [''];
34753472
data.enum = temp.concat(data.enum);
34763473
}
34773474
}
3478-
});
3475+
3476+
if (key.charAt(0) === '$') {
3477+
var tempKey = '&#36;' + key.substring(1);
3478+
this.plain[tempKey] = this.plain[key];
3479+
}
3480+
}.bind(this));
34793481

34803482
Object.keys(parameterized || {}).forEach(function(key) {
34813483
parameterized[key].created = [];
@@ -5509,7 +5511,7 @@ angular.module('ramlConsoleApp').run(['$templateCache', function($templateCache)
55095511
"\n" +
55105512
" <sidebar ng-show=\"raml.baseUri\"></sidebar>\n" +
55115513
"\n" +
5512-
" <div class=\"raml-console-sidebar-controls raml-console-sidebar-controls-collapse\" ng-click=\"collapseSidebar($event)\" style=\"right: -1px; position: absolute;\">\n" +
5514+
" <div class=\"raml-console-sidebar-controls raml-console-sidebar-controls-collapse\" ng-click=\"collapseSidebar($event)\" style=\"right: -1px; position: absolute;\"ng-hide=\"!raml.baseUri\">\n" +
55135515
" <button class=\"raml-console-collapse\">\n" +
55145516
" <svg style=\"transform: rotate(-180deg);\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" x=\"0px\" y=\"0px\" viewBox=\"0 0 612 792\" enable-background=\"new 0 0 612 792\" xml:space=\"preserve\">\n" +
55155517
" <g id=\"Layer_3\">\n" +
@@ -5712,8 +5714,7 @@ angular.module('ramlConsoleApp').run(['$templateCache', function($templateCache)
57125714
" <div ng-if=\"requestOptions.url\">\n" +
57135715
" <h3 class=\"raml-console-sidebar-response-head raml-console-sidebar-response-head-pre\">Request URL</h3>\n" +
57145716
" <div class=\"raml-console-sidebar-response-item\">\n" +
5715-
" <p class=\"raml-console-sidebar-response-metadata raml-console-sidebar-request-url\">{{requestOptions.baseUrl}}<span ng-repeat=\"(key, value) in parameters\"><span ng-hide=\"$first\">&amp;</span><b>{{key}}</b>=<i>{{value[0]}}</i></span>\n" +
5716-
" </p>\n" +
5717+
" <p class=\"raml-console-sidebar-response-metadata raml-console-sidebar-request-url\">{{requestOptions.url}}</p>\n" +
57175718
" </div>\n" +
57185719
" </div>\n" +
57195720
"\n" +

‎src/app/directives/resource-panel.tpl.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<sidebar ng-show="raml.baseUri"></sidebar>
99

10-
<div class="raml-console-sidebar-controls raml-console-sidebar-controls-collapse" ng-click="collapseSidebar($event)" style="right: -1px; position: absolute;">
10+
<div class="raml-console-sidebar-controls raml-console-sidebar-controls-collapse" ng-click="collapseSidebar($event)" style="right: -1px; position: absolute;"ng-hide="!raml.baseUri">
1111
<button class="raml-console-collapse">
1212
<svg style="transform: rotate(-180deg);" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 612 792" enable-background="new 0 0 612 792" xml:space="preserve">
1313
<g id="Layer_3">

‎src/app/directives/sidebar.tpl.html‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,7 @@ <h3 class="raml-console-sidebar-head raml-console-sidebar-head-expand">
118118
<div ng-if="requestOptions.url">
119119
<h3 class="raml-console-sidebar-response-head raml-console-sidebar-response-head-pre">Request URL</h3>
120120
<div class="raml-console-sidebar-response-item">
121-
<p class="raml-console-sidebar-response-metadata raml-console-sidebar-request-url">{{requestOptions.baseUrl}}<span ng-repeat="(key, value) in parameters"><span ng-hide="$first">&amp;</span><b>{{key}}</b>=<i>{{value[0]}}</i></span>
122-
</p>
121+
<p class="raml-console-sidebar-response-metadata raml-console-sidebar-request-url">{{requestOptions.url}}</p>
123122
</div>
124123
</div>
125124

‎src/assets/examples/leagues.raml‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,27 +67,25 @@ securedBy: [ null, basic, digest_auth, oauth_2_0, custom_scheme_1, custom_scheme
6767
queryParam:
6868
type: string
6969
enum:
70-
- UPGRADE
71-
- PORT_NUMBER
72-
- UPDATE_FEATURES
70+
- value
7371
required: true
72+
$foo:
73+
maxLength: 35
74+
required: true
75+
example: hola
7476
headers:
7577
header:
7678
type: string
7779
enum:
78-
- UPGRADE
79-
- PORT_NUMBER
80-
- UPDATE_FEATURES
80+
- value
8181
required: false
8282
body:
8383
application/x-www-form-urlencoded:
8484
formParameters:
8585
formParam:
8686
type: string
8787
enum:
88-
- UPGRADE
89-
- PORT_NUMBER
90-
- UPDATE_FEATURES
88+
- value
9189
required: false
9290

9391
/teams:

‎src/common/try_it/named_parameters.js‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,21 @@
2929
var NamedParameters = function(plain, parameterized) {
3030
this.plain = copy(plain);
3131
this.parameterized = parameterized;
32-
33-
var that = this;
34-
3532
Object.keys(this.plain).map(function (key) {
36-
var data = that.plain[key].definitions[0];
33+
var data = this.plain[key].definitions[0];
3734

3835
if (typeof data.enum !== 'undefined') {
3936
if (!data.required) {
4037
var temp = [''];
4138
data.enum = temp.concat(data.enum);
4239
}
4340
}
44-
});
41+
42+
if (key.charAt(0) === '$') {
43+
var tempKey = '&#36;' + key.substring(1);
44+
this.plain[tempKey] = this.plain[key];
45+
}
46+
}.bind(this));
4547

4648
Object.keys(parameterized || {}).forEach(function(key) {
4749
parameterized[key].created = [];

0 commit comments

Comments
 (0)