diff --git a/public/_includes/_scripts-include.jade b/public/_includes/_scripts-include.jade index 43ea0e0f5f..ead15fbb4e 100644 --- a/public/_includes/_scripts-include.jade +++ b/public/_includes/_scripts-include.jade @@ -2,7 +2,6 @@ script(src="/resources/js/vendor/prettify.js") script(src="/resources/js/vendor/lang-basic.js") script(src="/resources/js/vendor/lang-dart.js") -script(src="/resources/js/vendor/jquery.js") diff --git a/public/about/index.jade b/public/about/index.jade index f12affab52..35a4c015ac 100644 --- a/public/about/index.jade +++ b/public/about/index.jade @@ -19,7 +19,7 @@ for person, name in bios .c3 - md-card(bio class="bio-card" data-website="#{person.website}" data-twitter="#{person.twitter}" data-pic="#{person.picture}" data-bio="#{person.bio}" data-name="#{person.name}" ng-click="showBio($event)") + md-card(biocard class="bio-card" data-website="#{person.website}" data-twitter="#{person.twitter}" data-pic="#{person.picture}" data-bio="#{person.bio}" data-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 ae979c85b5..5ab54a1d2a 100644 --- a/public/resources/js/directives/bio.js +++ b/public/resources/js/directives/bio.js @@ -1,28 +1,27 @@ -angularIO.directive('bio', function($rootScope, $timeout) { +angularIO.directive('biocard', function($rootScope, $timeout, $mdDialog) { return { restrict: 'A', - replace: true, scope: {}, link: function (scope, element, attrs) { - var name = element.attr('data-name'); - var bio = element.attr('data-bio'); - var pic = element.attr('data-pic'); - var twitter = element.attr('data-twitter'); - var website = element.attr('data-website'); - var $twitter = twitter !== 'undefined' ? 'Twitter' : ''; - var $website = website !== 'undefined' ? 'Website' : ''; + scope.name = element.attr('data-name'); + scope.bio = element.attr('data-bio'); + scope.pic = element.attr('data-pic'); + scope.twitter = element.attr('data-twitter'); + scope.website = element.attr('data-website'); + scope.$twitter = scope.twitter !== 'undefined' ? 'Twitter' : ''; + scope.$website = scope.website !== 'undefined' ? 'Website' : ''; - scope.showBio = function(event) { + element.on('click', function($event) { $mdDialog.show({ parent: angular.element(document.body), targetEvent: $event, template: '' + ' ' + - ' ' + - '

' + name + '

' + - ' ' + - '

' + bio + '

' + + ' ' + + '

' + scope.name + '

' + + ' ' + + '

' + scope.bio + '

' + '
' + '
' + ' ' + @@ -31,11 +30,11 @@ angularIO.directive('bio', function($rootScope, $timeout) { '
' + '
', locals: { - items: $scope.items + items: scope.items }, controller: DialogController }); - }; + }); function DialogController(scope, $mdDialog, items) { scope.items = items;