From 7e8bd0f41164c94f52d08f1ec216bf91a81bb1a8 Mon Sep 17 00:00:00 2001
From: theworldbright <kent@kentshikama.com>
Date: Sun, 22 Nov 2015 14:42:54 -0800
Subject: [PATCH] Add fallback for failed app logo rendering

---
 app/assets/javascripts/api/authorization_page.js             | 5 +++++
 app/assets/javascripts/main.js                               | 1 +
 .../api/openid_connect/authorizations/_grants_list.haml      | 2 +-
 .../api/openid_connect/user_applications/_grants_list.haml   | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 app/assets/javascripts/api/authorization_page.js

diff --git a/app/assets/javascripts/api/authorization_page.js b/app/assets/javascripts/api/authorization_page.js
new file mode 100644
index 000000000..d61b941ec
--- /dev/null
+++ b/app/assets/javascripts/api/authorization_page.js
@@ -0,0 +1,5 @@
+$(document).ready(function() {
+  $("#js-app-logo").error(function () {
+    $(this).attr("src", ImagePaths.get("user/default.png"));
+  });
+});
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index ff8d91750..151d99bbf 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -45,3 +45,4 @@
 //= require bootstrap-switch
 //= require blueimp-gallery
 //= require leaflet
+//= require api/authorization_page
diff --git a/app/views/api/openid_connect/authorizations/_grants_list.haml b/app/views/api/openid_connect/authorizations/_grants_list.haml
index 60cbbe4dd..454087044 100644
--- a/app/views/api/openid_connect/authorizations/_grants_list.haml
+++ b/app/views/api/openid_connect/authorizations/_grants_list.haml
@@ -1,6 +1,6 @@
 .application-img
   - if app.image
-    = image_tag app.image, class: "img-responsive"
+    = image_tag app.image, class: "img-responsive", id: "js-app-logo"
   - else
     %i.entypo-browser
 .application-authorizations
diff --git a/app/views/api/openid_connect/user_applications/_grants_list.haml b/app/views/api/openid_connect/user_applications/_grants_list.haml
index 1ef5d12dc..210a8a0fe 100644
--- a/app/views/api/openid_connect/user_applications/_grants_list.haml
+++ b/app/views/api/openid_connect/user_applications/_grants_list.haml
@@ -1,6 +1,6 @@
 .application-img
   - if app.image
-    = image_tag app.image, class: "img-responsive"
+    = image_tag app.image, class: "img-responsive", id: "js-app-logo"
   - else
     %i.entypo-browser
 .application-authorizations