From 7d161f2868c2f982b187d21eb1681be42730db7d Mon Sep 17 00:00:00 2001 From: malte Date: Fri, 19 Aug 2016 09:48:04 +0200 Subject: [PATCH 1/5] added all further events that are visible in timeline and will still be created by github. --- src/events.repo.html | 10 ++++-- src/events.user.html | 11 ++++-- src/service.js | 83 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 97 insertions(+), 7 deletions(-) diff --git a/src/events.repo.html b/src/events.repo.html index 19de7e6..75734aa 100644 --- a/src/events.repo.html +++ b/src/events.repo.html @@ -16,11 +16,15 @@

{{event.actor.login}} - {{event.messageAction | limitTo: 128}}{{event.messageElementOne}} - at {{event.messageElementTwo}} + {{event.messageAction | limitTo: 128}} + {{event.messageElementOne}} + + at + {{event.messageElementTwo}} +

- {{comment.id | limitTo: 7}} + {{comment.id | limitTo: 7}}  {{comment.message | limitTo: 128}}

diff --git a/src/events.user.html b/src/events.user.html index c92c52d..7867624 100644 --- a/src/events.user.html +++ b/src/events.user.html @@ -16,11 +16,16 @@

{{event.actor.login}} - {{event.messageAction | limitTo: 128}}{{event.messageElementOne}} - at {{event.messageElementTwo}} + {{event.messageAction | limitTo: 128}} + {{event.messageElementOne}} + + at + {{event.messageElementTwo}} +

- {{comment.id | limitTo: 7}} {{comment.message | limitTo: 128}} + {{comment.id | limitTo: 7}}  + {{comment.message | limitTo: 128}}

