From 28d742ffcea40373ecdda3c11a03918c0dce40dd Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Sat, 17 Sep 2016 15:52:26 +0200 Subject: [PATCH] fix(about): dialog should not show twitter if empty * The bio directive accidentally shows the Twitter link in the dialog, even if it's undefined. * Fix deprecation warning of Angular Material, where `md-dialog-actions` should be used instead of the class. --- public/about/index.jade | 2 +- public/resources/js/directives/bio.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/about/index.jade b/public/about/index.jade index b6b429b178..1150e51a56 100644 --- a/public/about/index.jade +++ b/public/about/index.jade @@ -22,7 +22,7 @@ for person, name in bios if person.type == type .c3 - md-card(biocard class="bio-card" website="#{person.website}" twitter="#{person.twitter}" pic="#{person.picture}" bio="#{person.bio}" name="#{person.name}") + md-card(biocard class="bio-card" website=person.website twitter=person.twitter pic=person.picture bio=person.bio name=person.name) header image(src="#{person.picture}" alt="#person.name") diff --git a/public/resources/js/directives/bio.js b/public/resources/js/directives/bio.js index e968abcb98..71727c8a55 100644 --- a/public/resources/js/directives/bio.js +++ b/public/resources/js/directives/bio.js @@ -33,11 +33,11 @@ angularIO.directive('biocard', function($rootScope, $timeout, $mdDialog) { ' ' + '

{{bio}}

' + ' ' + - '
' + + ' ' + ' ' + ' Close Bio' + ' ' + - '
' + + ' ' + '' }); });