Skip to content

Commit ced8077

Browse files
authored
Merge branch 'master' into fix-issue-380
2 parents 675225e + 5ccc25c commit ced8077

File tree

8 files changed

+89
-65
lines changed

8 files changed

+89
-65
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:4.1
1+
FROM node:4.7
22

33
# Install Ruby (for Gem)
44
RUN apt-get update \

Gruntfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ module.exports = function (grunt) {
4747
connect: {
4848
options: {
4949
hostname: '0.0.0.0',
50-
port: 9000
50+
port: grunt.option('port') || 9000
5151
},
5252

5353
livereload: {

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ In *Single View* mode you will be able to see only documentation or try-it.
109109

110110
*Resources* can be collapsed if needed by adding the following setting:
111111

112-
<raml-console-loader src="path-to-raml" options="{ resourceCollapsed: true }"></raml-console-loader>
112+
<raml-console-loader src="path-to-raml" options="{ resourcesCollapsed: true }"></raml-console-loader>
113113

114114
### Documentation collapsed
115115

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "api-console",
3-
"version": "3.0.11",
3+
"version": "3.0.15",
44
"repository": {
55
"type": "git",
66
"url": "https://github.com/mulesoft/api-console.git"
@@ -22,7 +22,7 @@
2222
"jszip": "~2.0.0",
2323
"marked": "~0.3.1",
2424
"raml-client-generator": "~0.0.7",
25-
"raml-1-parser": "https://github.com/raml-org/raml-js-parser-2/releases/download/1.1.8/raml-1-parser.zip",
25+
"raml-1-parser": "https://github.com/raml-org/raml-js-parser-2/releases/download/1.1.16/raml-1-parser.zip",
2626
"resolve-url": "~0.2.1",
2727
"slug": "~0.8.0",
2828
"velocity": "~1.1.0",

dist/scripts/api-console-vendor.js

Lines changed: 63 additions & 59 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/scripts/api-console.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,16 @@
359359
$elements.removeClass('raml-console-is-active');
360360
$container.find('.raml-console-body-' + $scope.getBodyId(value)).addClass('raml-console-is-active');
361361
});
362+
363+
$scope.$watch('methodInfo.responses', function (responses) {
364+
$scope.methodInfo.responses = responses;
365+
$scope.fullResponses = mergeResponseCodes($scope.methodInfo.responses || {}, $scope.methodInfo.securitySchemes());
366+
$scope.fullResponseCodes = Object.keys($scope.fullResponses);
367+
if ($scope.fullResponseCodes && $scope.fullResponseCodes.length > 0) {
368+
$scope.currentStatusCode = $scope.fullResponseCodes[0];
369+
}
370+
});
371+
362372
}],
363373
replace: true
364374
};

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "api-console",
3-
"version": "3.0.11",
3+
"version": "3.0.15",
44
"description": "Api-Console for RAML based app",
55
"files": [
66
"dist",

src/app/directives/documentation.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,16 @@
239239
$elements.removeClass('raml-console-is-active');
240240
$container.find('.raml-console-body-' + $scope.getBodyId(value)).addClass('raml-console-is-active');
241241
});
242+
243+
$scope.$watch('methodInfo.responses', function (responses) {
244+
$scope.methodInfo.responses = responses;
245+
$scope.fullResponses = mergeResponseCodes($scope.methodInfo.responses || {}, $scope.methodInfo.securitySchemes());
246+
$scope.fullResponseCodes = Object.keys($scope.fullResponses);
247+
if ($scope.fullResponseCodes && $scope.fullResponseCodes.length > 0) {
248+
$scope.currentStatusCode = $scope.fullResponseCodes[0];
249+
}
250+
});
251+
242252
}],
243253
replace: true
244254
};

0 commit comments

Comments
 (0)