Commit 55d2dbe265ce7a96e070134aa13efe6addfe7b2f
tidy and fixup of breaking changes
mix irving committed on 11/3/2016, 9:20:53 AMParent: 887a7d85d244bec1a2a3868e8203868fdfe0519f
Files changed
lib/forms.js | changed |
lib/repos/index.js | changed |
lib/repos/issues.js | changed |
lib/repos/pulls.js | changed |
lib/users.js | changed |
lib/forms.js | ||
---|---|---|
@@ -27,28 +27,27 @@ | ||
27 | 27 … | |
28 | 28 … | if (!enabled) { |
29 | 29 … | return h('form', {class: 'petname', action: '', method: 'post'}, [ |
30 | 30 … | header, |
31 | - h('br', {clear: 'all'}, []) | |
31 … | + h('br', {clear: 'all'}) | |
32 | 32 … | ]) |
33 | 33 … | } |
34 | 34 … | |
35 | 35 … | return h('form', {class: 'petname', action: '', method: 'post'}, [ |
36 | 36 … | h('input', { |
37 | 37 … | type: 'checkbox', class: 'name-checkbox', id: inputId, |
38 | 38 … | onfocus: 'this.form.name.focus()' |
39 | - }, []), | |
39 … | + }), | |
40 | 40 … | h('input', { |
41 | 41 … | class: 'name', name: 'name', value: u.escape(name), |
42 | 42 … | onkeyup: 'if (event.keyCode == 27) this.form.reset()' |
43 | - }, []), | |
44 | - h('input', {type: 'hidden', name: 'action', value: action}, []), | |
45 | - h('input', {type: 'hidden', name: 'id', value: u.escape(id)}, []), | |
43 … | + }), | |
44 … | + h('input', {type: 'hidden', name: 'action', value: action}), | |
45 … | + h('input', {type: 'hidden', name: 'id', value: u.escape(id)}), | |
46 | 46 … | h('label', {class: 'name-toggle', for: inputId, title: title}, [ |
47 | 47 … | h('i', '✍') |
48 | 48 … | ]), |
49 | - h('input', {class: 'btn name-btn', type: 'submit', value: req._t('Rename')}, []), | |
50 | - // NB this needs an empty 3rd arg to render for some reason? | |
49 … | + h('input', {class: 'btn name-btn', type: 'submit', value: req._t('Rename')}), | |
51 | 50 … | header |
52 | 51 … | ]) |
53 | 52 … | } |
54 | 53 … |
lib/repos/index.js | ||
---|---|---|
@@ -233,8 +233,12 @@ | ||
233 | 233 … | ? once('') |
234 | 234 … | : h('small', {class: 'bgslash'}, req._t('ForkedFrom', { |
235 | 235 … | repo: `${u.link([repo.upstream.feed], upstreamAuthorName)} / ${u.link([repo.upstream.id], upstreamName)}` |
236 | 236 … | })) |
237 … | + //u.when(!!repo.upstream, | |
238 … | + //h('small', {class: 'bgslash'}, req._t('ForkedFrom', { | |
239 … | + //repo: `${u.link([repo.upstream.feed], upstreamAuthorName)} / ${u.link([repo.upstream.id], upstreamName)}` | |
240 … | + //})) | |
237 | 241 … | ), |
238 | 242 … | u.nav([ |
239 | 243 … | [[repo.id], req._t('Code'), 'code'], |
240 | 244 … | [[repo.id, 'activity'], req._t('Activity'), 'activity'], |
lib/repos/issues.js | ||
---|---|---|
@@ -43,14 +43,15 @@ | ||
43 | 43 … | '<button class="btn btn-primary">+ ' + |
44 | 44 … | req._t(isPRs ? 'pullRequest.New' : 'issue.New') + |
45 | 45 … | '</button>' + |
46 | 46 … | '</form>') + |
47 | - '<h3>' + req._t(isPRs ? 'PullRequests' : 'Issues') + '</h3>' + | |
48 | - u.nav([ | |
49 | - ['?', req._t('issues.Open'), 'open'], | |
50 | - ['?state=closed', req._t('issues.Closed'), 'closed'], | |
51 | - ['?state=all', req._t('issues.All'), 'all'] | |
52 | - ], state)), | |
47 … | + '<h3>' + req._t(isPRs ? 'PullRequests' : 'Issues') + '</h3>' | |
48 … | + ), | |
49 … | + u.nav([ | |
50 … | + ['?', req._t('issues.Open'), 'open'], | |
51 … | + ['?state=closed', req._t('issues.Closed'), 'closed'], | |
52 … | + ['?state=all', req._t('issues.All'), 'all'] | |
53 … | + ], state), | |
53 | 54 … | pull( |
54 | 55 … | (isPRs ? self.web.pullReqs : self.web.issues).list({ |
55 | 56 … | repo: repo.id, |
56 | 57 … | project: repo.id, |
lib/repos/pulls.js | |||
---|---|---|---|
@@ -69,14 +69,13 @@ | |||
69 | 69 … | headBranchLink + '</code>') | |
70 | 70 … | }) + '</section>') | |
71 | 71 … | }) | |
72 | 72 … | }), | |
73 | - pull.once( | ||
74 | - u.nav([ | ||
75 | - [[pr.id], req._t('Discussion'), 'activity'], | ||
76 | - [[pr.id, 'commits'], req._t('Commits'), 'commits'], | ||
77 | - [[pr.id, 'files'], req._t('Files'), 'files'] | ||
78 | - ], page)), | ||
73 … | + u.nav([ | ||
74 … | + [[pr.id], req._t('Discussion'), 'activity'], | ||
75 … | + [[pr.id, 'commits'], req._t('Commits'), 'commits'], | ||
76 … | + [[pr.id, 'files'], req._t('Files'), 'files'] | ||
77 … | + ], page), | ||
79 | 78 … | u.readNext(function (cb) { | |
80 | 79 … | if (page == 'commits') | |
81 | 80 … | self.renderPullReqCommits(req, pr, repo, headRepo, cb) | |
82 | 81 … | else if (page == 'files') |
lib/users.js | ||
---|---|---|
@@ -40,14 +40,14 @@ | ||
40 | 40 … | '<img class="profile-icon"' + |
41 | 41 … | ' src="/' + encodeURIComponent(about.image) + '"' + |
42 | 42 … | ' alt="' + u.escape(about.name) + '"> ' : '') + |
43 | 43 … | u.escape(about.name), true) + |
44 | - '<code class="user-id">' + feedId + '</code></h2>' + | |
44 … | + '<code class="user-id">' + feedId + '</code></h2>'), | |
45 | 45 … | u.nav([ |
46 | 46 … | [[feedId], req._t('Activity'), 'activity'], |
47 | 47 … | [[feedId, 'repos'], req._t('Repos'), 'repos'], |
48 | 48 … | [[feedId, 'digs'], req._t('ReposDug'), 'digs'], |
49 | - ], page)), | |
49 … | + ], page), | |
50 | 50 … | body |
51 | 51 … | ]))) |
52 | 52 … | }) |
53 | 53 … | }) |
Built with git-ssb-web