Skip to content
This repository was archived by the owner on May 10, 2024. It is now read-only.

Commit 15a7db0

Browse files
authored
Merge pull request #498 from mulesoft/develop
Bump console, converter and raml suggestions versions
2 parents 904d765 + 19a5e7c commit 15a7db0

8 files changed

Lines changed: 3311 additions & 1682 deletions

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"angular": "~1.3.17",
1111
"angular-bootstrap": ">=0.11.0 <0.14.0",
1212
"angular-ui-tree": "2.1.5",
13-
"api-console": "mulesoft/api-console#v3.0.19",
13+
"api-console": "mulesoft/api-console#v3.0.20",
1414
"es5-shim": "~2.3.0",
1515
"file-saver.js": "~1.20150304.1",
1616
"font-awesome": "~4.0.3",

dist/scripts/api-designer-parser.js

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

dist/scripts/api-designer-parser.min.js

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

dist/scripts/api-designer-vendor.js

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81897,7 +81897,7 @@ exports.javascript = require('./javascript');
8189781897
return undefined;
8189881898
}
8189981899

81900-
var separator = (description ? (usage ? '\n' : '') : ('') )+ 'Format example: ';
81900+
var separator = (description ? (usage ? '\n Format example: ' : '') : ('') );
8190181901
return (description ? description : '') + separator + usage;
8190281902
};
8190381903
}]
@@ -82663,6 +82663,11 @@ exports.javascript = require('./javascript');
8266382663
}
8266482664
}
8266582665

82666+
$scope.getNativeType = function(type) {
82667+
var paramType = getParamType(type).type;
82668+
return Array.isArray(paramType) ? paramType[0] : paramType;
82669+
};
82670+
8266682671
$scope.isEnum = function (definition) {
8266782672
var paramType = getParamType(definition);
8266882673
return paramType.hasOwnProperty('enum');
@@ -83053,7 +83058,7 @@ exports.javascript = require('./javascript');
8305383058

8305483059
function resourceLevelDescriptionElement(resource) {
8305583060
var element = angular.element('<span class="raml-console-resource-level-description raml-console-marked-content"></span>');
83056-
element.attr('markdown', resource.description);
83061+
element.append(angular.element('<p>' + resource.description + '</p>'));
8305783062
return element;
8305883063
}
8305983064

@@ -84527,7 +84532,7 @@ exports.javascript = require('./javascript');
8452784532
if (expandedType) {
8452884533
for (var key in expandedType) {
8452984534
if (expandedType.hasOwnProperty(key)) {
84530-
if (['example', 'examples'].includes(key) && valueHasExamples) { continue; }
84535+
if ((key === 'example' || key === 'examples') && valueHasExamples) { continue; }
8453184536
value[key] = expandedType[key];
8453284537
}
8453384538
}
@@ -89102,7 +89107,7 @@ angular.module('ramlConsoleApp').run(['$templateCache', function($templateCache)
8910289107
" <a class=\"raml-console-sidebar-override\" ng-if=\"canOverride(param)\" ng-click=\"overrideField($event, param)\">Override</a>\n" +
8910389108
" <span class=\"raml-console-side-bar-required-field\" ng-if=\"param.required\">*</span>\n" +
8910489109
" <label ng-if=\"param.isFromSecurityScheme\" class=\"raml-console-sidebar-security-label\">from security scheme</label>\n" +
89105-
" <span class=\"raml-console-resource-param-instructional\">{{toString(param.type)}}</span>\n" +
89110+
" <span class=\"raml-console-resource-param-instructional\">{{getNativeType(param)}}</span>\n" +
8910689111
" </label>\n" +
8910789112
"\n" +
8910889113
" <div ng-if=\"!param.properties && !isArray(param)\">\n" +

dist/scripts/api-designer-vendor.min.js

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

0 commit comments

Comments
 (0)