Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

@dylanfareed => Fix swagger shebang. #42

Merged
merged 2 commits into from
Sep 16, 2014
Merged

@dylanfareed => Fix swagger shebang. #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c3b1f7
Fix: JS error - Docs.shebang: undefined is not a function.
dblock Sep 16, 2014
b6b639f
Renamed app title.
dblock Sep 16, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/assets/javascripts/playground.js.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ $ ->
$('#swagger-ui-container .info').remove()
$('#swagger-ui-container .footer').remove()
setTimeout( =>
$('#message-bar.swagger-ui-wrap').fadeOut(300, => @remove())
$('#message-bar.swagger-ui-wrap').fadeOut(300)
3000)
docExpansion: "list"

Expand Down
2 changes: 1 addition & 1 deletion app/views/layouts/application.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
!!!
%html
= render 'shared/header'
= javascript_include_tag 'application'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Feels like the move the js to the head and then to the end of the body and then back and forth is a dance we do increasingly these days.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👯

%body
#holder
= render 'shared/nav'
.container.content
= yield
= render 'shared/footer'
= javascript_include_tag 'application'
2 changes: 1 addition & 1 deletion app/views/shared/_header.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
%head
%title Artsy Developers
%title Artsy.net Public API
= stylesheet_link_tag 'application', media: 'all'
= stylesheet_link_tag params[:controller]
= csrf_meta_tags
Expand Down
1 change: 0 additions & 1 deletion vendor/assets/javascripts/swagger-lib.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//= require ../swagger-ui/lib/shred.bundle.js
//= require ../swagger-ui/lib/jquery-1.8.0.min.js
//= require ../swagger-ui/lib/jquery.slideto.min.js
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is just here, yeah? https://github.com/artsy/doppler/blob/master/app/assets/javascripts/application.js#L1

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep.

//= require ../swagger-ui/lib/jquery.wiggle.min.js
//= require ../swagger-ui/lib/jquery.ba-bbq.min.js
Expand Down