From 1c3b1f7c177da43e55de61411903486eb5b41c10 Mon Sep 17 00:00:00 2001 From: dblock Date: Tue, 16 Sep 2014 10:22:07 -0400 Subject: [PATCH 1/2] Fix: JS error - Docs.shebang: undefined is not a function. --- app/assets/javascripts/playground.js.coffee | 2 +- app/views/layouts/application.html.haml | 2 +- vendor/assets/javascripts/swagger-lib.js | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/playground.js.coffee b/app/assets/javascripts/playground.js.coffee index 536b76e..697c403 100644 --- a/app/assets/javascripts/playground.js.coffee +++ b/app/assets/javascripts/playground.js.coffee @@ -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" diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 446c443..41ab556 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -1,10 +1,10 @@ !!! %html = render 'shared/header' + = javascript_include_tag 'application' %body #holder = render 'shared/nav' .container.content = yield = render 'shared/footer' - = javascript_include_tag 'application' diff --git a/vendor/assets/javascripts/swagger-lib.js b/vendor/assets/javascripts/swagger-lib.js index cf0a2e4..ce01a37 100644 --- a/vendor/assets/javascripts/swagger-lib.js +++ b/vendor/assets/javascripts/swagger-lib.js @@ -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 //= require ../swagger-ui/lib/jquery.wiggle.min.js //= require ../swagger-ui/lib/jquery.ba-bbq.min.js From b6b639f6aad2c55f0debeeb259a493c23c65600e Mon Sep 17 00:00:00 2001 From: dblock Date: Tue, 16 Sep 2014 10:22:18 -0400 Subject: [PATCH 2/2] Renamed app title. --- app/views/shared/_header.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/shared/_header.html.haml b/app/views/shared/_header.html.haml index 52d6036..d12facf 100644 --- a/app/views/shared/_header.html.haml +++ b/app/views/shared/_header.html.haml @@ -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