ben/brouter-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Show icon indicator when profile is pinned (modified in editor)

Browse source
This commit is contained in:
Norbert Renner 2020-02-07 20:02:32 +01:00
parent c94a530f49
commit 86d42de458
3 changed files with 40 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
css/style.css
View file

@ -483,6 +483,12 @@ table.dataTable.display tbody tr:hover.selected {
color: #737373; color: #737373;
} }
#profile-pinned {
margin-left: auto;
margin-right: 4px;
color: #777;
}
.leaflet-sidebar-content { .leaflet-sidebar-content {
/* for optional-layers-tree */ /* for optional-layers-tree */
overflow-x: auto; overflow-x: auto;

1
index.html
View file

@ -686,6 +686,7 @@
>Profile</a >Profile</a
> >
</li> </li>
<span id="profile-pinned" hidden><i class="fa fa-thumb-tack"></i></span>
</ul> </ul>
<div class="tab-content flexcolumn flexgrow" id="profileEditorTabsContent"> <div class="tab-content flexcolumn flexgrow" id="profileEditorTabsContent">
<div <div

52
js/control/Profile.js
View file

@ -19,6 +19,8 @@ BR.Profile = L.Evented.extend({
L.DomUtil.get('upload').onclick = L.bind(this._upload, this); L.DomUtil.get('upload').onclick = L.bind(this._upload, this);
L.DomUtil.get('clear').onclick = L.bind(this.clear, this); L.DomUtil.get('clear').onclick = L.bind(this.clear, this);
this.pinned = L.DomUtil.get('profile-pinned');
this.message = new BR.Message('profile_message', { this.message = new BR.Message('profile_message', {
alert: true alert: true
}); });
@ -42,28 +44,40 @@ BR.Profile = L.Evented.extend({
empty = !this.editor.getValue(), empty = !this.editor.getValue(),
clean = this.editor.isClean(); clean = this.editor.isClean();
if (profileName && BR.conf.profilesUrl && (empty || clean)) { if (profileName && BR.conf.profilesUrl) {
this.profileName = profileName; // only synchronize profile editor/parameters with selection if no manual changes in full editor,
if (!(profileName in this.cache)) { // else keep custom profile pinned - to prevent changes in another profile overwriting previous ones
profileUrl = BR.conf.profilesUrl + profileName + '.brf'; if (empty || clean) {
BR.Util.get( this.profileName = profileName;
profileUrl, if (!(profileName in this.cache)) {
L.bind(function(err, profileText) { profileUrl = BR.conf.profilesUrl + profileName + '.brf';
if (err) { BR.Util.get(
console.warn('Error getting profile from "' + profileUrl + '": ' + err); profileUrl,
return; L.bind(function(err, profileText) {
} if (err) {
console.warn('Error getting profile from "' + profileUrl + '": ' + err);
return;
}
this.cache[profileName] = profileText; this.cache[profileName] = profileText;
// don't set when option has changed while loading // don't set when option has changed while loading
if (!this.profileName || this.profileName === profileName) { if (!this.profileName || this.profileName === profileName) {
this._setValue(profileText); this._setValue(profileText);
} }
}, this) }, this)
); );
} else {
this._setValue(this.cache[profileName]);
}
if (!this.pinned.hidden) {
this.pinned.hidden = true;
}
} else { } else {
this._setValue(this.cache[profileName]); if (this.pinned.hidden) {
this.pinned.hidden = false;
}
} }
} }
}, },