Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

Remove asterisks on setconfig in mv #547

Merged
merged 2 commits into from Sep 16, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions app/views/viewlets/service-config.js
Expand Up @@ -139,11 +139,10 @@ YUI.add('service-config-view', function(Y) {
_highlightUncommitted: function(e) {
var container = this.get('container'),
dirtyFields = e.newVal || e;
container.all('label.uncommitted').removeClass('uncommitted');
container.all('.settings-wrapper').removeClass('uncommitted');
dirtyFields.forEach(function(configKey) {
container.one('[data-bind=config.' + configKey + ']')
.ancestor('.settings-wrapper')
.one('label')
.addClass('uncommitted');
});
},
Expand Down
6 changes: 5 additions & 1 deletion lib/views/juju-inspector.less
Expand Up @@ -731,7 +731,7 @@
}
}
.settings-wrapper {
label.uncommitted::after {
&.uncommitted label::after {
.uncommitted-circle;
content: "\00B0";
margin-left: 4px;
Expand Down Expand Up @@ -779,6 +779,10 @@
min-height: 13px;
}
}
&.uncommitted .modified {
background-image: none;
background-color: white;
}
.conflict-pending {
background-color: @inspector-changed-field;
background-image: url(/juju-ui/assets/images/non-sprites/field-conflict.png);
Expand Down
3 changes: 2 additions & 1 deletion test/test_inspector_settings.js
Expand Up @@ -509,7 +509,8 @@ describe('Inspector Settings', function() {
service.fire('_dirtyFieldsChange', {
newVal: ['admins']
});
assert.equal(inspector.get('container').all('label.uncommitted').size(), 1);
assert.equal(inspector.get('container')
.all('.settings-wrapper.uncommitted').size(), 1);
});

});