Corrected issues with merge of 2.x changes

This commit is contained in:
Shelby Sanders 2014-08-04 19:56:58 -07:00
parent 696e387ff3
commit 24d77f027d
6 changed files with 7 additions and 16 deletions

2
.gitignore vendored
View File

@ -14,3 +14,5 @@ results
npm-debug.log
node_modules
LoopBackExplorer.iml

View File

@ -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>

View File

@ -61,4 +61,4 @@ function explorer(loopbackApplication, options) {
app.use(express.static(SWAGGER_UI_ROOT));
return app;
}
}

View File

@ -23,4 +23,4 @@
/*
FIXME: Separate the overrides from the rest of the styles, rather than override screen.css entirely.
*/
*/

View File

@ -44,4 +44,4 @@
<div id="message-bar" class="swagger-ui-wrap">&nbsp;</div>
<div id="swagger-ui-container" class="swagger-ui-wrap"></div>
</body>
</html>
</html>

View File

@ -4,8 +4,8 @@
/*global SwaggerUi, log, ApiKeyAuthorization, hljs, window, $ */
$(function() {
$.getJSON('config.json', function(config) {
log(config);
loadSwaggerUi(config);
log(config);
loadSwaggerUi(config);
});
var accessToken;
@ -61,4 +61,3 @@ $(function() {
}
}
});