Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-18 23:37:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

change backup file name, fix safari button click bug

Browse source
This commit is contained in:
Stephen Birarda 2018-02-01 18:06:40 -08:00
parent 11fe279f6f
commit 09c2390db4
4 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
domain-server/resources/web/css/style.css
View file

@ -126,11 +126,6 @@ span.port {
margin-top: 10px;
}
#small-save-button {
width: 100%;
margin-bottom: 15px;
}
td.buttons {
width: 30px;
}
@ -434,3 +429,8 @@ ul.nav li.dropdown ul.dropdown-menu .divider {
#restore-settings-button {
margin-top: 10px;
}
/* fix for https://bugs.webkit.org/show_bug.cgi?id=39620 */
.save-button-text {
pointer-events: none;
}

4
domain-server/resources/web/header.html
View file

@ -28,7 +28,7 @@
</div>
</button>
<button id="save-settings-xs-button" class="save-button btn btn-success navbar-btn hidden-sm hidden-md hidden-lg" role="button" style="display: none;" disabled>Save</button>
<button id="save-settings-xs-button" class="save-button btn btn-success navbar-btn hidden-sm hidden-md hidden-lg" disabled="true"><span class="save-button-text">Save</span></button>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
@ -56,7 +56,7 @@
<img id="visit-hmd-icon" src="/images/hmd-w-eyes.svg" alt="Head-mounted display" />
Visit in VR
</a>
<button id="save-settings-button" class="save-button btn btn-success navbar-btn hidden-xs" role="button" style="display: none;" disabled>Save</button>
<button id="save-settings-button" class="save-button btn btn-success navbar-btn hidden-xs" disabled="true"><span class="save-button-text">Save</span></button>
<a href="#" id="restart-server" class="navbar-btn btn btn-link"><span class="glyphicon glyphicon-refresh"></span> Restart</a>
</ul>
</div>

20
domain-server/resources/web/js/base-settings.js
View file

@ -155,7 +155,10 @@ function postSettings(jsonSettings) {
$(document).ready(function(){
$('.save-button.navbar-btn').show();
$(document).on('click', '.save-button', function(e){
saveSettings();
e.preventDefault();
});
$.ajaxSetup({
timeout: 20000,
@ -254,7 +257,7 @@ $(document).ready(function(){
}
});
$('#' + Settings.FORM_ID).on('change keyup paste', '.' + Settings.TRIGGER_CHANGE_CLASS , function(){
$('#' + Settings.FORM_ID).on('change keyup paste', '.' + Settings.TRIGGER_CHANGE_CLASS , function(e){
// this input was changed, add the changed data attribute to it
$(this).attr('data-changed', true);
@ -438,11 +441,6 @@ function saveSettings() {
}
}
$('body').on('click', '.save-button', function(e){
saveSettings();
return false;
});
function makeTable(setting, keypath, setting_value) {
var isArray = !_.has(setting, 'key');
var categoryKey = setting.categorize_by_key;
@ -788,8 +786,8 @@ function badgeForDifferences(changedElement) {
}
}
$(".save-button").prop("disabled", !hasChanges);
$(".save-button").html(reasonsForRestart.length > 0 ? SAVE_BUTTON_LABEL_RESTART : SAVE_BUTTON_LABEL_SAVE);
$('.save-button').prop("disabled", !hasChanges);
$('.save-button-text').html(reasonsForRestart.length > 0 ? SAVE_BUTTON_LABEL_RESTART : SAVE_BUTTON_LABEL_SAVE);
// add the badge to the navbar item and the panel header
$("a[href='" + settingsGroupAnchor(Settings.path, panelParentID) + "'] .badge").html(badgeValue);
@ -832,7 +830,7 @@ function addTableRow(row) {
var keyInput = row.children(".key").children("input");
// whenever the keyInput changes, re-badge for differences
keyInput.on('change keyup paste', function(){
keyInput.on('change keyup paste', function(e){
// update siblings in the row to have the correct name
var currentKey = $(this).val();
@ -844,7 +842,7 @@ function addTableRow(row) {
} else {
input.removeAttr("name");
}
})
});
badgeForDifferences($(this));
});

2
domain-server/src/DomainServerSettingsManager.cpp
View file

@ -1181,7 +1181,7 @@ bool DomainServerSettingsManager::handleAuthenticatedHTTPRequest(HTTPConnection
// create a timestamped filename for the backup
const QString DATETIME_FORMAT { "yyyy-MM-dd_HH-mm-ss" };
auto backupFilename = "ds-settings-" + QDateTime::currentDateTime().toString(DATETIME_FORMAT) + ".json";
auto backupFilename = "domain-settings_" + QDateTime::currentDateTime().toString(DATETIME_FORMAT) + ".json";
downloadHeaders.insert("Content-Disposition",
QString("attachment; filename=\"%1\"").arg(backupFilename).toLocal8Bit());