open-dsi
/
nextcloud-server
mirror of https://github.com/nextcloud/server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add submit button to validate the federated server,

Browse Source 
fixes issue #25364
pull/2064/head
Felix Heidecke 10 years ago committed by Lukas Reschke
parent 742c215946
commit d4afccfeb0
No known key found for this signature in database
GPG Key ID: B9F6980CF6E759B1
2 changed files with 120 additions and 60 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 179
      apps/federation/js/settings-admin.js
  2. 1
      apps/federation/templates/settings-admin.php

179
apps/federation/js/settings-admin.js
Unescape View File

@ -18,66 +18,125 @@
*
*/
$(document).ready(function () {
(function( $ ) {
// ocFederationAddServer
$.fn.ocFederationAddServer = function() {
/* Go easy on jquery and define some vars
========================================================================== */
var $wrapper = $(this),
// Buttons
$btnAddServer = $wrapper.find("#ocFederationAddServerButton"),
$btnSubmit = $wrapper.find("#ocFederationSubmit"),
// Inputs
$inpServerUrl = $wrapper.find("#serverUrl"),
$inpAutoAddServers = $wrapper.find("#autoAddServers"),
// misc
$msgBox = $wrapper.find("#ocFederationAddServer .msg"),
$srvList = $wrapper.find("#listOfTrustedServers");
/* Interaction
========================================================================== */
$btnAddServer.on('click', function() {
$btnAddServer.addClass('hidden');
$inpServerUrl
.removeClass('hidden')
.focus();
});
// trigger server removal
$srvList.on('click', 'li > .icon-delete', function() {
var $this = $(this).parent();
var id = $this.attr('id');
removeServer( id );
});
$inpAutoAddServers.on("change", function() {
$.post(
OC.generateUrl('/apps/federation/auto-add-servers'),
{
autoAddServers: $(this).is(":checked")
}
);
});
$btnSubmit.on("click", function()
{
addServer($inpServerUrl.val());
});
// show input field to add a new trusted server
$("#ocFederationAddServer").on('click', function() {
$('#ocFederationAddServerButton').addClass('hidden');
$("#serverUrl").removeClass('hidden');
$("#serverUrl").focus();
});
// add new trusted server
$("#serverUrl").keyup(function (e) {
if (e.keyCode === 13) { // add server on "enter"
var url = $('#serverUrl').val();
OC.msg.startSaving('#ocFederationAddServer .msg');
$.post(
OC.generateUrl('/apps/federation/trusted-servers'),
{
url: url
}
).done(function (data) {
$('#serverUrl').attr('value', '');
$('ul#listOfTrustedServers').prepend(
$('<li>')
.attr('id', data.id)
.html('<span class="status indeterminate"></span>' +
data.url +
'<span class="icon icon-delete"></span>')
);
OC.msg.finishedSuccess('#ocFederationAddServer .msg', data.message);
})
.fail(function (jqXHR) {
OC.msg.finishedError('#ocFederationAddServer .msg', JSON.parse(jqXHR.responseText).message);
});
} else if (e.keyCode === 27) { // hide input filed again in ESC
$('#ocFederationAddServerButton').toggleClass('hidden');
$("#serverUrl").toggleClass('hidden');
}
});
// remove trusted server from list
$( "#listOfTrustedServers" ).on('click', 'li > .icon-delete', function() {
var $this = $(this).parent();
var id = $this.attr('id');
$.ajax({
url: OC.generateUrl('/apps/federation/trusted-servers/' + id),
type: 'DELETE',
success: function(response) {
$this.remove();
}
});
});
$("#ocFederationSettings #autoAddServers").change(function() {
$.post(
OC.generateUrl('/apps/federation/auto-add-servers'),
{
autoAddServers: $(this).is(":checked")
}
);
});
$inpServerUrl.on("change keyup", function (e) {
console.log("typing away");
url = $(this).val();
// toggle add-button visiblity based on input length
if ( url.length > 0 )
$btnSubmit.removeClass("hidden")
else
$btnSubmit.addClass("hidden")
if (e.keyCode === 13) { // add server on "enter"
addServer(url);
} else if (e.keyCode === 27) { // hide input filed again in ESC
$btnAddServer.removeClass('hidden');
$inpServerUrl.val("").addClass('hidden');
$btnSubmit.addClass('hidden');
}
});
};
/* private Functions
========================================================================== */
function addServer( url ) {
OC.msg.startSaving('#ocFederationAddServer .msg');
$.post(
OC.generateUrl('/apps/federation/trusted-servers'),
{
url: url
}
).done(function (data) {
$("#serverUrl").attr('value', '');
$("#listOfTrustedServers").prepend(
$('<li>')
.attr('id', data.id)
.html('<span class="status indeterminate"></span>' +
data.url +
'<span class="icon icon-delete"></span>')
);
OC.msg.finishedSuccess('#ocFederationAddServer .msg', data.message);
})
.fail(function (jqXHR) {
OC.msg.finishedError('#ocFederationAddServer .msg', JSON.parse(jqXHR.responseText).message);
});
};
function removeServer( id ) {
$.ajax({
url: OC.generateUrl('/apps/federation/trusted-servers/' + id),
type: 'DELETE',
success: function(response) {
$("#ocFederationSettings").find("#" + id).remove();
}
});
}
})( jQuery );
$(document).ready(function () {
$('#ocFederationSettings').ocFederationAddServer();
});

1
apps/federation/templates/settings-admin.php
Unescape View File

@ -19,6 +19,7 @@ style('federation', 'settings-admin')
<p id="ocFederationAddServer">
<button id="ocFederationAddServerButton" class=""><?php p($l->t('+ Add Nextcloud server')); ?></button>
<input id="serverUrl" class="hidden" type="text" value="" placeholder="<?php p($l->t('Nextcloud Server')); ?>" name="server_url"/>
<button id="ocFederationSubmit" class="hidden"><?php p($l->t('Add')); ?></button>
<span class="msg"></span>
</p>
<ul id="listOfTrustedServers">

Write Preview
Loading…
Cancel
Save