CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-13 01:02:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix lint warnings, comment out crashy service reset code (re: #3324)

Browse Source
This commit is contained in:
Bryan Housel
2016-09-23 10:23:24 -04:00
parent 9f956e414c
commit 57d0bc13cf
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/core/context.js
View File

@@ -146,8 +146,9 @@ export function Context(root) {
features.reset();
history.reset();
_.each(services, function(service) {
var reset = service().reset;
if (reset) reset(context);
// TODO: fix access to services #3324
// var reset = service().reset;
// if (reset) reset(context);
});
return context;
};

22
modules/ui/commit.js
View File

@@ -18,8 +18,7 @@ export function Commit(context) {
var changes = context.history().changes(),
summary = context.history().difference().summary();
var header = selection
selection
.append('div')
.attr('class', 'header fillL')
.append('h3')
@@ -105,7 +104,7 @@ export function Commit(context) {
.attr('class', 'changeset-list');
var warningLi = warnings.select('ul').selectAll('li')
.data(function(d) { return d; })
.data(function(d) { return d; });
warningLi = warningLi.enter()
.append('li')
@@ -145,19 +144,22 @@ export function Commit(context) {
var userLink = d3.select(document.createElement('div'));
if (user.image_url) {
userLink.append('img')
userLink
.append('img')
.attr('src', user.image_url)
.attr('class', 'icon pre-text user-icon');
}
userLink.append('a')
userLink
.append('a')
.attr('class','user-info')
.text(user.display_name)
.attr('href', context.connection().userURL(user.display_name))
.attr('tabindex', -1)
.attr('target', '_blank');
prose.html(t('commit.upload_explanation_with_user', {user: userLink.html()}));
prose
.html(t('commit.upload_explanation_with_user', { user: userLink.html() }));
});
@@ -223,15 +225,11 @@ export function Commit(context) {
li.append('span')
.attr('class', 'change-type')
.text(function(d) {
return t('commit.' + d.changeType) + ' ';
});
.text(function(d) { return t('commit.' + d.changeType) + ' '; });
li.append('strong')
.attr('class', 'entity-type')
.text(function(d) {
return context.presets().match(d.entity, d.graph).name();
});
.text(function(d) { return context.presets().match(d.entity, d.graph).name(); });
li.append('span')
.attr('class', 'entity-name')