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

Merge pull request #277 from nrenner/275-custom-profile-cache

Browse source 
Prevent overwriting profile changes
This commit is contained in:
Norbert Renner 2020-02-07 20:12:11 +01:00 • committed by GitHub
commit 6178898815
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 70 additions and 30 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;
}
#profile-pinned {
margin-left: auto;
margin-right: 4px;
color: #777;
}
.leaflet-sidebar-content {
/* for optional-layers-tree */
overflow-x: auto;

1
index.html
View file

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

93
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('clear').onclick = L.bind(this.clear, this);
this.pinned = L.DomUtil.get('profile-pinned');
this.message = new BR.Message('profile_message', {
alert: true
});
@ -28,6 +30,8 @@ BR.Profile = L.Evented.extend({
var button = evt.target || evt.srcElement;
evt.preventDefault();
this.editor.markClean();
this._setValue('');
this.fire('clear');
@ -40,28 +44,40 @@ BR.Profile = L.Evented.extend({
empty = !this.editor.getValue(),
clean = this.editor.isClean();
if (profileName && BR.conf.profilesUrl && (empty || clean)) {
this.profileName = profileName;
if (!(profileName in this.cache)) {
profileUrl = BR.conf.profilesUrl + profileName + '.brf';
BR.Util.get(
profileUrl,
L.bind(function(err, profileText) {
if (err) {
console.warn('Error getting profile from "' + profileUrl + '": ' + err);
return;
}
if (profileName && BR.conf.profilesUrl) {
// only synchronize profile editor/parameters with selection if no manual changes in full editor,
// else keep custom profile pinned - to prevent changes in another profile overwriting previous ones
if (empty || clean) {
this.profileName = profileName;
if (!(profileName in this.cache)) {
profileUrl = BR.conf.profilesUrl + profileName + '.brf';
BR.Util.get(
profileUrl,
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
if (!this.profileName || this.profileName === profileName) {
this._setValue(profileText);
}
}, this)
);
// don't set when option has changed while loading
if (!this.profileName || this.profileName === profileName) {
this._setValue(profileText);
}
}, this)
);
} else {
this._setValue(this.cache[profileName]);
}
if (!this.pinned.hidden) {
this.pinned.hidden = true;
}
} else {
this._setValue(this.cache[profileName]);
if (this.pinned.hidden) {
this.pinned.hidden = false;
}
}
}
},
@ -86,6 +102,7 @@ BR.Profile = L.Evented.extend({
callback: L.bind(function(err, profileId, profileText) {
$(button).blur();
if (!err) {
this.profileName = profileId;
this.cache[profileId] = profileText;
if (!this.saveWarningShown) {
@ -97,8 +114,7 @@ BR.Profile = L.Evented.extend({
});
},
_buildCustomProfile: function() {
var profileText = this.cache[this.profileName];
_buildCustomProfile: function(profileText) {
document.querySelectorAll('#profile_params input, #profile_params select').forEach(function(input) {
var name = input.name;
var value;
@ -121,28 +137,39 @@ BR.Profile = L.Evented.extend({
},
_save: function(evt) {
var profileText = this._buildCustomProfile();
var profileText = this._buildCustomProfile(this.editor.getValue());
var that = this;
this.fire('update', {
profileText: profileText,
callback: function(err, profileId, profileText) {
if (!err) {
that.profileName = profileId;
that.cache[profileId] = profileText;
}
}
});
},
_setValue: function(profileText, profileEditorActivated) {
_setValue: function(profileText) {
profileText = profileText || '';
if (L.DomUtil.get('profile_editor').classList.contains('active')) {
// Set value of the full editor and exit
this.editor.setValue(profileText);
var clean = this.editor.isClean();
// Always set value of the full editor, even if not active.
// Full editor is master, the parameter form always gets the text from it (not cache).
this.editor.setValue(profileText);
// keep dirty state (manually modified; setValue also sets dirty)
if (clean) {
this.editor.markClean();
return;
}
if (this._isParamsFormActive()) {
this._buildParamsForm(profileText);
}
},
_buildParamsForm: function(profileText) {
if (!profileText) return;
// Otherwise, create user friendly form
@ -278,11 +305,17 @@ BR.Profile = L.Evented.extend({
});
},
_isParamsFormActive: function() {
return L.DomUtil.get('profile_params_container').classList.contains('active');
},
_activateSecondaryTab: function() {
if (L.DomUtil.get('profile_params_container').classList.contains('active')) {
this._setValue(this.editor.getValue());
var profileText = this.editor.getValue();
if (this._isParamsFormActive()) {
this._buildParamsForm(profileText);
} else {
this._setValue(this._buildCustomProfile());
this._setValue(this._buildCustomProfile(profileText));
}
}
});