{{event.actor.login}}, diff --git a/src/service.js b/src/service.js index 328a6bd..c56d1a6 100644 --- a/src/service.js +++ b/src/service.js @@ -64,6 +64,8 @@ function GithubService($q, $http, githubApiUrl) { .then(transformData); } + // transform data from promise to fit in view of repo, org and user events + function transformData(data){ for(var i = 0; i Date: Fri, 19 Aug 2016 11:57:41 +0200 Subject: [PATCH 2/5] put redundant hmtl code from event.X.html (X=org,repo,user) to events.html and added a new directive to GithubEventsController --- src/events.directive.js | 10 ++++++++++ src/events.html | 31 +++++++++++++++++++++++++++++++ src/events.org.html | 32 +------------------------------- src/events.repo.html | 32 +------------------------------- src/events.user.html | 32 +------------------------------- 5 files changed, 44 insertions(+), 93 deletions(-) create mode 100644 src/events.directive.js create mode 100644 src/events.html diff --git a/src/events.directive.js b/src/events.directive.js new file mode 100644 index 0000000..4e880f2 --- /dev/null +++ b/src/events.directive.js @@ -0,0 +1,10 @@ +'use strict'; + +angular + .module('adf.widget.github') + .controller('GithubEventsController') + .directive('eventDirective', function() { + return { + templateUrl: 'src/events.html' + }; + }); diff --git a/src/events.html b/src/events.html new file mode 100644 index 0000000..ab4ce31 --- /dev/null +++ b/src/events.html @@ -0,0 +1,31 @@ + diff --git a/src/events.org.html b/src/events.org.html index 7a90002..ad7a5a9 100644 --- a/src/events.org.html +++ b/src/events.org.html @@ -3,36 +3,6 @@ Please configure the widget
- +
diff --git a/src/events.repo.html b/src/events.repo.html index 75734aa..cb89116 100644 --- a/src/events.repo.html +++ b/src/events.repo.html @@ -3,36 +3,6 @@ Please configure the widget
- +
diff --git a/src/events.user.html b/src/events.user.html index 7867624..701ae6b 100644 --- a/src/events.user.html +++ b/src/events.user.html @@ -3,36 +3,6 @@ Please configure the widget
- +
From 451a1c87bba265d740704b31acebda01c433fab8 Mon Sep 17 00:00:00 2001 From: malte Date: Fri, 19 Aug 2016 16:23:16 +0200 Subject: [PATCH 3/5] minor code cleansing --- src/service.js | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/src/service.js b/src/service.js index c56d1a6..4160b31 100644 --- a/src/service.js +++ b/src/service.js @@ -81,19 +81,13 @@ function GithubService($q, $http, githubApiUrl) { if(eventType === "PullRequestEvent"){ - var issueNumer = data[i].payload.number; + var issueNumber = data[i].payload.number; var actionStatus = data[i].payload.action; - if (actionStatus === "closed") { - data[i].messageAction = "closed pull request "; - data[i].messageElementOne = repoName + "#" + issueNumer; - data[i].linkElementOne = repoUrl + "/issues/" + issueNumer; - } - else if (actionStatus === "opened"){ - data[i].messageAction = "opened pull request "; - data[i].messageElementOne = repoName + "#" + issueNumer; - data[i].linkElementOne = repoUrl + "/issues/" + issueNumer; - } + data[i].messageAction = actionStatus + " pull request "; + data[i].messageElementOne = repoName + "#" + issueNumber; + data[i].linkElementOne = repoUrl + "/issues/" + issueNumber; + if(data[i].payload.pull_request){ data[i].comments = bindSingleComment(data[i].payload.pull_request.title); } @@ -141,12 +135,8 @@ function GithubService($q, $http, githubApiUrl) { else if (eventType === "IssuesEvent") { var actionStatus = data[i].payload.action; - if (actionStatus === "closed") { - data[i].messageAction = "closed issue "; - } - else if (actionStatus === "opened"){ - data[i].messageAction = "opened issue "; - } + data[i].messageAction = actionStatus + " issue "; + var issueNumber = data[i].payload.issue.number; data[i].messageElementOne = repoName + "#" + issueNumber; From 269a2f4f1b2b298a7bdc2e29f2ea56715d6c9859 Mon Sep 17 00:00:00 2001 From: malte Date: Fri, 19 Aug 2016 16:24:50 +0200 Subject: [PATCH 4/5] deletion of controller line --- src/events.directive.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/events.directive.js b/src/events.directive.js index 4e880f2..d0218f4 100644 --- a/src/events.directive.js +++ b/src/events.directive.js @@ -2,7 +2,6 @@ angular .module('adf.widget.github') - .controller('GithubEventsController') .directive('eventDirective', function() { return { templateUrl: 'src/events.html' From 289623cd6a270ccef4d75f594f428030bbd5e75a Mon Sep 17 00:00:00 2001 From: malte Date: Wed, 24 Aug 2016 08:53:50 +0200 Subject: [PATCH 5/5] changed directive-tag 'event-directive' to 'events' --- src/events.directive.js | 2 +- src/events.org.html | 2 +- src/events.repo.html | 2 +- src/events.user.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/events.directive.js b/src/events.directive.js index d0218f4..15b12ab 100644 --- a/src/events.directive.js +++ b/src/events.directive.js @@ -2,7 +2,7 @@ angular .module('adf.widget.github') - .directive('eventDirective', function() { + .directive('events', function() { return { templateUrl: 'src/events.html' }; diff --git a/src/events.org.html b/src/events.org.html index ad7a5a9..0545df5 100644 --- a/src/events.org.html +++ b/src/events.org.html @@ -3,6 +3,6 @@ Please configure the widget
- +
diff --git a/src/events.repo.html b/src/events.repo.html index cb89116..f2ac7fd 100644 --- a/src/events.repo.html +++ b/src/events.repo.html @@ -3,6 +3,6 @@ Please configure the widget
- +
diff --git a/src/events.user.html b/src/events.user.html index 701ae6b..b9e75f2 100644 --- a/src/events.user.html +++ b/src/events.user.html @@ -3,6 +3,6 @@ Please configure the widget
- +