Corrected issues with merge of 2.x changes
This commit is contained in:
parent
696e387ff3
commit
24d77f027d
|
@ -14,3 +14,5 @@ results
|
||||||
|
|
||||||
npm-debug.log
|
npm-debug.log
|
||||||
node_modules
|
node_modules
|
||||||
|
|
||||||
|
LoopBackExplorer.iml
|
||||||
|
|
|
@ -1,10 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<module type="WEB_MODULE" version="4">
|
|
||||||
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
|
||||||
<exclude-output />
|
|
||||||
<content url="file://$MODULE_DIR$" />
|
|
||||||
<orderEntry type="inheritedJdk" />
|
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
|
||||||
</component>
|
|
||||||
</module>
|
|
||||||
|
|
2
index.js
2
index.js
|
@ -61,4 +61,4 @@ function explorer(loopbackApplication, options) {
|
||||||
app.use(express.static(SWAGGER_UI_ROOT));
|
app.use(express.static(SWAGGER_UI_ROOT));
|
||||||
|
|
||||||
return app;
|
return app;
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,4 +23,4 @@
|
||||||
|
|
||||||
/*
|
/*
|
||||||
FIXME: Separate the overrides from the rest of the styles, rather than override screen.css entirely.
|
FIXME: Separate the overrides from the rest of the styles, rather than override screen.css entirely.
|
||||||
*/
|
*/
|
|
@ -44,4 +44,4 @@
|
||||||
<div id="message-bar" class="swagger-ui-wrap"> </div>
|
<div id="message-bar" class="swagger-ui-wrap"> </div>
|
||||||
<div id="swagger-ui-container" class="swagger-ui-wrap"></div>
|
<div id="swagger-ui-container" class="swagger-ui-wrap"></div>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
@ -4,8 +4,8 @@
|
||||||
/*global SwaggerUi, log, ApiKeyAuthorization, hljs, window, $ */
|
/*global SwaggerUi, log, ApiKeyAuthorization, hljs, window, $ */
|
||||||
$(function() {
|
$(function() {
|
||||||
$.getJSON('config.json', function(config) {
|
$.getJSON('config.json', function(config) {
|
||||||
log(config);
|
log(config);
|
||||||
loadSwaggerUi(config);
|
loadSwaggerUi(config);
|
||||||
});
|
});
|
||||||
|
|
||||||
var accessToken;
|
var accessToken;
|
||||||
|
@ -61,4 +61,3 @@ $(function() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue