+ Visit in VR
+ ";
+ setting_value = _(values).valueForKeyPath(keypath);
+
+ if (_.isUndefined(setting_value) || _.isNull(setting_value)) {
+ if (_.has(setting, 'default')) {
+ setting_value = setting.default;
+ } else {
+ setting_value = "";
+ }
+ }
+
+ label_class = 'control-label';
+
+ function common_attrs(extra_classes) {
+ extra_classes = (!_.isUndefined(extra_classes) ? extra_classes : "");
+ return " class='" + (setting.type !== 'checkbox' ? 'form-control' : '')
+ + " " + Settings.TRIGGER_CHANGE_CLASS + " " + extra_classes + "' data-short-name='"
+ + setting.name + "' name='" + keypath + "' "
+ + "id='" + (!_.isUndefined(setting.html_id) ? setting.html_id : keypath) + "'";
+ }
+
+ if (setting.type === 'checkbox') {
+ if (setting.label) {
+ form_group += ""
+ }
+
+ form_group += "
"
+ return form_group
+ }
+}
+
+function reloadSettings(callback) {
+ $.getJSON(Settings.endpoint, function(data){
+ _.extend(data, viewHelpers)
+
+ $('#panels').html(Settings.panelsTemplate(data))
+
+ Settings.data = data;
+ Settings.initialValues = form2js('settings-form', ".", false, cleanupFormValues, true);
+
+ Settings.afterReloadActions();
+
+ // setup any bootstrap switches
+ $('.toggle-checkbox').bootstrapSwitch();
+
+ $('[data-toggle="tooltip"]').tooltip();
+
+ // call the callback now that settings are loaded
+ callback(true);
+ }).fail(function() {
+ // call the failure object since settings load faild
+ callback(false)
+ });
+}
+
+function postSettings(jsonSettings) {
+ // POST the form JSON to the domain-server settings.json endpoint so the settings are saved
+ $.ajax(Settings.endpoint, {
+ data: JSON.stringify(jsonSettings),
+ contentType: 'application/json',
+ type: 'POST'
+ }).done(function(data){
+ if (data.status == "success") {
+ if ($(".save-button").html() === SAVE_BUTTON_LABEL_RESTART) {
+ showRestartModal();
+ } else {
+ location.reload(true);
+ }
+ } else {
+ showErrorMessage("Error", SETTINGS_ERROR_MESSAGE)
+ reloadSettings();
+ }
+ }).fail(function(){
+ showErrorMessage("Error", SETTINGS_ERROR_MESSAGE)
+ reloadSettings();
+ });
+}
+
+$(document).ready(function(){
+
+ $('.save-button.navbar-btn').show();
+
+ $.ajaxSetup({
+ timeout: 20000,
+ });
+
+ reloadSettings(function(success){
+ if (success) {
+ // if there was a hash in the URL, jump to it now
+ if (location.hash) {
+ location.href = location.hash;
+ }
+ } else {
+ swal({
+ title: '',
+ type: 'error',
+ text: Strings.LOADING_SETTINGS_ERROR
+ });
+ }
+ });
+
+ $('#' + Settings.FORM_ID).on('click', '.' + Settings.ADD_ROW_BUTTON_CLASS, function(){
+ addTableRow($(this).closest('tr'));
+ });
+
+ $('#' + Settings.FORM_ID).on('click', '.' + Settings.DEL_ROW_BUTTON_CLASS, function(){
+ deleteTableRow($(this).closest('tr'));
+ });
+
+ $('#' + Settings.FORM_ID).on('click', '.' + Settings.ADD_CATEGORY_BUTTON_CLASS, function(){
+ addTableCategory($(this).closest('tr'));
+ });
+
+ $('#' + Settings.FORM_ID).on('click', '.' + Settings.DEL_CATEGORY_BUTTON_CLASS, function(){
+ deleteTableCategory($(this).closest('tr'));
+ });
+
+ $('#' + Settings.FORM_ID).on('click', '.' + Settings.TOGGLE_CATEGORY_COLUMN_CLASS, function(){
+ toggleTableCategory($(this).closest('tr'));
+ });
+
+ $('#' + Settings.FORM_ID).on('click', '.' + Settings.MOVE_UP_BUTTON_CLASS, function(){
+ moveTableRow($(this).closest('tr'), true);
+ });
+
+ $('#' + Settings.FORM_ID).on('click', '.' + Settings.MOVE_DOWN_BUTTON_CLASS, function(){
+ moveTableRow($(this).closest('tr'), false);
+ });
+
+ $('#' + Settings.FORM_ID).on('keyup', function(e){
+ var $target = $(e.target);
+ if (e.keyCode == 13) {
+ if ($target.is('table input')) {
+ // capture enter in table input
+ // if we have a sibling next to us that has an input, jump to it, otherwise check if we have a glyphicon for add to click
+ sibling = $target.parent('td').next();
+
+ if (sibling.hasClass(Settings.DATA_COL_CLASS)) {
+ // set focus to next input
+ sibling.find('input').focus();
+ } else {
+
+ // jump over the re-order row, if that's what we're on
+ if (sibling.hasClass(Settings.REORDER_BUTTONS_CLASS)) {
+ sibling = sibling.next();
+ }
+
+ // for tables with categories we add the entry and setup the new row on enter
+ if (sibling.find("." + Settings.ADD_CATEGORY_BUTTON_CLASS).length) {
+ sibling.find("." + Settings.ADD_CATEGORY_BUTTON_CLASS).click();
+
+ // set focus to the first input in the new row
+ $target.closest('table').find('tr.inputs input:first').focus();
+ }
+
+ var tableRows = sibling.parent();
+ var tableBody = tableRows.parent();
+
+ // if theres no more siblings, we should jump to a new row
+ if (sibling.next().length == 0 && tableRows.nextAll().length == 1) {
+ tableBody.find("." + Settings.ADD_ROW_BUTTON_CLASS).click();
+ }
+ }
+
+ } else if ($target.is('input')) {
+ $target.change().blur();
+ }
+
+ e.preventDefault();
+ }
+ });
+
+ $('#' + Settings.FORM_ID).on('keypress', function(e){
+ if (e.keyCode == 13) {
+
+ e.preventDefault();
+ }
+ });
+
+ $('#' + Settings.FORM_ID).on('change keyup paste', '.' + Settings.TRIGGER_CHANGE_CLASS , function(){
+ // this input was changed, add the changed data attribute to it
+ $(this).attr('data-changed', true);
+
+ badgeForDifferences($(this));
+ });
+
+ $('#' + Settings.FORM_ID).on('switchChange.bootstrapSwitch', 'input.toggle-checkbox', function(){
+ // this checkbox was changed, add the changed data attribute to it
+ $(this).attr('data-changed', true);
+
+ badgeForDifferences($(this));
+ });
+
+ // Bootstrap switch in table
+ $('#' + Settings.FORM_ID).on('change', 'input.table-checkbox', function () {
+ // Bootstrap switches in table: set the changed data attribute for all rows in table.
+ var row = $(this).closest('tr');
+ if (row.hasClass("value-row")) { // Don't set attribute on input row switches prior to it being added to table.
+ row.find('td.' + Settings.DATA_COL_CLASS + ' input').attr('data-changed', true);
+ updateDataChangedForSiblingRows(row, true);
+ badgeForDifferences($(this));
+ }
+ });
+
+ $('#' + Settings.FORM_ID).on('change', 'input.table-time', function() {
+ // Bootstrap switches in table: set the changed data attribute for all rows in table.
+ var row = $(this).closest('tr');
+ if (row.hasClass("value-row")) { // Don't set attribute on input row switches prior to it being added to table.
+ row.find('td.' + Settings.DATA_COL_CLASS + ' input').attr('data-changed', true);
+ updateDataChangedForSiblingRows(row, true);
+ badgeForDifferences($(this));
+ }
+ });
+
+ $('#' + Settings.FORM_ID).on('change', 'select', function(){
+ $("input[name='" + $(this).attr('data-hidden-input') + "']").val($(this).val()).change();
+ });
+
+ var panelsSource = $('#panels-template').html();
+ Settings.panelsTemplate = _.template(panelsSource);
+});
+
+function dynamicButton(button_id, text) {
+ return $("");
+}
+
+function showSpinnerAlert(title) {
+ swal({
+ title: title,
+ text: '"
+ form_group += ""
+
+ if (setting.help) {
+ form_group += "" + setting.help + "";
+ }
+
+ form_group += "
"
+ } else {
+ input_type = _.has(setting, 'type') ? setting.type : "text"
+
+ if (setting.label) {
+ form_group += "";
+ }
+
+ if (input_type === 'table') {
+ form_group += makeTable(setting, keypath, setting_value)
+ } else {
+ if (input_type === 'select') {
+ form_group += ""
+
+ form_group += ""
+ } else if (input_type === 'button') {
+ // Is this a button that should link to something directly?
+ // If so, we use an anchor tag instead of a button tag
+
+ if (setting.href) {
+ form_group += ""
+ + setting.button_label + "";
+ } else {
+ form_group += "";
+ }
+
+ } else {
+
+ if (input_type == 'integer') {
+ input_type = "text"
+ }
+
+ form_group += ""
+ }
+
+ form_group += "" + setting.help + ""
+ }
+ }
+
+ form_group += "',
+ html: true,
+ showConfirmButton: false,
+ allowEscapeKey: false
+ });
+}
+
+function parseJSONResponse(xhr) {
+ try {
+ return JSON.parse(xhr.responseText);
+ } catch (e) {
+ }
+ return null;
+}
+
+function validateInputs() {
+ // check if any new values are bad
+ var tables = $('table');
+
+ var inputsValid = true;
+
+ var tables = $('table');
+
+ // clear any current invalid rows
+ $('tr.' + Settings.INVALID_ROW_CLASS).removeClass(Settings.INVALID_ROW_CLASS);
+
+ function markParentRowInvalid(rowChild) {
+ $(rowChild).closest('tr').addClass(Settings.INVALID_ROW_CLASS);
+ }
+
+ _.each(tables, function(table) {
+ // validate keys specificially for spaces and equality to an existing key
+ var newKeys = $(table).find('tr.' + Settings.NEW_ROW_CLASS + ' td.key');
+
+ var keyWithSpaces = false;
+ var empty = false;
+ var duplicateKey = false;
+
+ _.each(newKeys, function(keyCell) {
+ var keyVal = $(keyCell).children('input').val();
+
+ if (keyVal.indexOf(' ') !== -1) {
+ keyWithSpaces = true;
+ markParentRowInvalid(keyCell);
+ return;
+ }
+
+ // make sure the key isn't empty
+ if (keyVal.length === 0) {
+ empty = true
+
+ markParentRowInvalid(input);
+ return;
+ }
+
+ // make sure we don't have duplicate keys in the table
+ var otherKeys = $(table).find('td.key').not(keyCell);
+ _.each(otherKeys, function(otherKeyCell) {
+ var keyInput = $(otherKeyCell).children('input');
+
+ if (keyInput.length) {
+ if ($(keyInput).val() == keyVal) {
+ duplicateKey = true;
+ }
+ } else if ($(otherKeyCell).html() == keyVal) {
+ duplicateKey = true;
+ }
+
+ if (duplicateKey) {
+ markParentRowInvalid(keyCell);
+ return;
+ }
+ });
+
+ });
+
+ if (keyWithSpaces) {
+ showErrorMessage("Error", "Key contains spaces");
+ inputsValid = false;
+ return
+ }
+
+ if (empty) {
+ showErrorMessage("Error", "Empty field(s)");
+ inputsValid = false;
+ return
+ }
+
+ if (duplicateKey) {
+ showErrorMessage("Error", "Two keys cannot be identical");
+ inputsValid = false;
+ return;
+ }
+ });
+
+ return inputsValid;
+}
+
+var SETTINGS_ERROR_MESSAGE = "There was a problem saving domain settings. Please try again!";
+
+function saveSettings() {
+
+ if (validateInputs()) {
+ // POST the form JSON to the domain-server settings.json endpoint so the settings are saved
+ var canPost = true;
+
+ // disable any inputs not changed
+ $("input:not([data-changed])").each(function () {
+ $(this).prop('disabled', true);
+ });
+
+ // grab a JSON representation of the form via form2js
+ var formJSON = form2js('settings-form', ".", false, cleanupFormValues, true);
+
+ // re-enable all inputs
+ $("input").each(function () {
+ $(this).prop('disabled', false);
+ });
+
+ // remove focus from the button
+ $(this).blur();
+
+ if (Settings.handlePostSettings === undefined) {
+ console.log("----- saveSettings() called ------");
+ console.log(formJSON);
+
+ // POST the form JSON to the domain-server settings.json endpoint so the settings are saved
+ postSettings(formJSON);
+ } else {
+ Settings.handlePostSettings(formJSON)
+ }
+ }
+}
+
+$('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;
+ var isCategorized = !!categoryKey && isArray;
+
+ if (!isArray && setting.can_order) {
+ setting.can_order = false;
+ }
+
+ var html = "";
+
+ if (setting.help) {
+ html += "" + setting.help + ""
+ }
+
+ var nonDeletableRowKey = setting["non-deletable-row-key"];
+ var nonDeletableRowValues = setting["non-deletable-row-values"];
+
+ html += "
- " + name_link + " " + path + editLink + " " + deleteColumn + "Hello ");
-
- getDomainFromAPI(function(data){
- $('.loading-domain-info-spinner').hide();
- $('.domain-loading-show').hide();
-
- // check if we have owner_places (for a real domain) or a name (for a temporary domain)
- if (data.status == "success") {
- $('.domain-loading-hide').show();
- if (data.domain.owner_places) {
- // add a table row for each of these names
- _.each(data.domain.owner_places, function(place){
- $('#' + Settings.PLACES_TABLE_ID + " tbody").append(placeTableRowForPlaceObject(place));
- });
- } else if (data.domain.name) {
- // add a table row for this temporary domain name
- $('#' + Settings.PLACES_TABLE_ID + " tbody").append(placeTableRow(data.domain.name, '/', true));
- }
-
- // Update label
- if (showOrHideLabel()) {
- var label = data.domain.label;
- label = label === null ? '' : label;
- $('#network-label').val(label);
- }
-
- // Update automatic networking
- if (showOrHideAutomaticNetworking()) {
- var autoNetworkingSetting = Settings.data.values.metaverse.automatic_networking;
- var address = data.domain.network_address === null ? "" : data.domain.network_address;
- var port = data.domain.network_port === null ? "" : data.domain.network_port;
- if (autoNetworkingSetting === 'disabled') {
- $('#network-address-port input').val(address + ":" + port);
- } else if (autoNetworkingSetting === 'ip') {
- $('#network-address-port input').val(port);
- }
- }
-
- if (accessTokenIsSet()) {
- appendAddButtonToPlacesTable();
- }
-
- } else {
- $('.domain-loading-error').show();
- }
- })
-}
-
-function appendDomainIDButtons() {
- var domainIDInput = $(Settings.DOMAIN_ID_SELECTOR);
-
- var createButton = dynamicButton(Settings.CREATE_DOMAIN_ID_BTN_ID, Strings.CREATE_DOMAIN_BUTTON);
- createButton.css('margin-top', '10px');
- var chooseButton = dynamicButton(Settings.CHOOSE_DOMAIN_ID_BTN_ID, Strings.CHOOSE_DOMAIN_BUTTON);
- chooseButton.css('margin', '10px 0px 0px 10px');
-
- domainIDInput.after(chooseButton);
- domainIDInput.after(createButton);
-}
-
-function editHighFidelityPlace(placeID, name, path) {
- var dialog;
-
- var modal_body = " ");
- addRow.find(".place-add").click(function(ev) {
- ev.preventDefault();
- chooseFromHighFidelityPlaces(Settings.initialValues.metaverse.access_token, null, function(placeName, newDomainID) {
- if (newDomainID) {
- Settings.data.values.metaverse.id = newDomainID;
- var domainIDEl = $("[data-keypath='metaverse.id']");
- domainIDEl.val(newDomainID);
- Settings.initialValues.metaverse.id = newDomainID;
- badgeSidebarForDifferences(domainIDEl);
- }
- reloadDomainInfo();
- });
- });
- $('#' + Settings.PLACES_TABLE_ID + " tbody").append(addRow);
-}
-
-function chooseFromHighFidelityDomains(clickedButton) {
- // setup the modal to help user pick their domain
- if (Settings.initialValues.metaverse.access_token) {
-
- // add a spinner to the choose button
- clickedButton.html("Loading domains...");
- clickedButton.attr('disabled', 'disabled');
-
- // get a list of user domains from data-web
- $.ajax({
- url: "/api/domains",
- dataType: 'json',
- jsonp: false,
- success: function(data){
-
- var modal_buttons = {
- cancel: {
- label: 'Cancel',
- className: 'btn-default'
- }
- }
-
- if (data.data.domains.length) {
- // setup a select box for the returned domains
- modal_body = "
" + - "Please follow the instructions on the settings page to add an access token.", - title: "Access token required" - }) - } - } - -function createTemporaryDomain() { - swal({ - title: 'Create temporary place name', - text: "This will create a temporary place name and domain ID" - + " so other users can easily connect to your domain." - + "In order to make your domain reachable, this will also enable full automatic networking.", - showCancelButton: true, - confirmButtonText: 'Create', - closeOnConfirm: false, - html: true - }, function(isConfirm){ - if (isConfirm) { - showSpinnerAlert('Creating temporary place name'); - - // make a get request to get a temporary domain - $.post(URLs.METAVERSE_URL + '/api/v1/domains/temporary', function(data){ - if (data.status == "success") { - var domain = data.data.domain; - - // we should have a new domain ID - set it on the domain ID value - $(Settings.DOMAIN_ID_SELECTOR).val(domain.id).change(); - - // we also need to make sure auto networking is set to full - $('[data-hidden-input="metaverse.automatic_networking"]').val("full").change(); - - swal({ - type: 'success', - title: 'Success!', - text: "We have created a temporary name and domain ID for you." - + "Your temporary place name is " + domain.name + "." - + "Press the button below to save your new settings and restart your domain-server.", - confirmButtonText: 'Save', - html: true - }, function(){ - saveSettings(); - }); - } - }); - } - }); -} - -function reloadSettings(callback) { - $.getJSON('/settings.json', function(data){ - _.extend(data, viewHelpers) - - $('.nav-stacked').html(Settings.sidebarTemplate(data)) - $('#panels').html(Settings.panelsTemplate(data)) - - Settings.data = data; - Settings.initialValues = form2js('settings-form', ".", false, cleanupFormValues, true); + return b; + })(window.location.search.substr(1).split('&')); + Settings.afterReloadActions = function() { // append the domain selection modal appendDomainIDButtons(); @@ -1291,117 +49,10 @@ function reloadSettings(callback) { } } - // setup any bootstrap switches - $('.toggle-checkbox').bootstrapSwitch(); - - $('[data-toggle="tooltip"]').tooltip(); - - // call the callback now that settings are loaded - callback(true); - }).fail(function() { - // call the failure object since settings load faild - callback(false) - }); -} - -function validateInputs() { - // check if any new values are bad - var tables = $('table'); - - var inputsValid = true; - - var tables = $('table'); - - // clear any current invalid rows - $('tr.' + Settings.INVALID_ROW_CLASS).removeClass(Settings.INVALID_ROW_CLASS); - - function markParentRowInvalid(rowChild) { - $(rowChild).closest('tr').addClass(Settings.INVALID_ROW_CLASS); + handleAction(); } - _.each(tables, function(table) { - // validate keys specificially for spaces and equality to an existing key - var newKeys = $(table).find('tr.' + Settings.NEW_ROW_CLASS + ' td.key'); - - var keyWithSpaces = false; - var empty = false; - var duplicateKey = false; - - _.each(newKeys, function(keyCell) { - var keyVal = $(keyCell).children('input').val(); - - if (keyVal.indexOf(' ') !== -1) { - keyWithSpaces = true; - markParentRowInvalid(keyCell); - return; - } - - // make sure the key isn't empty - if (keyVal.length === 0) { - empty = true - - markParentRowInvalid(input); - return; - } - - // make sure we don't have duplicate keys in the table - var otherKeys = $(table).find('td.key').not(keyCell); - _.each(otherKeys, function(otherKeyCell) { - var keyInput = $(otherKeyCell).children('input'); - - if (keyInput.length) { - if ($(keyInput).val() == keyVal) { - duplicateKey = true; - } - } else if ($(otherKeyCell).html() == keyVal) { - duplicateKey = true; - } - - if (duplicateKey) { - markParentRowInvalid(keyCell); - return; - } - }); - - }); - - if (keyWithSpaces) { - showErrorMessage("Error", "Key contains spaces"); - inputsValid = false; - return - } - - if (empty) { - showErrorMessage("Error", "Empty field(s)"); - inputsValid = false; - return - } - - if (duplicateKey) { - showErrorMessage("Error", "Two keys cannot be identical"); - inputsValid = false; - return; - } - }); - - return inputsValid; -} - -var SETTINGS_ERROR_MESSAGE = "There was a problem saving domain settings. Please try again!"; - -function saveSettings() { - - if (validateInputs()) { - // POST the form JSON to the domain-server settings.json endpoint so the settings are saved - var canPost = true; - - // disable any inputs not changed - $("input:not([data-changed])").each(function () { - $(this).prop('disabled', true); - }); - - // grab a JSON representation of the form via form2js - var formJSON = form2js('settings-form', ".", false, cleanupFormValues, true); + Settings.handlePostSettings = function(formJSON) { // check if we've set the basic http password if (formJSON["security"]) { @@ -1424,727 +75,945 @@ function saveSettings() { delete formJSON["security"]["verify_http_password"]; } else { bootbox.alert({ "message": "Passwords must match!", "title": "Password Error" }); - canPost = false; + return false; } } } - console.log("----- SAVING ------"); + console.log("----- handlePostSettings() called ------"); console.log(formJSON); - // re-enable all inputs - $("input").each(function () { - $(this).prop('disabled', false); - }); + if (formJSON["security"]) { + var username = formJSON["security"]["http_username"]; - // remove focus from the button - $(this).blur(); + var password = formJSON["security"]["http_password"]; - if (canPost) { - if (formJSON["security"]) { - var username = formJSON["security"]["http_username"]; + if ((password == sha256_digest("")) && (username == undefined || (username && username.length != 0))) { + swal({ + title: "Are you sure?", + text: "You have entered a blank password with a non-blank username. Are you sure you want to require a blank password?", + type: "warning", + showCancelButton: true, + confirmButtonColor: "#5cb85c", + confirmButtonText: "Yes!", + closeOnConfirm: true + }, + function () { + formJSON["security"]["http_password"] = ""; - var password = formJSON["security"]["http_password"]; + postSettings(formJSON); + }); - if ((password == sha256_digest("")) && (username == undefined || (username && username.length != 0))) { - swal({ - title: "Are you sure?", - text: "You have entered a blank password with a non-blank username. Are you sure you want to require a blank password?", - type: "warning", - showCancelButton: true, - confirmButtonColor: "#5cb85c", - confirmButtonText: "Yes!", - closeOnConfirm: true - }, - function () { - formJSON["security"]["http_password"] = ""; - postSettings(formJSON); - }); - return; - } + return; } - // POST the form JSON to the domain-server settings.json endpoint so the settings are saved - postSettings(formJSON); } - } -} -$('body').on('click', '.save-button', function(e){ - saveSettings(); - return false; -}); + postSettings(formJSON); + }; -function makeTable(setting, keypath, setting_value) { - var isArray = !_.has(setting, 'key'); - var categoryKey = setting.categorize_by_key; - var isCategorized = !!categoryKey && isArray; - - if (!isArray && setting.can_order) { - setting.can_order = false; - } - - var html = ""; - - if (setting.help) { - html += "" + setting.help + "" - } - - var nonDeletableRowKey = setting["non-deletable-row-key"]; - var nonDeletableRowValues = setting["non-deletable-row-values"]; - - html += "";
-
- if (setting.caption) {
- html += "
"
-
- return html;
-}
-
-function makeTableCategoryHeader(categoryKey, categoryValue, numVisibleColumns, canRemove, message) {
- var html =
- "" +
- "" +
- "" +
- "" + categoryValue + "" +
- " " +
- ((canRemove) ? (
- "" +
- "" +
- " "
- ) : (
- " ";
- return html;
-}
-
-function makeTableHiddenInputs(setting, initialValues, categoryValue) {
- var html = "";
-
- if (setting.numbered === true) {
- html += "\
- \
- "
- }
-
- _.each(setting.columns, function(col) {
- var defaultValue = _.has(initialValues, col.name) ? initialValues[col.name] : col.default;
- if (col.type === "checkbox") {
- html +=
- "" +
- "" +
- " ";
- } else if (col.type === "select") {
- html += ""
- html += "";
- html += " ";
- } else {
- html +=
- "" +
- "" +
- " ";
- }
- })
-
- if (setting.can_order) {
- html += " "
-
- return html
-}
-
-function makeTableCategoryInput(setting, numVisibleColumns) {
- var canAddRows = setting.can_add_new_rows;
- var categoryKey = setting.categorize_by_key;
- var placeholder = setting.new_category_placeholder || "";
- var message = setting.new_category_message || "";
- var html =
- "" +
- "" +
- "" +
- " " +
- "" +
- "" +
- " " +
- " ";
- return html;
-}
-
-function getDescriptionForKey(key) {
- for (var i in Settings.data.descriptions) {
- if (Settings.data.descriptions[i].name === key) {
- return Settings.data.descriptions[i];
- }
- }
-}
-
-var SAVE_BUTTON_LABEL_SAVE = "Save";
-var SAVE_BUTTON_LABEL_RESTART = "Save and restart";
-var reasonsForRestart = [];
-var numChangesBySection = {};
-
-function badgeSidebarForDifferences(changedElement) {
- // figure out which group this input is in
- var panelParentID = changedElement.closest('.panel').attr('id');
-
- // if the panel contains non-grouped settings, the initial value is Settings.initialValues
- var isGrouped = $('#' + panelParentID).hasClass('grouped');
-
- if (isGrouped) {
- var initialPanelJSON = Settings.initialValues[panelParentID]
- ? Settings.initialValues[panelParentID]
- : {};
-
- // get a JSON representation of that section
- var panelJSON = form2js(panelParentID, ".", false, cleanupFormValues, true)[panelParentID];
- } else {
- var initialPanelJSON = Settings.initialValues;
-
- // get a JSON representation of that section
- var panelJSON = form2js(panelParentID, ".", false, cleanupFormValues, true);
- }
-
- var badgeValue = 0
- var description = getDescriptionForKey(panelParentID);
-
- // badge for any settings we have that are not the same or are not present in initialValues
- for (var setting in panelJSON) {
- if ((!_.has(initialPanelJSON, setting) && panelJSON[setting] !== "") ||
- (!_.isEqual(panelJSON[setting], initialPanelJSON[setting])
- && (panelJSON[setting] !== "" || _.has(initialPanelJSON, setting)))) {
- badgeValue += 1;
-
- // add a reason to restart
- if (description && description.restart != false) {
- reasonsForRestart.push(setting);
- }
- } else {
- // remove a reason to restart
- if (description && description.restart != false) {
- reasonsForRestart = $.grep(reasonsForRestart, function(v) { return v != setting; });
- }
- }
- }
-
- // update the list-group-item badge to have the new value
- if (badgeValue == 0) {
- badgeValue = ""
- }
-
- numChangesBySection[panelParentID] = badgeValue;
-
- var hasChanges = badgeValue > 0;
-
- if (!hasChanges) {
- for (var key in numChangesBySection) {
- if (numChangesBySection[key] > 0) {
- hasChanges = true;
- break;
- }
- }
- }
-
- $(".save-button").prop("disabled", !hasChanges);
- $(".save-button").html(reasonsForRestart.length > 0 ? SAVE_BUTTON_LABEL_RESTART : SAVE_BUTTON_LABEL_SAVE);
- $("a[href='#" + panelParentID + "'] .badge").html(badgeValue);
-}
-
-function addTableRow(row) {
- var table = row.parents('table');
- var isArray = table.data('setting-type') === 'array';
- var keepField = row.data("keep-field");
-
- var columns = row.parent().children('.' + Settings.DATA_ROW_CLASS);
-
- var input_clone = row.clone();
-
- if (!isArray) {
- // show the key input
- var keyInput = row.children(".key").children("input");
- }
-
- // Change input row to data row
- var table = row.parents("table");
- var setting_name = table.attr("name");
- row.addClass(Settings.DATA_ROW_CLASS + " " + Settings.NEW_ROW_CLASS);
-
- // if this is an array, add the row index (which is the index of the last row + 1)
- // as a data attribute to the row
- var row_index = 0;
- if (isArray) {
- var previous_row = row.siblings('.' + Settings.DATA_ROW_CLASS + ':last');
-
- if (previous_row.length > 0) {
- row_index = parseInt(previous_row.attr(Settings.DATA_ROW_INDEX), 10) + 1;
- } else {
- row_index = 0;
- }
-
- row.attr(Settings.DATA_ROW_INDEX, row_index);
- }
-
- var focusChanged = false;
-
- _.each(row.children(), function(element) {
- if ($(element).hasClass("numbered")) {
- // Index row
- var numbers = columns.children(".numbered")
- if (numbers.length > 0) {
- $(element).html(parseInt(numbers.last().text()) + 1)
} else {
- $(element).html(1)
+ bootbox.alert({
+ message: "You must have an access token to query your High Fidelity domains.
" + + "Please follow the instructions on the settings page to add an access token.", + title: "Access token required" + }) } - } else if ($(element).hasClass(Settings.REORDER_BUTTONS_CLASS)) { - $(element).html(" message) {
Assignment::Type type;
message->readPrimitive(&type);
@@ -986,48 +1075,72 @@ QVariant DomainServerSettingsManager::valueOrDefaultValueForKeyPath(const QStrin
}
bool DomainServerSettingsManager::handleAuthenticatedHTTPRequest(HTTPConnection *connection, const QUrl &url) {
- if (connection->requestOperation() == QNetworkAccessManager::PostOperation && url.path() == SETTINGS_PATH_JSON) {
- // this is a POST operation to change one or more settings
- QJsonDocument postedDocument = QJsonDocument::fromJson(connection->requestContent());
- QJsonObject postedObject = postedDocument.object();
+ if (connection->requestOperation() == QNetworkAccessManager::PostOperation) {
+ if (url.path() == SETTINGS_PATH_JSON || url.path() == CONTENT_SETTINGS_PATH_JSON) {
+ // this is a POST operation to change one or more settings
+ QJsonDocument postedDocument = QJsonDocument::fromJson(connection->requestContent());
+ QJsonObject postedObject = postedDocument.object();
- // we recurse one level deep below each group for the appropriate setting
- bool restartRequired = recurseJSONObjectAndOverwriteSettings(postedObject);
+ SettingsType endpointType = url.path() == SETTINGS_PATH_JSON ? DomainSettings : ContentSettings;
- // store whatever the current _settingsMap is to file
- persistToFile();
+ // we recurse one level deep below each group for the appropriate setting
+ bool restartRequired = recurseJSONObjectAndOverwriteSettings(postedObject, endpointType);
- // return success to the caller
- QString jsonSuccess = "{\"status\": \"success\"}";
- connection->respond(HTTPConnection::StatusCode200, jsonSuccess.toUtf8(), "application/json");
+ // store whatever the current _settingsMap is to file
+ persistToFile();
- // defer a restart to the domain-server, this gives our HTTPConnection enough time to respond
- if (restartRequired) {
- const int DOMAIN_SERVER_RESTART_TIMER_MSECS = 1000;
- QTimer::singleShot(DOMAIN_SERVER_RESTART_TIMER_MSECS, qApp, SLOT(restart()));
- } else {
- unpackPermissions();
- apiRefreshGroupInformation();
- emit updateNodePermissions();
- emit settingsUpdated();
+ // return success to the caller
+ QString jsonSuccess = "{\"status\": \"success\"}";
+ connection->respond(HTTPConnection::StatusCode200, jsonSuccess.toUtf8(), "application/json");
+
+ // defer a restart to the domain-server, this gives our HTTPConnection enough time to respond
+ if (restartRequired) {
+ const int DOMAIN_SERVER_RESTART_TIMER_MSECS = 1000;
+ QTimer::singleShot(DOMAIN_SERVER_RESTART_TIMER_MSECS, qApp, SLOT(restart()));
+ } else {
+ unpackPermissions();
+ apiRefreshGroupInformation();
+ emit updateNodePermissions();
+ emit settingsUpdated();
+ }
+
+ return true;
}
+ } else if (connection->requestOperation() == QNetworkAccessManager::GetOperation) {
+ static const QString SETTINGS_MENU_GROUPS_PATH = "/settings-menu-groups.json";
- return true;
- } else if (connection->requestOperation() == QNetworkAccessManager::GetOperation && url.path() == SETTINGS_PATH_JSON) {
- // setup a JSON Object with descriptions and non-omitted settings
- const QString SETTINGS_RESPONSE_DESCRIPTION_KEY = "descriptions";
- const QString SETTINGS_RESPONSE_VALUE_KEY = "values";
+ if (url.path() == SETTINGS_PATH_JSON || url.path() == CONTENT_SETTINGS_PATH_JSON) {
- QJsonObject rootObject;
- rootObject[SETTINGS_RESPONSE_DESCRIPTION_KEY] = _descriptionArray;
- rootObject[SETTINGS_RESPONSE_VALUE_KEY] = responseObjectForType("", true);
- connection->respond(HTTPConnection::StatusCode200, QJsonDocument(rootObject).toJson(), "application/json");
+ // setup a JSON Object with descriptions and non-omitted settings
+ const QString SETTINGS_RESPONSE_DESCRIPTION_KEY = "descriptions";
+ const QString SETTINGS_RESPONSE_VALUE_KEY = "values";
+
+ QJsonObject rootObject;
+
+ bool forDomainSettings = (url.path() == SETTINGS_PATH_JSON);
+ bool forContentSettings = (url.path() == CONTENT_SETTINGS_PATH_JSON);;
+
+ rootObject[SETTINGS_RESPONSE_DESCRIPTION_KEY] = forDomainSettings
+ ? _domainSettingsDescription : _contentSettingsDescription;
+
+ // grab a domain settings object for all types, filtered for the right class of settings
+ rootObject[SETTINGS_RESPONSE_VALUE_KEY] = responseObjectForType("", true, forDomainSettings, forContentSettings);
+
+ connection->respond(HTTPConnection::StatusCode200, QJsonDocument(rootObject).toJson(), "application/json");
+
+ return true;
+ } else if (url.path() == SETTINGS_MENU_GROUPS_PATH) {
+ connection->respond(HTTPConnection::StatusCode200, QJsonDocument(_settingsMenuGroups).toJson(), "application/json");
+
+ return true;
+ }
}
return false;
}
-QJsonObject DomainServerSettingsManager::responseObjectForType(const QString& typeValue, bool isAuthenticated) {
+QJsonObject DomainServerSettingsManager::responseObjectForType(const QString& typeValue, bool isAuthenticated,
+ bool includeDomainSettings, bool includeContentSettings) {
QJsonObject responseObject;
if (!typeValue.isEmpty() || isAuthenticated) {
@@ -1036,8 +1149,15 @@ QJsonObject DomainServerSettingsManager::responseObjectForType(const QString& ty
const QString AFFECTED_TYPES_JSON_KEY = "assignment-types";
+ QJsonArray& filteredDescriptionArray = _descriptionArray;
+ if (includeDomainSettings && !includeContentSettings) {
+ filteredDescriptionArray = _domainSettingsDescription;
+ } else if (includeContentSettings && !includeDomainSettings) {
+ filteredDescriptionArray = _contentSettingsDescription;
+ }
+
// enumerate the groups in the description object to find which settings to pass
- foreach(const QJsonValue& groupValue, _descriptionArray) {
+ foreach(const QJsonValue& groupValue, filteredDescriptionArray) {
QJsonObject groupObject = groupValue.toObject();
QString groupKey = groupObject[DESCRIPTION_NAME_KEY].toString();
QJsonArray groupSettingsArray = groupObject[DESCRIPTION_SETTINGS_KEY].toArray();
@@ -1045,10 +1165,13 @@ QJsonObject DomainServerSettingsManager::responseObjectForType(const QString& ty
QJsonObject groupResponseObject;
foreach(const QJsonValue& settingValue, groupSettingsArray) {
+
const QString VALUE_HIDDEN_FLAG_KEY = "value-hidden";
QJsonObject settingObject = settingValue.toObject();
+ // consider this setting as long as it isn't hidden
+ // and we've been asked to include this type (domain setting or content setting)
if (!settingObject[VALUE_HIDDEN_FLAG_KEY].toBool()) {
QJsonArray affectedTypesArray = settingObject[AFFECTED_TYPES_JSON_KEY].toArray();
if (affectedTypesArray.isEmpty()) {
@@ -1212,7 +1335,8 @@ QJsonObject DomainServerSettingsManager::settingDescriptionFromGroup(const QJson
return QJsonObject();
}
-bool DomainServerSettingsManager::recurseJSONObjectAndOverwriteSettings(const QJsonObject& postedObject) {
+bool DomainServerSettingsManager::recurseJSONObjectAndOverwriteSettings(const QJsonObject& postedObject,
+ SettingsType settingsType) {
static const QString SECURITY_ROOT_KEY = "security";
static const QString AC_SUBNET_WHITELIST_KEY = "ac_subnet_whitelist";
static const QString BROADCASTING_KEY = "broadcasting";
@@ -1222,6 +1346,8 @@ bool DomainServerSettingsManager::recurseJSONObjectAndOverwriteSettings(const QJ
auto& settingsVariant = _configMap.getConfig();
bool needRestart = false;
+ auto& filteredDescriptionArray = settingsType == DomainSettings ? _domainSettingsDescription : _contentSettingsDescription;
+
// Iterate on the setting groups
foreach(const QString& rootKey, postedObject.keys()) {
const QJsonValue& rootValue = postedObject[rootKey];
@@ -1236,7 +1362,7 @@ bool DomainServerSettingsManager::recurseJSONObjectAndOverwriteSettings(const QJ
QJsonObject groupDescriptionObject;
// we need to check the description array to see if this is a root setting or a group setting
- foreach(const QJsonValue& groupValue, _descriptionArray) {
+ foreach(const QJsonValue& groupValue, filteredDescriptionArray) {
if (groupValue.toObject()[DESCRIPTION_NAME_KEY] == rootKey) {
// we matched a group - keep this since we'll use it below to update the settings
groupDescriptionObject = groupValue.toObject();
@@ -1269,6 +1395,7 @@ bool DomainServerSettingsManager::recurseJSONObjectAndOverwriteSettings(const QJ
if (!matchingDescriptionObject.isEmpty()) {
updateSetting(rootKey, rootValue, *thisMap, matchingDescriptionObject);
+
if (rootKey != SECURITY_ROOT_KEY && rootKey != BROADCASTING_KEY &&
rootKey != SETTINGS_PATHS_KEY && rootKey != WIZARD_KEY) {
needRestart = true;
@@ -1286,6 +1413,7 @@ bool DomainServerSettingsManager::recurseJSONObjectAndOverwriteSettings(const QJ
if (!matchingDescriptionObject.isEmpty()) {
const QJsonValue& settingValue = rootValue.toObject()[settingKey];
updateSetting(settingKey, settingValue, *thisMap, matchingDescriptionObject);
+
if ((rootKey != SECURITY_ROOT_KEY && rootKey != BROADCASTING_KEY &&
rootKey != DESCRIPTION_ROOT_KEY && rootKey != WIZARD_KEY) ||
settingKey == AC_SUBNET_WHITELIST_KEY) {
diff --git a/domain-server/src/DomainServerSettingsManager.h b/domain-server/src/DomainServerSettingsManager.h
index d2f6d1e526..5e13c9f28a 100644
--- a/domain-server/src/DomainServerSettingsManager.h
+++ b/domain-server/src/DomainServerSettingsManager.h
@@ -13,6 +13,7 @@
#define hifi_DomainServerSettingsManager_h
#include
+#include
#include
#include
@@ -28,6 +29,7 @@ const QString SETTINGS_PATHS_KEY = "paths";
const QString SETTINGS_PATH = "/settings";
const QString SETTINGS_PATH_JSON = SETTINGS_PATH + ".json";
+const QString CONTENT_SETTINGS_PATH_JSON = "/content-settings.json";
const QString AGENT_STANDARD_PERMISSIONS_KEYPATH = "security.standard_permissions";
const QString AGENT_PERMISSIONS_KEYPATH = "security.permissions";
const QString IP_PERMISSIONS_KEYPATH = "security.ip_permissions";
@@ -38,6 +40,10 @@ const QString GROUP_FORBIDDENS_KEYPATH = "security.group_forbiddens";
using GroupByUUIDKey = QPair; // groupID, rankID
+enum SettingsType {
+ DomainSettings,
+ ContentSettings
+};
class DomainServerSettingsManager : public QObject {
Q_OBJECT
@@ -123,8 +129,10 @@ private slots:
private:
QStringList _argumentList;
- QJsonObject responseObjectForType(const QString& typeValue, bool isAuthenticated = false);
- bool recurseJSONObjectAndOverwriteSettings(const QJsonObject& postedObject);
+ QJsonArray filteredDescriptionArray(bool isContentSettings);
+ QJsonObject responseObjectForType(const QString& typeValue, bool isAuthenticated = false,
+ bool includeDomainSettings = true, bool includeContentSettings = true);
+ bool recurseJSONObjectAndOverwriteSettings(const QJsonObject& postedObject, SettingsType settingsType);
void updateSetting(const QString& key, const QJsonValue& newValue, QVariantMap& settingMap,
const QJsonObject& settingDescription);
@@ -132,8 +140,15 @@ private:
void sortPermissions();
void persistToFile();
+ void splitSettingsDescription();
+
double _descriptionVersion;
+
QJsonArray _descriptionArray;
+ QJsonArray _domainSettingsDescription;
+ QJsonArray _contentSettingsDescription;
+ QJsonObject _settingsMenuGroups;
+
HifiConfigVariantMap _configMap;
friend class DomainServer;
diff --git a/libraries/embedded-webserver/src/HTTPManager.cpp b/libraries/embedded-webserver/src/HTTPManager.cpp
index bd256578d8..fd127a2e92 100644
--- a/libraries/embedded-webserver/src/HTTPManager.cpp
+++ b/libraries/embedded-webserver/src/HTTPManager.cpp
@@ -79,7 +79,7 @@ bool HTTPManager::handleHTTPRequest(HTTPConnection* connection, const QUrl& url,
QHash redirectHeader;
redirectHeader.insert(QByteArray("Location"), redirectLocation.toUtf8());
- connection->respond(HTTPConnection::StatusCode301, "", HTTPConnection::DefaultContentType, redirectHeader);
+ connection->respond(HTTPConnection::StatusCode302, "", HTTPConnection::DefaultContentType, redirectHeader);
}
// if the last thing is a trailing slash then we want to look for index file
-
+
-
-
-
-
-
+
-
-
-
+
-
-
-
-
+
+
+
+
+
diff --git a/domain-server/resources/web/settings/js/settings.js b/domain-server/resources/web/settings/js/settings.js
index 3faeff4482..9a31b766a6 100644
--- a/domain-server/resources/web/settings/js/settings.js
+++ b/domain-server/resources/web/settings/js/settings.js
@@ -1,1262 +1,20 @@
-var DomainInfo = null;
-
-var viewHelpers = {
- getFormGroup: function(keypath, setting, values, isAdvanced) {
- form_group = "
-
-
-
-
-
-
-
-
-
-
-
-
-
- ";
- setting_value = _(values).valueForKeyPath(keypath);
-
- if (_.isUndefined(setting_value) || _.isNull(setting_value)) {
- if (_.has(setting, 'default')) {
- setting_value = setting.default;
- } else {
- setting_value = "";
- }
- }
-
- label_class = 'control-label';
-
- function common_attrs(extra_classes) {
- extra_classes = (!_.isUndefined(extra_classes) ? extra_classes : "");
- return " class='" + (setting.type !== 'checkbox' ? 'form-control' : '')
- + " " + Settings.TRIGGER_CHANGE_CLASS + " " + extra_classes + "' data-short-name='"
- + setting.name + "' name='" + keypath + "' "
- + "id='" + (!_.isUndefined(setting.html_id) ? setting.html_id : keypath) + "'";
- }
-
- if (setting.type === 'checkbox') {
- if (setting.label) {
- form_group += ""
- }
-
- form_group += "
"
- return form_group
- }
-}
-
-var qs = (function(a) {
- if (a == "") return {};
- var b = {};
- for (var i = 0; i < a.length; ++i)
- {
- var p=a[i].split('=', 2);
- if (p.length == 1) {
- b[p[0]] = "";
- } else {
- b[p[0]] = decodeURIComponent(p[1].replace(/\+/g, " "));
- }
- }
- return b;
-})(window.location.search.substr(1).split('&'));
-
$(document).ready(function(){
- /*
- * Clamped-width.
- * Usage:
- * "
- form_group += ""
-
- if (setting.help) {
- form_group += "" + setting.help + "";
- }
-
- form_group += "
"
- } else {
- input_type = _.has(setting, 'type') ? setting.type : "text"
-
- if (setting.label) {
- form_group += "";
- }
-
- if (input_type === 'table') {
- form_group += makeTable(setting, keypath, setting_value)
- } else {
- if (input_type === 'select') {
- form_group += ""
-
- form_group += ""
- } else if (input_type === 'button') {
- // Is this a button that should link to something directly?
- // If so, we use an anchor tag instead of a button tag
-
- if (setting.href) {
- form_group += ""
- + setting.button_label + "";
- } else {
- form_group += "";
- }
-
- } else {
-
- if (input_type == 'integer') {
- input_type = "text"
- }
-
- form_group += ""
- }
-
- form_group += "" + setting.help + ""
- }
- }
-
- form_group += "This long content will force clamped width
- *
- * Author: LV
- */
-
- $.ajaxSetup({
- timeout: 20000,
- });
-
- $('[data-clampedwidth]').each(function () {
- var elem = $(this);
- var parentPanel = elem.data('clampedwidth');
- var resizeFn = function () {
- var sideBarNavWidth = $(parentPanel).width() - parseInt(elem.css('paddingLeft')) - parseInt(elem.css('paddingRight')) - parseInt(elem.css('marginLeft')) - parseInt(elem.css('marginRight')) - parseInt(elem.css('borderLeftWidth')) - parseInt(elem.css('borderRightWidth'));
- elem.css('width', sideBarNavWidth);
- };
-
- resizeFn();
- $(window).resize(resizeFn);
- });
-
- $('#' + Settings.FORM_ID).on('click', '.' + Settings.ADD_ROW_BUTTON_CLASS, function(){
- addTableRow($(this).closest('tr'));
- });
-
- $('#' + Settings.FORM_ID).on('click', '.' + Settings.DEL_ROW_BUTTON_CLASS, function(){
- deleteTableRow($(this).closest('tr'));
- });
-
- $('#' + Settings.FORM_ID).on('click', '.' + Settings.ADD_CATEGORY_BUTTON_CLASS, function(){
- addTableCategory($(this).closest('tr'));
- });
-
- $('#' + Settings.FORM_ID).on('click', '.' + Settings.DEL_CATEGORY_BUTTON_CLASS, function(){
- deleteTableCategory($(this).closest('tr'));
- });
-
- $('#' + Settings.FORM_ID).on('click', '.' + Settings.TOGGLE_CATEGORY_COLUMN_CLASS, function(){
- toggleTableCategory($(this).closest('tr'));
- });
-
- $('#' + Settings.FORM_ID).on('click', '.' + Settings.MOVE_UP_BUTTON_CLASS, function(){
- moveTableRow($(this).closest('tr'), true);
- });
-
- $('#' + Settings.FORM_ID).on('click', '.' + Settings.MOVE_DOWN_BUTTON_CLASS, function(){
- moveTableRow($(this).closest('tr'), false);
- });
-
- $('#' + Settings.FORM_ID).on('keyup', function(e){
- var $target = $(e.target);
- if (e.keyCode == 13) {
- if ($target.is('table input')) {
- // capture enter in table input
- // if we have a sibling next to us that has an input, jump to it, otherwise check if we have a glyphicon for add to click
- sibling = $target.parent('td').next();
-
- if (sibling.hasClass(Settings.DATA_COL_CLASS)) {
- // set focus to next input
- sibling.find('input').focus();
- } else {
-
- // jump over the re-order row, if that's what we're on
- if (sibling.hasClass(Settings.REORDER_BUTTONS_CLASS)) {
- sibling = sibling.next();
- }
-
- // for tables with categories we add the entry and setup the new row on enter
- if (sibling.find("." + Settings.ADD_CATEGORY_BUTTON_CLASS).length) {
- sibling.find("." + Settings.ADD_CATEGORY_BUTTON_CLASS).click();
-
- // set focus to the first input in the new row
- $target.closest('table').find('tr.inputs input:first').focus();
- }
-
- var tableRows = sibling.parent();
- var tableBody = tableRows.parent();
-
- // if theres no more siblings, we should jump to a new row
- if (sibling.next().length == 0 && tableRows.nextAll().length == 1) {
- tableBody.find("." + Settings.ADD_ROW_BUTTON_CLASS).click();
- }
- }
-
- } else if ($target.is('input')) {
- $target.change().blur();
- }
-
- e.preventDefault();
- }
- });
-
- $('#' + Settings.FORM_ID).on('keypress', function(e){
- if (e.keyCode == 13) {
-
- e.preventDefault();
- }
- });
-
- $('#' + Settings.FORM_ID).on('change', '.' + Settings.TRIGGER_CHANGE_CLASS , function(){
- // this input was changed, add the changed data attribute to it
- $(this).attr('data-changed', true);
-
- badgeSidebarForDifferences($(this));
- });
-
- $('#' + Settings.FORM_ID).on('switchChange.bootstrapSwitch', 'input.toggle-checkbox', function(){
- // this checkbox was changed, add the changed data attribute to it
- $(this).attr('data-changed', true);
-
- badgeSidebarForDifferences($(this));
- });
-
- // Bootstrap switch in table
- $('#' + Settings.FORM_ID).on('change', 'input.table-checkbox', function () {
- // Bootstrap switches in table: set the changed data attribute for all rows in table.
- var row = $(this).closest('tr');
- if (row.hasClass("value-row")) { // Don't set attribute on input row switches prior to it being added to table.
- row.find('td.' + Settings.DATA_COL_CLASS + ' input').attr('data-changed', true);
- updateDataChangedForSiblingRows(row, true);
- badgeSidebarForDifferences($(this));
- }
- });
-
- $('#' + Settings.FORM_ID).on('change', 'input.table-time', function() {
- // Bootstrap switches in table: set the changed data attribute for all rows in table.
- var row = $(this).closest('tr');
- if (row.hasClass("value-row")) { // Don't set attribute on input row switches prior to it being added to table.
- row.find('td.' + Settings.DATA_COL_CLASS + ' input').attr('data-changed', true);
- updateDataChangedForSiblingRows(row, true);
- badgeSidebarForDifferences($(this));
- }
- });
-
- $('.advanced-toggle').click(function(){
- Settings.showAdvanced = !Settings.showAdvanced
- var advancedSelector = $('.' + Settings.ADVANCED_CLASS)
-
- if (Settings.showAdvanced) {
- advancedSelector.show();
- $(this).html("Hide advanced")
- } else {
- advancedSelector.hide();
- $(this).html("Show advanced")
- }
-
- $(this).blur();
- })
-
- $('#' + Settings.FORM_ID).on('click', '#' + Settings.CREATE_DOMAIN_ID_BTN_ID, function(){
- $(this).blur();
- showDomainCreationAlert(false);
- })
-
- $('#' + Settings.FORM_ID).on('click', '#' + Settings.CHOOSE_DOMAIN_ID_BTN_ID, function(){
- $(this).blur();
- chooseFromHighFidelityDomains($(this))
- });
-
- $('#' + Settings.FORM_ID).on('click', '#' + Settings.GET_TEMPORARY_NAME_BTN_ID, function(){
- $(this).blur();
- createTemporaryDomain();
- });
-
-
- $('#' + Settings.FORM_ID).on('change', 'select', function(){
- $("input[name='" + $(this).attr('data-hidden-input') + "']").val($(this).val()).change()
- });
-
- $('#' + Settings.FORM_ID).on('click', '#' + Settings.DISCONNECT_ACCOUNT_BTN_ID, function(e){
- $(this).blur();
- disonnectHighFidelityAccount();
- e.preventDefault();
- });
-
- $('#' + Settings.FORM_ID).on('click', '#' + Settings.CONNECT_ACCOUNT_BTN_ID, function(e){
- $(this).blur();
- prepareAccessTokenPrompt(function(accessToken) {
- // we have an access token - set the access token input with this and save settings
- $(Settings.ACCESS_TOKEN_SELECTOR).val(accessToken).change();
- saveSettings();
- });
- });
-
- var panelsSource = $('#panels-template').html()
- Settings.panelsTemplate = _.template(panelsSource)
-
- var sidebarTemplate = $('#list-group-template').html()
- Settings.sidebarTemplate = _.template(sidebarTemplate)
-
- var navbarHeight = $('.navbar').outerHeight(true);
-
- $('#setup-sidebar').affix({
- offset: {
- top: 1,
- bottom: navbarHeight
- }
- });
-
- reloadSettings(function(success){
- if (success) {
- handleAction();
- } else {
- swal({
- title: '',
- type: 'error',
- text: Strings.LOADING_SETTINGS_ERROR
- });
- }
- $('body').scrollspy({
- target: '#setup-sidebar',
- offset: navbarHeight
- });
- });
-});
-
-function getShareName(callback) {
- getDomainFromAPI(function(data){
- // check if we have owner_places (for a real domain) or a name (for a temporary domain)
- if (data && data.status == "success") {
- var shareName;
- if (data.domain.default_place_name) {
- shareName = data.domain.default_place_name;
- } else if (data.domain.name) {
- shareName = data.domain.name;
- } else if (data.domain.network_address) {
- shareName = data.domain.network_address;
- if (data.domain.network_port !== 40102) {
- shareName += ':' + data.domain.network_port;
- }
- }
-
- callback(true, shareName);
- } else {
- callback(false);
- }
- })
-}
-
-function handleAction() {
- // check if we were passed an action to handle
- var action = qs["action"];
-
- if (action == "share") {
- // figure out if we already have a stored domain ID
- if (Settings.data.values.metaverse.id.length > 0) {
- // we need to ask the API what a shareable name for this domain is
- getShareName(function(success, shareName){
- if (success) {
- var shareLink = "hifi://" + shareName;
-
- console.log(shareLink);
-
- // show a dialog with a copiable share URL
- swal({
- title: "Share",
- type: "input",
- inputPlaceholder: shareLink,
- inputValue: shareLink,
- text: "Copy this URL to invite friends to your domain.",
- closeOnConfirm: true
- });
-
- $('.sweet-alert input').select();
-
- } else {
- // show an error alert
- swal({
- title: '',
- type: 'error',
- text: "There was a problem retreiving domain information from High Fidelity API.",
- confirmButtonText: 'Try again',
- showCancelButton: true,
- closeOnConfirm: false
- }, function(isConfirm){
- if (isConfirm) {
- // they want to try getting domain share info again
- showSpinnerAlert("Requesting domain information...")
- handleAction();
- } else {
- swal.close();
- }
- });
- }
- });
- } else {
- // no domain ID present, just show the share dialog
- createTemporaryDomain();
- }
- }
-}
-
-function dynamicButton(button_id, text) {
- return $("");
-}
-
-function postSettings(jsonSettings) {
- // POST the form JSON to the domain-server settings.json endpoint so the settings are saved
- $.ajax('/settings.json', {
- data: JSON.stringify(jsonSettings),
- contentType: 'application/json',
- type: 'POST'
- }).done(function(data){
- if (data.status == "success") {
- if ($(".save-button").html() === SAVE_BUTTON_LABEL_RESTART) {
- showRestartModal();
- } else {
- location.reload(true);
- }
- } else {
- showErrorMessage("Error", SETTINGS_ERROR_MESSAGE)
- reloadSettings();
- }
- }).fail(function(){
- showErrorMessage("Error", SETTINGS_ERROR_MESSAGE)
- reloadSettings();
- });
-}
-
-function accessTokenIsSet() {
- return Settings.data.values.metaverse.access_token.length > 0;
-}
-
-function setupHFAccountButton() {
-
- var hasAccessToken = accessTokenIsSet();
- var el;
-
- if (hasAccessToken) {
- el = ""; - el += "High Fidelity Account Connected"; - el += ""; - el += "
"; - el = $(el); - } else { - // setup an object for the settings we want our button to have - var buttonSetting = { - type: 'button', - name: 'connected_account', - label: 'Connected Account', - } - buttonSetting.help = ""; - buttonSetting.classes = "btn-primary"; - buttonSetting.button_label = "Connect High Fidelity Account"; - buttonSetting.html_id = Settings.CONNECT_ACCOUNT_BTN_ID; - - buttonSetting.href = URLs.METAVERSE_URL + "/user/tokens/new?for_domain_server=true"; - - // since we do not have an access token we change hide domain ID and auto networking settings - // without an access token niether of them can do anything - $("[data-keypath='metaverse.id']").hide(); - - // use the existing getFormGroup helper to ask for a button - el = viewHelpers.getFormGroup('', buttonSetting, Settings.data.values); - } - - // add the button group to the top of the metaverse panel - $('#metaverse .panel-body').prepend(el); -} - -function disonnectHighFidelityAccount() { - // the user clicked on the disconnect account btn - give them a sweet alert to make sure this is what they want to do - swal({ - title: "Are you sure?", - text: "This will remove your domain-server OAuth access token." - + "This could cause your domain to appear offline and no longer be reachable via any place names.", - type: "warning", - html: true, - showCancelButton: true - }, function(){ - // we need to post to settings to clear the access-token - $(Settings.ACCESS_TOKEN_SELECTOR).val('').change(); - // reset the domain id to get a new temporary name - $(Settings.DOMAIN_ID_SELECTOR).val('').change(); - saveSettings(); - }); -} - -function showSpinnerAlert(title) { - swal({ - title: title, - text: '',
- html: true,
- showConfirmButton: false,
- allowEscapeKey: false
- });
-}
-
-function showDomainCreationAlert(justConnected) {
- swal({
- title: 'Create new domain ID',
- type: 'input',
- text: 'Enter a label this machine.This will help you identify which domain ID belongs to which machine.',
- showCancelButton: true,
- confirmButtonText: "Create",
- closeOnConfirm: false,
- html: true
- }, function(inputValue){
- if (inputValue === false) {
- swal.close();
-
- // user cancelled domain ID creation - if we're supposed to save after cancel then save here
- if (justConnected) {
- saveSettings();
- }
- } else {
- // we're going to change the alert to a new one with a spinner while we create this domain
- showSpinnerAlert('Creating domain ID');
- createNewDomainID(inputValue, justConnected);
- }
- });
-}
-
-function createNewDomainID(label, justConnected) {
- // get the JSON object ready that we'll use to create a new domain
- var domainJSON = {
- "label": label
- }
-
- $.post("/api/domains", domainJSON, function(data){
- // we successfully created a domain ID, set it on that field
- var domainID = data.domain.id;
- console.log("Setting domain id to ", data, domainID);
- $(Settings.DOMAIN_ID_SELECTOR).val(domainID).change();
-
- if (justConnected) {
- var successText = Strings.CREATE_DOMAIN_SUCCESS_JUST_CONNECTED
- } else {
- var successText = Strings.CREATE_DOMAIN_SUCCESS;
- }
-
- successText += "Click the button below to save your new settings and restart your domain-server.";
-
- // show a sweet alert to say we are all finished up and that we need to save
- swal({
- title: 'Success!',
- type: 'success',
- text: successText,
- html: true,
- confirmButtonText: 'Save'
- }, function(){
- saveSettings();
- });
- }, 'json').fail(function(){
-
- var errorText = "There was a problem creating your new domain ID. Do you want to try again or";
-
- if (justConnected) {
- errorText += " just save your new access token?You can always create a new domain ID later.";
- } else {
- errorText += " cancel?"
- }
-
- // we failed to create the new domain ID, show a sweet-alert that lets them try again or cancel
- swal({
- title: '',
- type: 'error',
- text: errorText,
- html: true,
- confirmButtonText: 'Try again',
- showCancelButton: true,
- closeOnConfirm: false
- }, function(isConfirm){
- if (isConfirm) {
- // they want to try creating a domain ID again
- showDomainCreationAlert(justConnected);
- } else {
- // they want to cancel
- if (justConnected) {
- // since they just connected we need to save the access token here
- saveSettings();
- }
- }
- });
- });
-}
-
-function createDomainSpinner() {
- var spinner = '';
- return spinner;
-}
-
-function createDomainLoadingError(message) {
- var errorEl = $("");
- errorEl.append(message + " ");
-
- var retryLink = $("Please click here to try again.");
- retryLink.click(function(ev) {
- ev.preventDefault();
- reloadDomainInfo();
- });
- errorEl.append(retryLink);
-
- return errorEl;
-}
-
-function parseJSONResponse(xhr) {
- try {
- return JSON.parse(xhr.responseText);
- } catch (e) {
- }
- return null;
-}
-
-function showOrHideLabel() {
- var type = getCurrentDomainIDType();
- var shouldShow = accessTokenIsSet() && (type === DOMAIN_ID_TYPE_FULL || type === DOMAIN_ID_TYPE_UNKNOWN);
- $(".panel#label").toggle(shouldShow);
- $("li a[href='#label']").parent().toggle(shouldShow);
- return shouldShow;
-}
-
-function setupDomainLabelSetting() {
- showOrHideLabel();
-
- var html = "
"
- html += " Edit";
- html += "";
- html += "
";
-
- html = $(html);
-
- html.find('a').click(function(ev) {
- ev.preventDefault();
-
- var label = DomainInfo.label === null ? "" : DomainInfo.label;
- var modal_body = "";
- modal_body += "";
- modal_body += "";
- modal_body += "";
- modal_body += "
";
-
- var dialog = bootbox.dialog({
- title: 'Edit Label',
- message: modal_body,
- closeButton: false,
- onEscape: true,
- buttons: [
- {
- label: 'Cancel',
- className: 'edit-label-cancel-btn',
- callback: function() {
- dialog.modal('hide');
- }
- },
- {
- label: 'Save',
- className: 'edit-label-save-btn btn btn-primary',
- callback: function() {
- var data = {
- label: $('#domain-label-input').val()
- };
-
- $('.edit-label-cancel-btn').attr('disabled', 'disabled');
- $('.edit-label-save-btn').attr('disabled', 'disabled');
- $('.edit-label-save-btn').html("Saving...");
-
- $('.error-message').hide();
-
- $.ajax({
- url: '/api/domains',
- type: 'PUT',
- data: data,
- success: function(xhr) {
- dialog.modal('hide');
- reloadDomainInfo();
- },
- error: function(xhr) {
- var data = parseJSONResponse(xhr);
- console.log(data, data.status, data.data);
- if (data.status === "fail") {
- for (var key in data.data) {
- var errorMsg = data.data[key];
- var errorEl = $('.error-message[data-property="' + key + '"');
- errorEl.html(errorMsg);
- errorEl.show();
- }
- }
- $('.edit-label-cancel-btn').removeAttr('disabled');
- $('.edit-label-save-btn').removeAttr('disabled');
- $('.edit-label-save-btn').html("Save");
- }
- });
- return false;
- }
- }
- ],
- callback: function(result) {
- console.log("result: ", result);
- }
- });
- });
-
- var spinner = createDomainSpinner();
- var errorEl = createDomainLoadingError("Error loading label.");
-
- html.append(spinner);
- html.append(errorEl);
-
- $('div#label .panel-body').append(html);
-}
-
-function showOrHideAutomaticNetworking() {
- var type = getCurrentDomainIDType();
- if (!accessTokenIsSet() || (type !== DOMAIN_ID_TYPE_FULL && type !== DOMAIN_ID_TYPE_UNKNOWN)) {
- $("[data-keypath='metaverse.automatic_networking']").hide();
- return false;
- }
- $("[data-keypath='metaverse.automatic_networking']").show();
- return true;
-}
-
-function setupDomainNetworkingSettings() {
- if (!showOrHideAutomaticNetworking()) {
- return;
- }
-
- var autoNetworkingSetting = Settings.data.values.metaverse.automatic_networking;
- if (autoNetworkingSetting === 'full') {
- return;
- }
-
- var includeAddress = autoNetworkingSetting === 'disabled';
-
- if (includeAddress) {
- var label = "Network Address:Port";
- } else {
- var label = "Network Port";
- }
-
- var lowerName = name.toLowerCase();
- var form = '';
- form += '';
- form += ' Edit';
- form += '';
- form += '
';
-
- form = $(form);
-
- form.find('#edit-network-address-port').click(function(ev) {
- ev.preventDefault();
-
- var address = DomainInfo.network_address === null ? '' : DomainInfo.network_address;
- var port = DomainInfo.network_port === null ? '' : DomainInfo.network_port;
- var modal_body = "This defines how nodes will connect to your domain. You can read more about automatic networking here.
';
- form += '";
- if (includeAddress) {
- modal_body += "";
- modal_body += "";
- modal_body += "";
- }
- modal_body += "";
- modal_body += "";
- modal_body += "";
- modal_body += "
";
-
- var dialog = bootbox.dialog({
- title: 'Edit Network',
- message: modal_body,
- closeButton: false,
- onEscape: true,
- buttons: [
- {
- label: 'Cancel',
- className: 'edit-network-cancel-btn',
- callback: function() {
- dialog.modal('hide');
- }
- },
- {
- label: 'Save',
- className: 'edit-network-save-btn btn btn-primary',
- callback: function() {
- var data = {
- network_port: $('#network-port-input').val()
- };
- if (includeAddress) {
- data.network_address = $('#network-address-input').val();
- }
-
- $('.edit-network-cancel-btn').attr('disabled', 'disabled');
- $('.edit-network-save-btn').attr('disabled', 'disabled');
- $('.edit-network-save-btn').html("Saving...");
-
- console.log('data', data);
-
- $('.error-message').hide();
-
- $.ajax({
- url: '/api/domains',
- type: 'PUT',
- data: data,
- success: function(xhr) {
- console.log(xhr, parseJSONResponse(xhr));
- dialog.modal('hide');
- reloadDomainInfo();
- },
- error:function(xhr) {
- var data = parseJSONResponse(xhr);
- console.log(data, data.status, data.data);
- if (data.status === "fail") {
- for (var key in data.data) {
- var errorMsg = data.data[key];
- console.log(key, errorMsg);
- var errorEl = $('.error-message[data-property="' + key + '"');
- console.log(errorEl);
- errorEl.html(errorMsg);
- errorEl.show();
- }
- }
- $('.edit-network-cancel-btn').removeAttr('disabled');
- $('.edit-network-save-btn').removeAttr('disabled');
- $('.edit-network-save-btn').html("Save");
- }
- });
- return false;
- }
- }
- ],
- callback: function(result) {
- console.log("result: ", result);
- }
- });
- });
-
- var spinner = createDomainSpinner();
-
- var errorMessage = ''
- if (includeAddress) {
- errorMessage = "We were unable to load the network address and port.";
- } else {
- errorMessage = "We were unable to load the network port."
- }
- var errorEl = createDomainLoadingError(errorMessage);
-
- var autoNetworkingEl = $('div[data-keypath="metaverse.automatic_networking"]');
- autoNetworkingEl.after(spinner);
- autoNetworkingEl.after(errorEl);
- autoNetworkingEl.after(form);
-}
-
-
-function setupPlacesTable() {
- // create a dummy table using our view helper
- var placesTableSetting = {
- type: 'table',
- name: 'places',
- label: 'Places',
- html_id: Settings.PLACES_TABLE_ID,
- help: "The following places currently point to this domain.To point places to this domain, "
- + " go to the My Places "
- + "page in your High Fidelity Metaverse account.",
- read_only: true,
- can_add_new_rows: false,
- columns: [
+ var qs = (function(a) {
+ if (a == "") return {};
+ var b = {};
+ for (var i = 0; i < a.length; ++i)
{
- "name": "name",
- "label": "Name"
- },
- {
- "name": "path",
- "label": "Viewpoint or Path"
- },
- {
- "name": "remove",
- "label": "",
- "class": "buttons"
- }
- ]
- }
-
- // get a table for the places
- var placesTableGroup = viewHelpers.getFormGroup('', placesTableSetting, Settings.data.values);
-
- // append the places table in the right place
- $('#places_paths .panel-body').prepend(placesTableGroup);
- //$('#' + Settings.PLACES_TABLE_ID).append("";
- modal_body += "";
- modal_body += "
";
-
- var modal_buttons = [
- {
- label: Strings.EDIT_PLACE_CANCEL_BUTTON,
- className: "edit-place-cancel-button",
- callback: function() {
- dialog.modal('hide');
- }
- },
- {
- label: Strings.EDIT_PLACE_CONFIRM_BUTTON,
- className: 'edit-place-save-button btn btn-primary',
- callback: function() {
- var placePath = $('#place-path-input').val();
-
- if (path == placePath) {
- return true;
- }
-
- $('.edit-place-cancel-button').attr('disabled', 'disabled');
- $('.edit-place-save-button').attr('disabled', 'disabled');
- $('.edit-place-save-button').html(Strings.EDIT_PLACE_BUTTON_PENDING);
-
- sendUpdatePlaceRequest(
- placeID,
- placePath,
- null,
- false,
- function() {
- dialog.modal('hide')
- reloadDomainInfo();
- },
- function() {
- $('.edit-place-cancel-button').removeAttr('disabled');
- $('.edit-place-save-button').removeAttr('disabled');
- $('.edit-place-save-button').html(Strings.EDIT_PLACE_CONFIRM_BUTTON);
- }
- );
-
- return false;
- }
- }
- ];
-
- dialog = bootbox.dialog({
- title: Strings.EDIT_PLACE_TITLE,
- closeButton: false,
- onEscape: true,
- message: modal_body,
- buttons: modal_buttons
- })
-}
-
-function appendAddButtonToPlacesTable() {
- var addRow = $("Choose the High Fidelity domain you want this domain-server to represent.
This will set your domain ID on the settings page.
You do not have any domains in your High Fidelity account." +
- "
Go to your domains page to create a new one. Once your domain is created re-open this dialog to select it.
" + - "Please follow the instructions on the settings page to add an access token.", - title: "Access token required" - }) - } - } - -function createTemporaryDomain() { - swal({ - title: 'Create temporary place name', - text: "This will create a temporary place name and domain ID" - + " so other users can easily connect to your domain." - + "In order to make your domain reachable, this will also enable full automatic networking.", - showCancelButton: true, - confirmButtonText: 'Create', - closeOnConfirm: false, - html: true - }, function(isConfirm){ - if (isConfirm) { - showSpinnerAlert('Creating temporary place name'); - - // make a get request to get a temporary domain - $.post(URLs.METAVERSE_URL + '/api/v1/domains/temporary', function(data){ - if (data.status == "success") { - var domain = data.data.domain; - - // we should have a new domain ID - set it on the domain ID value - $(Settings.DOMAIN_ID_SELECTOR).val(domain.id).change(); - - // we also need to make sure auto networking is set to full - $('[data-hidden-input="metaverse.automatic_networking"]').val("full").change(); - - swal({ - type: 'success', - title: 'Success!', - text: "We have created a temporary name and domain ID for you." - + "Your temporary place name is " + domain.name + "." - + "Press the button below to save your new settings and restart your domain-server.", - confirmButtonText: 'Save', - html: true - }, function(){ - saveSettings(); - }); - } - }); - } - }); -} - -function reloadSettings(callback) { - $.getJSON('/settings.json', function(data){ - _.extend(data, viewHelpers) - - $('.nav-stacked').html(Settings.sidebarTemplate(data)) - $('#panels').html(Settings.panelsTemplate(data)) - - Settings.data = data; - Settings.initialValues = form2js('settings-form', ".", false, cleanupFormValues, true); + return b; + })(window.location.search.substr(1).split('&')); + Settings.afterReloadActions = function() { // append the domain selection modal appendDomainIDButtons(); @@ -1291,117 +49,10 @@ function reloadSettings(callback) { } } - // setup any bootstrap switches - $('.toggle-checkbox').bootstrapSwitch(); - - $('[data-toggle="tooltip"]').tooltip(); - - // call the callback now that settings are loaded - callback(true); - }).fail(function() { - // call the failure object since settings load faild - callback(false) - }); -} - -function validateInputs() { - // check if any new values are bad - var tables = $('table'); - - var inputsValid = true; - - var tables = $('table'); - - // clear any current invalid rows - $('tr.' + Settings.INVALID_ROW_CLASS).removeClass(Settings.INVALID_ROW_CLASS); - - function markParentRowInvalid(rowChild) { - $(rowChild).closest('tr').addClass(Settings.INVALID_ROW_CLASS); + handleAction(); } - _.each(tables, function(table) { - // validate keys specificially for spaces and equality to an existing key - var newKeys = $(table).find('tr.' + Settings.NEW_ROW_CLASS + ' td.key'); - - var keyWithSpaces = false; - var empty = false; - var duplicateKey = false; - - _.each(newKeys, function(keyCell) { - var keyVal = $(keyCell).children('input').val(); - - if (keyVal.indexOf(' ') !== -1) { - keyWithSpaces = true; - markParentRowInvalid(keyCell); - return; - } - - // make sure the key isn't empty - if (keyVal.length === 0) { - empty = true - - markParentRowInvalid(input); - return; - } - - // make sure we don't have duplicate keys in the table - var otherKeys = $(table).find('td.key').not(keyCell); - _.each(otherKeys, function(otherKeyCell) { - var keyInput = $(otherKeyCell).children('input'); - - if (keyInput.length) { - if ($(keyInput).val() == keyVal) { - duplicateKey = true; - } - } else if ($(otherKeyCell).html() == keyVal) { - duplicateKey = true; - } - - if (duplicateKey) { - markParentRowInvalid(keyCell); - return; - } - }); - - }); - - if (keyWithSpaces) { - showErrorMessage("Error", "Key contains spaces"); - inputsValid = false; - return - } - - if (empty) { - showErrorMessage("Error", "Empty field(s)"); - inputsValid = false; - return - } - - if (duplicateKey) { - showErrorMessage("Error", "Two keys cannot be identical"); - inputsValid = false; - return; - } - }); - - return inputsValid; -} - -var SETTINGS_ERROR_MESSAGE = "There was a problem saving domain settings. Please try again!"; - -function saveSettings() { - - if (validateInputs()) { - // POST the form JSON to the domain-server settings.json endpoint so the settings are saved - var canPost = true; - - // disable any inputs not changed - $("input:not([data-changed])").each(function () { - $(this).prop('disabled', true); - }); - - // grab a JSON representation of the form via form2js - var formJSON = form2js('settings-form', ".", false, cleanupFormValues, true); + Settings.handlePostSettings = function(formJSON) { // check if we've set the basic http password if (formJSON["security"]) { @@ -1424,727 +75,945 @@ function saveSettings() { delete formJSON["security"]["verify_http_password"]; } else { bootbox.alert({ "message": "Passwords must match!", "title": "Password Error" }); - canPost = false; + return false; } } } - console.log("----- SAVING ------"); + console.log("----- handlePostSettings() called ------"); console.log(formJSON); - // re-enable all inputs - $("input").each(function () { - $(this).prop('disabled', false); - }); + if (formJSON["security"]) { + var username = formJSON["security"]["http_username"]; - // remove focus from the button - $(this).blur(); + var password = formJSON["security"]["http_password"]; - if (canPost) { - if (formJSON["security"]) { - var username = formJSON["security"]["http_username"]; + if ((password == sha256_digest("")) && (username == undefined || (username && username.length != 0))) { + swal({ + title: "Are you sure?", + text: "You have entered a blank password with a non-blank username. Are you sure you want to require a blank password?", + type: "warning", + showCancelButton: true, + confirmButtonColor: "#5cb85c", + confirmButtonText: "Yes!", + closeOnConfirm: true + }, + function () { + formJSON["security"]["http_password"] = ""; - var password = formJSON["security"]["http_password"]; + postSettings(formJSON); + }); - if ((password == sha256_digest("")) && (username == undefined || (username && username.length != 0))) { - swal({ - title: "Are you sure?", - text: "You have entered a blank password with a non-blank username. Are you sure you want to require a blank password?", - type: "warning", - showCancelButton: true, - confirmButtonColor: "#5cb85c", - confirmButtonText: "Yes!", - closeOnConfirm: true - }, - function () { - formJSON["security"]["http_password"] = ""; - postSettings(formJSON); - }); - return; - } + return; } - // POST the form JSON to the domain-server settings.json endpoint so the settings are saved - postSettings(formJSON); } - } -} -$('body').on('click', '.save-button', function(e){ - saveSettings(); - return false; -}); + postSettings(formJSON); + }; -function makeTable(setting, keypath, setting_value) { - var isArray = !_.has(setting, 'key'); - var categoryKey = setting.categorize_by_key; - var isCategorized = !!categoryKey && isArray; - - if (!isArray && setting.can_order) { - setting.can_order = false; - } - - var html = ""; - - if (setting.help) { - html += "" + setting.help + "" - } - - var nonDeletableRowKey = setting["non-deletable-row-key"]; - var nonDeletableRowValues = setting["non-deletable-row-values"]; - - html += "
| " + group.label + " | " - }) - if (!setting.read_only) { - if (setting.can_order) { - html += ""; - } - html += " | |||
| # | " // Row number - } - - if (setting.key) { - html += "" + setting.key.label + " | " // Key - } - - var numVisibleColumns = 0; - _.each(setting.columns, function(col) { - if (!col.hidden) numVisibleColumns++; - html += "" + col.label + " | " // Data + $('#' + Settings.FORM_ID).on('click', '#' + Settings.CREATE_DOMAIN_ID_BTN_ID, function(){ + $(this).blur(); + showDomainCreationAlert(false); }) - if (!setting.read_only) { - if (setting.can_order) { - numVisibleColumns++; - html += ""; - } - numVisibleColumns++; - html += " | |
| " + row_num + " | " + // show a sweet alert to say we are all finished up and that we need to save + swal({ + title: 'Success!', + type: 'success', + text: successText, + html: true, + confirmButtonText: 'Save' + }, function(){ + saveSettings(); + }); + }, 'json').fail(function(){ + + var errorText = "There was a problem creating your new domain ID. Do you want to try again or"; + + if (justConnected) { + errorText += " just save your new access token?You can always create a new domain ID later."; + } else { + errorText += " cancel?" } - if (setting.key) { - html += "" + rowIndexOrName + " | " - } - - var isNonDeletableRow = !setting.can_add_new_rows; - - _.each(setting.columns, function(col) { - - var colValue, colName; - if (isArray) { - colValue = rowIsObject ? row[col.name] : row; - colName = keypath + "[" + rowIndexOrName + "]" + (rowIsObject ? "." + col.name : ""); + // we failed to create the new domain ID, show a sweet-alert that lets them try again or cancel + swal({ + title: '', + type: 'error', + text: errorText, + html: true, + confirmButtonText: 'Try again', + showCancelButton: true, + closeOnConfirm: false + }, function(isConfirm){ + if (isConfirm) { + // they want to try creating a domain ID again + showDomainCreationAlert(justConnected); } else { - colValue = row[col.name]; - colName = keypath + "." + rowIndexOrName + "." + col.name; + // they want to cancel + if (justConnected) { + // since they just connected we need to save the access token here + saveSettings(); + } + } + }); + }); + } + + function createDomainSpinner() { + var spinner = ''; + return spinner; + } + + function createDomainLoadingError(message) { + var errorEl = $(""); + errorEl.append(message + " "); + + var retryLink = $("Please click here to try again."); + retryLink.click(function(ev) { + ev.preventDefault(); + reloadDomainInfo(); + }); + errorEl.append(retryLink); + + return errorEl; + } + + function showOrHideLabel() { + var type = getCurrentDomainIDType(); + var shouldShow = accessTokenIsSet() && (type === DOMAIN_ID_TYPE_FULL || type === DOMAIN_ID_TYPE_UNKNOWN); + $(".panel#label").toggle(shouldShow); + $("li a[href='#label']").parent().toggle(shouldShow); + return shouldShow; + } + + function setupDomainLabelSetting() { + showOrHideLabel(); + + var html = "|||
| "; + } else { + var editLink = " Edit"; + var deleteColumn = " | "; + } + + var row = $(" | |||
| " + name_link + " | " + path + editLink + " | " + deleteColumn + "|||
| " + - "" + - " | "; - } else if (isArray && col.type === "time" && col.editable) { - html += - "" + - "" + - " | "; - } else { - // Use a hidden input so that the values are posted. - html += - "" + - colValue + - "" + - " | "; + // Update label + if (showOrHideLabel()) { + var label = data.domain.label; + label = label === null ? '' : label; + $('#network-label').val(label); } + // Update automatic networking + if (showOrHideAutomaticNetworking()) { + var autoNetworkingSetting = Settings.data.values.metaverse.automatic_networking; + var address = data.domain.network_address === null ? "" : data.domain.network_address; + var port = data.domain.network_port === null ? "" : data.domain.network_port; + if (autoNetworkingSetting === 'disabled') { + $('#network-address-port input').val(address + ":" + port); + } else if (autoNetworkingSetting === 'ip') { + $('#network-address-port input').val(port); + } + } + + if (accessTokenIsSet()) { + appendAddButtonToPlacesTable(); + } + + } else { + $('.domain-loading-error').show(); + } + }) + } + + function appendDomainIDButtons() { + var domainIDInput = $(Settings.DOMAIN_ID_SELECTOR); + + var createButton = dynamicButton(Settings.CREATE_DOMAIN_ID_BTN_ID, Strings.CREATE_DOMAIN_BUTTON); + createButton.css('margin-top', '10px'); + var chooseButton = dynamicButton(Settings.CHOOSE_DOMAIN_ID_BTN_ID, Strings.CHOOSE_DOMAIN_BUTTON); + chooseButton.css('margin', '10px 0px 0px 10px'); + + domainIDInput.after(chooseButton); + domainIDInput.after(createButton); + } + + function editHighFidelityPlace(placeID, name, path) { + var dialog; + + var modal_body = "||
| " - + " | " - } - if (isNonDeletableRow) { - html += ""; - } else { - html += " | "; - } - } - - html += "" - - if (isCategorized && setting.can_add_new_rows && _.findLastIndex(setting_value, categoryPair) === rowIndexOrName) { - html += makeTableInputs(setting, categoryPair, categoryValue); - } - - row_num++ - }); - } - - // populate inputs in the table for new values - if (!setting.read_only) { - if (setting.can_add_new_categories) { - html += makeTableCategoryInput(setting, numVisibleColumns); - } - - if (setting.can_add_new_rows || setting.can_add_new_categories) { - html += makeTableHiddenInputs(setting, {}, ""); - } - } - html += " | ||
" + + "Please follow the instructions on the settings page to add an access token.", + title: "Access token required" + }) } - } else if ($(element).hasClass(Settings.REORDER_BUTTONS_CLASS)) { - $(element).html("