-
-
+
@@ -50,7 +67,7 @@
- Nodes -
-
- Assignments
-
-
-
- New Assignment -
- Assignment + +
-
+ Content
+ Content
+
-
+
+
+ -
+ Settings
+ Settings
+
-
+
- - Content -
- Settings
-
-
- Visit domain in VR -
- Restart + +
+ Visit in VR
+
+
+ Restart
-
domain-server is restarting
+Domain Server is restarting
This page will automatically refresh in 3 seconds.
diff --git a/domain-server/resources/web/images/hmd-w-eyes.svg b/domain-server/resources/web/images/hmd-w-eyes.svg new file mode 100644 index 0000000000..0e9081c10c --- /dev/null +++ b/domain-server/resources/web/images/hmd-w-eyes.svg @@ -0,0 +1,13 @@ + + + diff --git a/domain-server/resources/web/js/base-settings.js b/domain-server/resources/web/js/base-settings.js new file mode 100644 index 0000000000..17f06f3ad1 --- /dev/null +++ b/domain-server/resources/web/js/base-settings.js @@ -0,0 +1,1152 @@ +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
+ }
+}
+
+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 reloadSettings(callback) {
+ $.getJSON(Settings.endpoint, function(data){
+ _.extend(data, viewHelpers);
+
+ for (var spliceIndex in Settings.extraGroups) {
+ data.descriptions.splice(spliceIndex, 0, Settings.extraGroups[spliceIndex]);
+ }
+
+ $('#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-text").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(){
+
+ $(document).on('click', '.save-button', function(e){
+ saveSettings();
+ e.preventDefault();
+ });
+
+ $.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(e){
+ // 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: '
',
+ 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)
+ }
+ }
+}
+
+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" - }) + "-1": { + html_id: 'settings_backup', + label: 'Settings Backup' } } -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); - + Settings.afterReloadActions = function() { // append the domain selection modal appendDomainIDButtons(); @@ -1267,9 +37,11 @@ function reloadSettings(callback) { setupPlacesTable(); setupDomainNetworkingSettings(); - setupDomainLabelSetting(); + // setupDomainLabelSetting(); - if (Settings.data.values.metaverse.id.length > 0) { + setupSettingsBackup(); + + if (domainIDIsSet()) { // now, ask the API for what places, if any, point to this domain reloadDomainInfo(); @@ -1291,117 +63,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 +89,1016 @@ 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);
- QJsonObject responseObject = responseObjectForType(QString::number(type));
+ QJsonObject responseObject = settingsResponseObjectForType(QString::number(type));
auto json = QJsonDocument(responseObject).toJson();
auto packetList = NLPacketList::create(PacketType::DomainSettings, QByteArray(), true, true);
@@ -314,14 +407,14 @@ void DomainServerSettingsManager::setupConfigMap(const QStringList& argumentList
QVariant* avatarMinScale = _configMap.valueForKeyPath(AVATAR_MIN_SCALE_KEYPATH);
if (avatarMinScale) {
- float scale = avatarMinScale->toFloat();
- _configMap.valueForKeyPath(AVATAR_MIN_HEIGHT_KEYPATH, scale * DEFAULT_AVATAR_HEIGHT);
+ auto newMinScaleVariant = _configMap.valueForKeyPath(AVATAR_MIN_HEIGHT_KEYPATH, true);
+ *newMinScaleVariant = avatarMinScale->toFloat() * DEFAULT_AVATAR_HEIGHT;
}
QVariant* avatarMaxScale = _configMap.valueForKeyPath(AVATAR_MAX_SCALE_KEYPATH);
if (avatarMaxScale) {
- float scale = avatarMaxScale->toFloat();
- _configMap.valueForKeyPath(AVATAR_MAX_HEIGHT_KEYPATH, scale * DEFAULT_AVATAR_HEIGHT);
+ auto newMaxScaleVariant = _configMap.valueForKeyPath(AVATAR_MAX_HEIGHT_KEYPATH, true);
+ *newMaxScaleVariant = avatarMaxScale->toFloat() * DEFAULT_AVATAR_HEIGHT;
}
}
@@ -986,48 +1079,246 @@ 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) {
+ static const QString SETTINGS_RESTORE_PATH = "/settings/restore";
- // we recurse one level deep below each group for the appropriate setting
- bool restartRequired = recurseJSONObjectAndOverwriteSettings(postedObject);
+ 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();
- // store whatever the current _settingsMap is to file
- persistToFile();
+ SettingsType endpointType = url.path() == SETTINGS_PATH_JSON ? DomainSettings : ContentSettings;
- // return success to the caller
- QString jsonSuccess = "{\"status\": \"success\"}";
- connection->respond(HTTPConnection::StatusCode200, jsonSuccess.toUtf8(), "application/json");
+ // we recurse one level deep below each group for the appropriate setting
+ bool restartRequired = recurseJSONObjectAndOverwriteSettings(postedObject, endpointType);
- // 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();
+ // store whatever the current _settingsMap is to file
+ persistToFile();
+
+ // 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 (url.path() == SETTINGS_RESTORE_PATH) {
+ // this is an JSON settings file restore, ask the HTTPConnection to parse the data
+ QList formData = connection->parseFormData();
+
+ bool wasRestoreSuccessful = false;
+
+ if (formData.size() > 0 && formData[0].second.size() > 0) {
+ // take the posted file and convert it to a QJsonObject
+ auto postedDocument = QJsonDocument::fromJson(formData[0].second);
+ if (postedDocument.isObject()) {
+ wasRestoreSuccessful = restoreSettingsFromObject(postedDocument.object(), DomainSettings);
+ }
+ }
+
+ if (wasRestoreSuccessful) {
+ // respond with a 200 for success
+ 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
+ const int DOMAIN_SERVER_RESTART_TIMER_MSECS = 1000;
+ QTimer::singleShot(DOMAIN_SERVER_RESTART_TIMER_MSECS, qApp, SLOT(restart()));
+ } else {
+ // respond with a 400 for failure
+ connection->respond(HTTPConnection::StatusCode400);
+ }
+
+ return true;
}
+ } else if (connection->requestOperation() == QNetworkAccessManager::GetOperation) {
+ static const QString SETTINGS_MENU_GROUPS_PATH = "/settings-menu-groups.json";
+ static const QString SETTINGS_BACKUP_PATH = "/settings/backup.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
+ // and exclude default values
+ rootObject[SETTINGS_RESPONSE_VALUE_KEY] = settingsResponseObjectForType("", true,
+ forDomainSettings, forContentSettings,
+ true);
+
+ 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;
+ } else if (url.path() == SETTINGS_BACKUP_PATH) {
+ // grab the settings backup as an authenticated user
+ // for the domain settings type only, excluding hidden and default values
+ auto currentDomainSettingsJSON = settingsResponseObjectForType("", true, true, false, false, true);
+
+ // setup headers that tell the client to download the file wth a special name
+ Headers downloadHeaders;
+ downloadHeaders.insert("Content-Transfer-Encoding", "binary");
+
+ // create a timestamped filename for the backup
+ const QString DATETIME_FORMAT { "yyyy-MM-dd_HH-mm-ss" };
+ auto backupFilename = "domain-settings_" + QDateTime::currentDateTime().toString(DATETIME_FORMAT) + ".json";
+
+ downloadHeaders.insert("Content-Disposition",
+ QString("attachment; filename=\"%1\"").arg(backupFilename).toLocal8Bit());
+
+ connection->respond(HTTPConnection::StatusCode200, QJsonDocument(currentDomainSettingsJSON).toJson(),
+ "application/force-download", downloadHeaders);
+ }
}
return false;
}
-QJsonObject DomainServerSettingsManager::responseObjectForType(const QString& typeValue, bool isAuthenticated) {
+bool DomainServerSettingsManager::restoreSettingsFromObject(QJsonObject settingsToRestore, SettingsType settingsType) {
+ QJsonArray& filteredDescriptionArray = settingsType == DomainSettings
+ ? _domainSettingsDescription : _contentSettingsDescription;
+
+ // grab a copy of the current config before restore, so that we can back out if something bad happens during
+ QVariantMap preRestoreConfig = _configMap.getConfig();
+
+ bool shouldCancelRestore = false;
+
+ // enumerate through the settings in the description
+ // if we have one in the restore then use it, otherwise clear it from current settings
+ foreach(const QJsonValue& descriptionGroupValue, filteredDescriptionArray) {
+ QJsonObject descriptionGroupObject = descriptionGroupValue.toObject();
+ QString groupKey = descriptionGroupObject[DESCRIPTION_NAME_KEY].toString();
+ QJsonArray descriptionGroupSettings = descriptionGroupObject[DESCRIPTION_SETTINGS_KEY].toArray();
+
+ // grab the matching group from the restore so we can look at its settings
+ QJsonObject restoreGroup;
+ QVariantMap* configGroupMap = nullptr;
+
+ if (groupKey.isEmpty()) {
+ // this is for a setting at the root, use the full object as our restore group
+ restoreGroup = settingsToRestore;
+
+ // the variant map for this "group" is just the config map since there's no group
+ configGroupMap = &_configMap.getConfig();
+ } else {
+ if (settingsToRestore.contains(groupKey)) {
+ restoreGroup = settingsToRestore[groupKey].toObject();
+ }
+
+ // grab the variant for the group
+ auto groupMapVariant = _configMap.valueForKeyPath(groupKey);
+
+ // if it existed, double check that it is a map - any other value is unexpected and should cancel a restore
+ if (groupMapVariant) {
+ if (groupMapVariant->canConvert()) {
+ configGroupMap = static_cast(groupMapVariant->data());
+ } else {
+ shouldCancelRestore = true;
+ break;
+ }
+ }
+ }
+
+ foreach(const QJsonValue& descriptionSettingValue, descriptionGroupSettings) {
+
+ QJsonObject descriptionSettingObject = descriptionSettingValue.toObject();
+
+ // we'll override this setting with the default or what is in the restore as long as
+ // it isn't specifically excluded from backups
+ bool isBackedUpSetting = !descriptionSettingObject.contains(DESCRIPTION_BACKUP_FLAG_KEY)
+ || descriptionSettingObject[DESCRIPTION_BACKUP_FLAG_KEY].toBool();
+
+ if (isBackedUpSetting) {
+ QString settingName = descriptionSettingObject[DESCRIPTION_NAME_KEY].toString();
+
+ // check if we have a matching setting for this in the restore
+ QJsonValue restoreValue;
+ if (restoreGroup.contains(settingName)) {
+ restoreValue = restoreGroup[settingName];
+ }
+
+ // we should create the value for this key path in our current config map
+ // if we had value in the restore file
+ bool shouldCreateIfMissing = !restoreValue.isNull();
+
+ // get a QVariant pointer to this setting in our config map
+ QString fullSettingKey = !groupKey.isEmpty()
+ ? groupKey + "." + settingName : settingName;
+
+ QVariant* variantValue = _configMap.valueForKeyPath(fullSettingKey, shouldCreateIfMissing);
+
+ if (restoreValue.isNull()) {
+ if (variantValue && !variantValue->isNull() && configGroupMap) {
+ // we didn't have a value to restore, but there might be a value in the config map
+ // so we need to remove the value in the config map which will set it back to the default
+ qDebug() << "Removing" << fullSettingKey << "from settings since it is not in the restored JSON";
+ configGroupMap->remove(settingName);
+ }
+ } else {
+ // we have a value to restore, use update setting to set it
+
+ // we might need to re-grab config group map in case it didn't exist when we looked for it before
+ // but was created by the call to valueForKeyPath before
+ if (!configGroupMap) {
+ auto groupMapVariant = _configMap.valueForKeyPath(groupKey);
+ if (groupMapVariant && groupMapVariant->canConvert()) {
+ configGroupMap = static_cast(groupMapVariant->data());
+ } else {
+ shouldCancelRestore = true;
+ break;
+ }
+ }
+
+ qDebug() << "Updating setting" << fullSettingKey << "from restored JSON";
+
+ updateSetting(settingName, restoreValue, *configGroupMap, descriptionSettingObject);
+ }
+ }
+ }
+
+ if (shouldCancelRestore) {
+ break;
+ }
+ }
+
+ if (shouldCancelRestore) {
+ // if we cancelled the restore, go back to our state before and return false
+ qDebug() << "Restore cancelled, settings have not been changed";
+ _configMap.getConfig() = preRestoreConfig;
+ return false;
+ } else {
+ // restore completed, persist the new settings
+ qDebug() << "Restore completed, persisting restored settings to file";
+ persistToFile();
+ return true;
+ }
+}
+
+QJsonObject DomainServerSettingsManager::settingsResponseObjectForType(const QString& typeValue, bool isAuthenticated,
+ bool includeDomainSettings,
+ bool includeContentSettings,
+ bool includeDefaults, bool isForBackup) {
QJsonObject responseObject;
if (!typeValue.isEmpty() || isAuthenticated) {
@@ -1036,8 +1327,16 @@ QJsonObject DomainServerSettingsManager::responseObjectForType(const QString& ty
const QString AFFECTED_TYPES_JSON_KEY = "assignment-types";
- // enumerate the groups in the description object to find which settings to pass
- foreach(const QJsonValue& groupValue, _descriptionArray) {
+ // only enumerate the requested settings type (domain setting or content setting)
+ QJsonArray& filteredDescriptionArray = _descriptionArray;
+ if (includeDomainSettings && !includeContentSettings) {
+ filteredDescriptionArray = _domainSettingsDescription;
+ } else if (includeContentSettings && !includeDomainSettings) {
+ filteredDescriptionArray = _contentSettingsDescription;
+ }
+
+ // enumerate the groups in the potentially filtered object to find which settings to pass
+ foreach(const QJsonValue& groupValue, filteredDescriptionArray) {
QJsonObject groupObject = groupValue.toObject();
QString groupKey = groupObject[DESCRIPTION_NAME_KEY].toString();
QJsonArray groupSettingsArray = groupObject[DESCRIPTION_SETTINGS_KEY].toArray();
@@ -1045,11 +1344,17 @@ 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();
- if (!settingObject[VALUE_HIDDEN_FLAG_KEY].toBool()) {
+ // consider this setting as long as it isn't hidden
+ // and either this isn't for a backup or it's a value included in backups
+ bool includedInBackups = !settingObject.contains(DESCRIPTION_BACKUP_FLAG_KEY)
+ || settingObject[DESCRIPTION_BACKUP_FLAG_KEY].toBool();
+
+ if (!settingObject[VALUE_HIDDEN_FLAG_KEY].toBool() && (!isForBackup || includedInBackups)) {
QJsonArray affectedTypesArray = settingObject[AFFECTED_TYPES_JSON_KEY].toArray();
if (affectedTypesArray.isEmpty()) {
affectedTypesArray = groupObject[AFFECTED_TYPES_JSON_KEY].toArray();
@@ -1057,8 +1362,6 @@ QJsonObject DomainServerSettingsManager::responseObjectForType(const QString& ty
if (affectedTypesArray.contains(queryType) ||
(queryType.isNull() && isAuthenticated)) {
- // this is a setting we should include in the responseObject
-
QString settingName = settingObject[DESCRIPTION_NAME_KEY].toString();
// we need to check if the settings map has a value for this setting
@@ -1074,28 +1377,31 @@ QJsonObject DomainServerSettingsManager::responseObjectForType(const QString& ty
variantValue = _configMap.value(settingName);
}
- QJsonValue result;
+ // final check for inclusion
+ // either we include default values or we don't but this isn't a default value
+ if (includeDefaults || !variantValue.isNull()) {
+ QJsonValue result;
- if (variantValue.isNull()) {
- // no value for this setting, pass the default
- if (settingObject.contains(SETTING_DEFAULT_KEY)) {
- result = settingObject[SETTING_DEFAULT_KEY];
+ if (variantValue.isNull()) {
+ // no value for this setting, pass the default
+ if (settingObject.contains(SETTING_DEFAULT_KEY)) {
+ result = settingObject[SETTING_DEFAULT_KEY];
+ } else {
+ // users are allowed not to provide a default for string values
+ // if so we set to the empty string
+ result = QString("");
+ }
} else {
- // users are allowed not to provide a default for string values
- // if so we set to the empty string
- result = QString("");
+ result = QJsonValue::fromVariant(variantValue);
}
- } else {
- result = QJsonValue::fromVariant(variantValue);
- }
-
- if (!groupKey.isEmpty()) {
- // this belongs in the group object
- groupResponseObject[settingName] = result;
- } else {
- // this is a value that should be at the root
- responseObject[settingName] = result;
+ if (!groupKey.isEmpty()) {
+ // this belongs in the group object
+ groupResponseObject[settingName] = result;
+ } else {
+ // this is a value that should be at the root
+ responseObject[settingName] = result;
+ }
}
}
}
@@ -1108,7 +1414,6 @@ QJsonObject DomainServerSettingsManager::responseObjectForType(const QString& ty
}
}
-
return responseObject;
}
@@ -1140,6 +1445,8 @@ void DomainServerSettingsManager::updateSetting(const QString& key, const QJsonV
settingMap[key] = sanitizedValue;
}
}
+ } else if (newValue.isDouble()) {
+ settingMap[key] = newValue.toDouble();
} else if (newValue.isBool()) {
settingMap[key] = newValue.toBool();
} else if (newValue.isObject()) {
@@ -1212,7 +1519,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 +1530,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 +1546,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();
@@ -1257,7 +1567,9 @@ bool DomainServerSettingsManager::recurseJSONObjectAndOverwriteSettings(const QJ
foreach(const QJsonValue& groupValue, _descriptionArray) {
// find groups with root values (they don't have a group name)
QJsonObject groupObject = groupValue.toObject();
+
if (!groupObject.contains(DESCRIPTION_NAME_KEY)) {
+
// this is a group with root values - check if our setting is in here
matchingDescriptionObject = settingDescriptionFromGroup(groupObject, rootKey);
@@ -1269,6 +1581,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 +1599,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..9b2427b344 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,11 @@ private slots:
private:
QStringList _argumentList;
- QJsonObject responseObjectForType(const QString& typeValue, bool isAuthenticated = false);
- bool recurseJSONObjectAndOverwriteSettings(const QJsonObject& postedObject);
+ QJsonArray filteredDescriptionArray(bool isContentSettings);
+ QJsonObject settingsResponseObjectForType(const QString& typeValue, bool isAuthenticated = false,
+ bool includeDomainSettings = true, bool includeContentSettings = true,
+ bool includeDefaults = true, bool isForBackup = false);
+ bool recurseJSONObjectAndOverwriteSettings(const QJsonObject& postedObject, SettingsType settingsType);
void updateSetting(const QString& key, const QJsonValue& newValue, QVariantMap& settingMap,
const QJsonObject& settingDescription);
@@ -132,8 +141,17 @@ private:
void sortPermissions();
void persistToFile();
+ void splitSettingsDescription();
+
+ bool restoreSettingsFromObject(QJsonObject settingsToRestore, SettingsType settingsType);
+
double _descriptionVersion;
+
QJsonArray _descriptionArray;
+ QJsonArray _domainSettingsDescription;
+ QJsonArray _contentSettingsDescription;
+ QJsonObject _settingsMenuGroups;
+
HifiConfigVariantMap _configMap;
friend class DomainServer;
diff --git a/interface/resources/controllers/keyboardMouse.json b/interface/resources/controllers/keyboardMouse.json
index 54d2467f78..b3f16a115e 100644
--- a/interface/resources/controllers/keyboardMouse.json
+++ b/interface/resources/controllers/keyboardMouse.json
@@ -88,8 +88,8 @@
]
},
- { "from": "Keyboard.W", "to": "Actions.LONGITUDINAL_FORWARD" },
- { "from": "Keyboard.S", "to": "Actions.LONGITUDINAL_BACKWARD" },
+ { "from": "Keyboard.W", "when": "!Keyboard.Control", "to": "Actions.LONGITUDINAL_FORWARD" },
+ { "from": "Keyboard.S", "when": "!Keyboard.Control", "to": "Actions.LONGITUDINAL_BACKWARD" },
{ "from": "Keyboard.C", "to": "Actions.VERTICAL_DOWN" },
{ "from": "Keyboard.E", "to": "Actions.VERTICAL_UP" },
{ "from": "Keyboard.Left", "when": "Keyboard.RightMouseButton", "to": "Actions.LATERAL_LEFT" },
diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml
index 02971cc984..bb54ba9e57 100644
--- a/interface/resources/qml/hifi/Pal.qml
+++ b/interface/resources/qml/hifi/Pal.qml
@@ -48,7 +48,7 @@ Rectangle {
// The letterbox used for popup messages
LetterboxMessage {
id: letterboxMessage;
- z: 999; // Force the popup on top of everything else
+ z: 998; // Force the popup on top of everything else
}
Connections {
target: GlobalServices
@@ -60,7 +60,7 @@ Rectangle {
// The ComboDialog used for setting availability
ComboDialog {
id: comboDialog;
- z: 999; // Force the ComboDialog on top of everything else
+ z: 998; // Force the ComboDialog on top of everything else
dialogWidth: parent.width - 50;
dialogHeight: parent.height - 100;
}
@@ -1013,7 +1013,7 @@ Rectangle {
}
MouseArea {
anchors.fill: parent;
- enabled: myData.userName !== "Unknown user";
+ enabled: myData.userName !== "Unknown user" && !userInfoViewer.visible;
hoverEnabled: true;
onClicked: {
popupComboDialog("Set your availability:",
@@ -1044,6 +1044,7 @@ Rectangle {
HifiControls.TabletWebView {
id: userInfoViewer;
+ z: 999;
anchors {
top: parent.top;
bottom: parent.bottom;
diff --git a/interface/resources/qml/js/Utils.jsc b/interface/resources/qml/js/Utils.jsc
deleted file mode 100644
index 8da68e4e19..0000000000
Binary files a/interface/resources/qml/js/Utils.jsc and /dev/null differ
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 15ae1584f6..c25aaeeecd 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -1111,7 +1111,7 @@ void MyAvatar::setEnableDebugDrawIKChains(bool isEnabled) {
}
void MyAvatar::setEnableMeshVisible(bool isEnabled) {
- _skeletonModel->setVisibleInScene(isEnabled, qApp->getMain3DScene(), render::ItemKey::TAG_BITS_NONE);
+ _skeletonModel->setVisibleInScene(isEnabled, qApp->getMain3DScene(), render::ItemKey::TAG_BITS_NONE, true);
}
void MyAvatar::setEnableInverseKinematics(bool isEnabled) {
@@ -1463,7 +1463,7 @@ void MyAvatar::setSkeletonModelURL(const QUrl& skeletonModelURL) {
_skeletonModelChangeCount++;
int skeletonModelChangeCount = _skeletonModelChangeCount;
Avatar::setSkeletonModelURL(skeletonModelURL);
- _skeletonModel->setVisibleInScene(true, qApp->getMain3DScene(), render::ItemKey::TAG_BITS_NONE);
+ _skeletonModel->setVisibleInScene(true, qApp->getMain3DScene(), render::ItemKey::TAG_BITS_NONE, true);
_headBoneSet.clear();
_cauterizationNeedsUpdate = true;
@@ -1821,7 +1821,7 @@ void MyAvatar::attach(const QString& modelURL, const QString& jointName,
void MyAvatar::setVisibleInSceneIfReady(Model* model, const render::ScenePointer& scene, bool visible) {
if (model->isActive() && model->isRenderable()) {
- model->setVisibleInScene(visible, scene, render::ItemKey::TAG_BITS_NONE);
+ model->setVisibleInScene(visible, scene, render::ItemKey::TAG_BITS_NONE, true);
}
}
@@ -2015,7 +2015,7 @@ void MyAvatar::preDisplaySide(RenderArgs* renderArgs) {
_attachmentData[i].jointName.compare("HeadTop_End", Qt::CaseInsensitive) == 0 ||
_attachmentData[i].jointName.compare("Face", Qt::CaseInsensitive) == 0) {
_attachmentModels[i]->setVisibleInScene(shouldDrawHead, qApp->getMain3DScene(),
- render::ItemKey::TAG_BITS_NONE);
+ render::ItemKey::TAG_BITS_NONE, true);
}
}
}
diff --git a/interface/src/ui/overlays/Circle3DOverlay.cpp b/interface/src/ui/overlays/Circle3DOverlay.cpp
index 5e38f28a06..33f40f7c63 100644
--- a/interface/src/ui/overlays/Circle3DOverlay.cpp
+++ b/interface/src/ui/overlays/Circle3DOverlay.cpp
@@ -425,10 +425,10 @@ void Circle3DOverlay::setProperties(const QVariantMap& properties) {
* Write-only.
* @property {Color} outerColor - Sets the values of (avatar)->getBounds();
diff --git a/libraries/avatars/src/AvatarHashMap.cpp b/libraries/avatars/src/AvatarHashMap.cpp
index 61b13d7749..b564ad6a3b 100644
--- a/libraries/avatars/src/AvatarHashMap.cpp
+++ b/libraries/avatars/src/AvatarHashMap.cpp
@@ -30,6 +30,20 @@ QVector AvatarHashMap::getAvatarIdentifiers() {
return _avatarHash.keys().toVector();
}
+QVector AvatarHashMap::getAvatarsInRange(const glm::vec3& position, float rangeMeters) const {
+ auto hashCopy = getHashCopy();
+ QVector avatarsInRange;
+ auto rangeMetersSquared = rangeMeters * rangeMeters;
+ for (const AvatarSharedPointer& sharedAvatar : hashCopy) {
+ glm::vec3 avatarPosition = sharedAvatar->getWorldPosition();
+ auto distanceSquared = glm::distance2(avatarPosition, position);
+ if (distanceSquared < rangeMetersSquared) {
+ avatarsInRange.push_back(sharedAvatar->getSessionUUID());
+ }
+ }
+ return avatarsInRange;
+}
+
bool AvatarHashMap::isAvatarInRange(const glm::vec3& position, const float range) {
auto hashCopy = getHashCopy();
foreach(const AvatarSharedPointer& sharedAvatar, hashCopy) {
diff --git a/libraries/avatars/src/AvatarHashMap.h b/libraries/avatars/src/AvatarHashMap.h
index 68fc232685..e4a485028f 100644
--- a/libraries/avatars/src/AvatarHashMap.h
+++ b/libraries/avatars/src/AvatarHashMap.h
@@ -35,10 +35,12 @@ class AvatarHashMap : public QObject, public Dependency {
public:
AvatarHash getHashCopy() { QReadLocker lock(&_hashLock); return _avatarHash; }
+ const AvatarHash getHashCopy() const { QReadLocker lock(&_hashLock); return _avatarHash; }
int size() { return _avatarHash.size(); }
// Currently, your own avatar will be included as the null avatar id.
Q_INVOKABLE QVector getAvatarIdentifiers();
+ Q_INVOKABLE QVector getAvatarsInRange(const glm::vec3& position, float rangeMeters) const;
// Null/Default-constructed QUuids will return MyAvatar
Q_INVOKABLE virtual ScriptAvatarData* getAvatar(QUuid avatarID) { return new ScriptAvatarData(getAvatarBySessionID(avatarID)); }
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/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index ca15382c71..56e3f96014 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -1352,7 +1352,7 @@ void ModelEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& sce
// FIXME: this seems like it could be optimized if we tracked our last known visible state in
// the renderable item. As it stands now the model checks it's visible/invisible state
// so most of the time we don't do anything in this function.
- model->setVisibleInScene(_visible, scene, viewTaskBits);
+ model->setVisibleInScene(_visible, scene, viewTaskBits, false);
}
// TODO? early exit here when not visible?
diff --git a/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp b/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp
index e9ec6d8910..ef7f482e44 100755
--- a/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp
+++ b/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp
@@ -54,11 +54,9 @@ void KeyboardMouseDevice::InputDevice::focusOutEvent() {
void KeyboardMouseDevice::keyPressEvent(QKeyEvent* event) {
auto input = _inputDevice->makeInput((Qt::Key) event->key());
- if (!(event->modifiers() & Qt::KeyboardModifier::ControlModifier)) {
- auto result = _inputDevice->_buttonPressedMap.insert(input.getChannel());
- if (result.second) {
- // key pressed again ? without catching the release event ?
- }
+ auto result = _inputDevice->_buttonPressedMap.insert(input.getChannel());
+ if (result.second) {
+ // key pressed again ? without catching the release event ?
}
}
@@ -237,6 +235,7 @@ controller::Input::NamedVector KeyboardMouseDevice::InputDevice::getAvailableInp
availableInputs.append(Input::NamedPair(makeInput(Qt::Key_PageUp), QKeySequence(Qt::Key_PageUp).toString()));
availableInputs.append(Input::NamedPair(makeInput(Qt::Key_PageDown), QKeySequence(Qt::Key_PageDown).toString()));
availableInputs.append(Input::NamedPair(makeInput(Qt::Key_Tab), QKeySequence(Qt::Key_Tab).toString()));
+ availableInputs.append(Input::NamedPair(makeInput(Qt::Key_Control), "Control"));
availableInputs.append(Input::NamedPair(makeInput(Qt::LeftButton), "LeftMouseButton"));
availableInputs.append(Input::NamedPair(makeInput(Qt::MiddleButton), "MiddleMouseButton"));
diff --git a/libraries/render-utils/src/MeshPartPayload.cpp b/libraries/render-utils/src/MeshPartPayload.cpp
index 9655b60a78..da11535396 100644
--- a/libraries/render-utils/src/MeshPartPayload.cpp
+++ b/libraries/render-utils/src/MeshPartPayload.cpp
@@ -71,7 +71,7 @@ void MeshPartPayload::updateMaterial(graphics::MaterialPointer drawMaterial) {
_drawMaterial = drawMaterial;
}
-void MeshPartPayload::updateKey(bool isVisible, bool isLayered, uint8_t tagBits) {
+void MeshPartPayload::updateKey(bool isVisible, bool isLayered, uint8_t tagBits, bool isGroupCulled) {
ItemKey::Builder builder;
builder.withTypeShape();
@@ -85,6 +85,10 @@ void MeshPartPayload::updateKey(bool isVisible, bool isLayered, uint8_t tagBits)
builder.withLayered();
}
+ if (isGroupCulled) {
+ builder.withSubMetaCulled();
+ }
+
if (_drawMaterial) {
auto matKey = _drawMaterial->getKey();
if (matKey.isTranslucent()) {
@@ -403,7 +407,7 @@ void ModelMeshPartPayload::updateTransformForSkinnedMesh(const Transform& render
_worldBound.transform(boundTransform);
}
-void ModelMeshPartPayload::updateKey(bool isVisible, bool isLayered, uint8_t tagBits) {
+void ModelMeshPartPayload::updateKey(bool isVisible, bool isLayered, uint8_t tagBits, bool isGroupCulled) {
ItemKey::Builder builder;
builder.withTypeShape();
@@ -417,6 +421,10 @@ void ModelMeshPartPayload::updateKey(bool isVisible, bool isLayered, uint8_t tag
builder.withLayered();
}
+ if (isGroupCulled) {
+ builder.withSubMetaCulled();
+ }
+
if (_isBlendShaped || _isSkinned) {
builder.withDeformed();
}
diff --git a/libraries/render-utils/src/MeshPartPayload.h b/libraries/render-utils/src/MeshPartPayload.h
index 21f9dc2e68..40efc67572 100644
--- a/libraries/render-utils/src/MeshPartPayload.h
+++ b/libraries/render-utils/src/MeshPartPayload.h
@@ -33,7 +33,7 @@ public:
typedef render::Payload Payload;
typedef Payload::DataPointer Pointer;
- virtual void updateKey(bool isVisible, bool isLayered, uint8_t tagBits);
+ virtual void updateKey(bool isVisible, bool isLayered, uint8_t tagBits, bool isGroupCulled = false);
virtual void updateMeshPart(const std::shared_ptr& drawMesh, int partIndex);
@@ -99,7 +99,7 @@ public:
using TransformType = glm::mat4;
#endif
- void updateKey(bool isVisible, bool isLayered, uint8_t tagBits) override;
+ void updateKey(bool isVisible, bool isLayered, uint8_t tagBits, bool isGroupCulled = false) override;
void updateClusterBuffer(const std::vector& clusterTransforms);
void updateTransformForSkinnedMesh(const Transform& renderTransform, const Transform& boundTransform);
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index b9ccc28c01..bb8353c746 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -271,6 +271,7 @@ void Model::updateRenderItems() {
uint8_t viewTagBits = self->getViewTagBits();
bool isLayeredInFront = self->isLayeredInFront();
bool isLayeredInHUD = self->isLayeredInHUD();
+ bool isGroupCulled = self->isGroupCulled();
render::Transaction transaction;
for (int i = 0; i < (int) self->_modelMeshRenderItemIDs.size(); i++) {
@@ -284,7 +285,7 @@ void Model::updateRenderItems() {
transaction.updateItem(itemID, [modelTransform, clusterTransforms,
invalidatePayloadShapeKey, isWireframe, isVisible,
viewTagBits, isLayeredInFront,
- isLayeredInHUD](ModelMeshPartPayload& data) {
+ isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) {
data.updateClusterBuffer(clusterTransforms);
Transform renderTransform = modelTransform;
@@ -300,7 +301,7 @@ void Model::updateRenderItems() {
}
data.updateTransformForSkinnedMesh(renderTransform, modelTransform);
- data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits);
+ data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled);
data.setLayer(isLayeredInFront, isLayeredInHUD);
data.setShapeKey(invalidatePayloadShapeKey, isWireframe);
});
@@ -684,10 +685,11 @@ void Model::calculateTriangleSets() {
}
}
-void Model::setVisibleInScene(bool isVisible, const render::ScenePointer& scene, uint8_t viewTagBits) {
- if (_isVisible != isVisible || _viewTagBits != viewTagBits) {
+void Model::setVisibleInScene(bool isVisible, const render::ScenePointer& scene, uint8_t viewTagBits, bool isGroupCulled) {
+ if (_isVisible != isVisible || _viewTagBits != viewTagBits || _isGroupCulled != isGroupCulled) {
_isVisible = isVisible;
_viewTagBits = viewTagBits;
+ _isGroupCulled = isGroupCulled;
bool isLayeredInFront = _isLayeredInFront;
bool isLayeredInHUD = _isLayeredInHUD;
@@ -695,14 +697,14 @@ void Model::setVisibleInScene(bool isVisible, const render::ScenePointer& scene,
render::Transaction transaction;
foreach (auto item, _modelMeshRenderItemsMap.keys()) {
transaction.updateItem(item, [isVisible, viewTagBits, isLayeredInFront,
- isLayeredInHUD](ModelMeshPartPayload& data) {
- data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits);
+ isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) {
+ data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled);
});
}
foreach(auto item, _collisionRenderItemsMap.keys()) {
transaction.updateItem(item, [isVisible, viewTagBits, isLayeredInFront,
- isLayeredInHUD](ModelMeshPartPayload& data) {
- data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits);
+ isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) {
+ data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled);
});
}
scene->enqueueTransaction(transaction);
@@ -717,19 +719,20 @@ void Model::setLayeredInFront(bool isLayeredInFront, const render::ScenePointer&
bool isVisible = _isVisible;
uint8_t viewTagBits = _viewTagBits;
bool isLayeredInHUD = _isLayeredInHUD;
+ bool isGroupCulled = _isGroupCulled;
render::Transaction transaction;
foreach(auto item, _modelMeshRenderItemsMap.keys()) {
transaction.updateItem(item, [isVisible, viewTagBits, isLayeredInFront,
- isLayeredInHUD](ModelMeshPartPayload& data) {
- data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits);
+ isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) {
+ data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled);
data.setLayer(isLayeredInFront, isLayeredInHUD);
});
}
foreach(auto item, _collisionRenderItemsMap.keys()) {
transaction.updateItem(item, [isVisible, viewTagBits, isLayeredInFront,
- isLayeredInHUD](ModelMeshPartPayload& data) {
- data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits);
+ isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) {
+ data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled);
data.setLayer(isLayeredInFront, isLayeredInHUD);
});
}
@@ -744,19 +747,20 @@ void Model::setLayeredInHUD(bool isLayeredInHUD, const render::ScenePointer& sce
bool isVisible = _isVisible;
uint8_t viewTagBits = _viewTagBits;
bool isLayeredInFront = _isLayeredInFront;
+ bool isGroupCulled = _isGroupCulled;
render::Transaction transaction;
foreach(auto item, _modelMeshRenderItemsMap.keys()) {
transaction.updateItem(item, [isVisible, viewTagBits, isLayeredInFront,
- isLayeredInHUD](ModelMeshPartPayload& data) {
- data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits);
+ isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) {
+ data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled);
data.setLayer(isLayeredInFront, isLayeredInHUD);
});
}
foreach(auto item, _collisionRenderItemsMap.keys()) {
transaction.updateItem(item, [isVisible, viewTagBits, isLayeredInFront,
- isLayeredInHUD](ModelMeshPartPayload& data) {
- data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits);
+ isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) {
+ data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled);
data.setLayer(isLayeredInFront, isLayeredInHUD);
});
}
diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h
index ca0904f334..57d2798a66 100644
--- a/libraries/render-utils/src/Model.h
+++ b/libraries/render-utils/src/Model.h
@@ -86,7 +86,7 @@ public:
const QUrl& getURL() const { return _url; }
// new Scene/Engine rendering support
- void setVisibleInScene(bool isVisible, const render::ScenePointer& scene, uint8_t viewTagBits);
+ void setVisibleInScene(bool isVisible, const render::ScenePointer& scene, uint8_t viewTagBits, bool isGroupCulled);
void setLayeredInFront(bool isLayeredInFront, const render::ScenePointer& scene);
void setLayeredInHUD(bool isLayeredInHUD, const render::ScenePointer& scene);
bool needsFixupInScene() const;
@@ -109,6 +109,8 @@ public:
bool isLayeredInFront() const { return _isLayeredInFront; }
bool isLayeredInHUD() const { return _isLayeredInHUD; }
+ bool isGroupCulled() const { return _isGroupCulled; }
+
virtual void updateRenderItems();
void setRenderItemsNeedUpdate();
bool getRenderItemsNeedUpdate() { return _renderItemsNeedUpdate; }
@@ -462,6 +464,8 @@ protected:
bool _isLayeredInFront { false };
bool _isLayeredInHUD { false };
+ bool _isGroupCulled{ false };
+
bool shouldInvalidatePayloadShapeKey(int meshIndex);
private:
diff --git a/libraries/render/src/render/CullTask.cpp b/libraries/render/src/render/CullTask.cpp
index 4dec3030ef..f04427540a 100644
--- a/libraries/render/src/render/CullTask.cpp
+++ b/libraries/render/src/render/CullTask.cpp
@@ -211,13 +211,14 @@ void CullSpatialSelection::run(const RenderContextPointer& renderContext,
outItems.clear();
outItems.reserve(inSelection.numItems());
- const auto filter = inputs.get1();
- if (!filter.selectsNothing()) {
- // Now get the bound, and
+ const auto srcFilter = inputs.get1();
+ if (!srcFilter.selectsNothing()) {
+ auto filter = render::ItemFilter::Builder(srcFilter).withoutSubMetaCulled().build();
+
+ // Now get the bound, and
// filter individually against the _filter
// visibility cull if partially selected ( octree cell contianing it was partial)
// distance cull if was a subcell item ( octree cell is way bigger than the item bound itself, so now need to test per item)
-
if (_skipCulling) {
// inside & fit items: filter only, culling is disabled
{
@@ -227,6 +228,9 @@ void CullSpatialSelection::run(const RenderContextPointer& renderContext,
if (filter.test(item.getKey())) {
ItemBound itemBound(id, item.getBound());
outItems.emplace_back(itemBound);
+ if (item.getKey().isMetaCullGroup()) {
+ item.fetchMetaSubItemBounds(outItems, (*scene));
+ }
}
}
}
@@ -239,6 +243,9 @@ void CullSpatialSelection::run(const RenderContextPointer& renderContext,
if (filter.test(item.getKey())) {
ItemBound itemBound(id, item.getBound());
outItems.emplace_back(itemBound);
+ if (item.getKey().isMetaCullGroup()) {
+ item.fetchMetaSubItemBounds(outItems, (*scene));
+ }
}
}
}
@@ -251,6 +258,9 @@ void CullSpatialSelection::run(const RenderContextPointer& renderContext,
if (filter.test(item.getKey())) {
ItemBound itemBound(id, item.getBound());
outItems.emplace_back(itemBound);
+ if (item.getKey().isMetaCullGroup()) {
+ item.fetchMetaSubItemBounds(outItems, (*scene));
+ }
}
}
}
@@ -263,6 +273,9 @@ void CullSpatialSelection::run(const RenderContextPointer& renderContext,
if (filter.test(item.getKey())) {
ItemBound itemBound(id, item.getBound());
outItems.emplace_back(itemBound);
+ if (item.getKey().isMetaCullGroup()) {
+ item.fetchMetaSubItemBounds(outItems, (*scene));
+ }
}
}
}
@@ -277,6 +290,9 @@ void CullSpatialSelection::run(const RenderContextPointer& renderContext,
if (filter.test(item.getKey())) {
ItemBound itemBound(id, item.getBound());
outItems.emplace_back(itemBound);
+ if (item.getKey().isMetaCullGroup()) {
+ item.fetchMetaSubItemBounds(outItems, (*scene));
+ }
}
}
}
@@ -290,6 +306,9 @@ void CullSpatialSelection::run(const RenderContextPointer& renderContext,
ItemBound itemBound(id, item.getBound());
if (test.solidAngleTest(itemBound.bound)) {
outItems.emplace_back(itemBound);
+ if (item.getKey().isMetaCullGroup()) {
+ item.fetchMetaSubItemBounds(outItems, (*scene));
+ }
}
}
}
@@ -304,6 +323,9 @@ void CullSpatialSelection::run(const RenderContextPointer& renderContext,
ItemBound itemBound(id, item.getBound());
if (test.frustumTest(itemBound.bound)) {
outItems.emplace_back(itemBound);
+ if (item.getKey().isMetaCullGroup()) {
+ item.fetchMetaSubItemBounds(outItems, (*scene));
+ }
}
}
}
@@ -319,6 +341,9 @@ void CullSpatialSelection::run(const RenderContextPointer& renderContext,
if (test.frustumTest(itemBound.bound)) {
if (test.solidAngleTest(itemBound.bound)) {
outItems.emplace_back(itemBound);
+ if (item.getKey().isMetaCullGroup()) {
+ item.fetchMetaSubItemBounds(outItems, (*scene));
+ }
}
}
}
diff --git a/libraries/render/src/render/Item.cpp b/libraries/render/src/render/Item.cpp
index 612dba076b..ed052adf6e 100644
--- a/libraries/render/src/render/Item.cpp
+++ b/libraries/render/src/render/Item.cpp
@@ -113,6 +113,21 @@ const ShapeKey Item::getShapeKey() const {
return shapeKey;
}
+uint32_t Item::fetchMetaSubItemBounds(ItemBounds& subItemBounds, Scene& scene) const {
+ ItemIDs subItems;
+ auto numSubs = fetchMetaSubItems(subItems);
+
+ for (auto id : subItems) {
+ auto& item = scene.getItem(id);
+ if (item.exist()) {
+ subItemBounds.emplace_back(id, item.getBound());
+ } else {
+ numSubs--;
+ }
+ }
+ return numSubs;
+}
+
namespace render {
template <> const ItemKey payloadGetKey(const PayloadProxyInterface::Pointer& payload) {
if (!payload) {
diff --git a/libraries/render/src/render/Item.h b/libraries/render/src/render/Item.h
index ff4b3a0458..e4dcc7ee03 100644
--- a/libraries/render/src/render/Item.h
+++ b/libraries/render/src/render/Item.h
@@ -78,6 +78,8 @@ public:
INVISIBLE, // Visible or not in the scene?
SHADOW_CASTER, // Item cast shadows
LAYERED, // Item belongs to one of the layers different from the default layer
+ META_CULL_GROUP, // As a meta item, the culling of my sub items is based solely on my bounding box and my visibility in the view
+ SUB_META_CULLED, // As a sub item of a meta render item set as cull group, need to be set to my culling to the meta render it
FIRST_TAG_BIT, // 8 Tags available to organize the items and filter them against
LAST_TAG_BIT = FIRST_TAG_BIT + NUM_TAGS,
@@ -122,6 +124,8 @@ public:
Builder& withInvisible() { _flags.set(INVISIBLE); return (*this); }
Builder& withShadowCaster() { _flags.set(SHADOW_CASTER); return (*this); }
Builder& withLayered() { _flags.set(LAYERED); return (*this); }
+ Builder& withMetaCullGroup() { _flags.set(META_CULL_GROUP); return (*this); }
+ Builder& withSubMetaCulled() { _flags.set(SUB_META_CULLED); return (*this); }
Builder& withTag(Tag tag) { _flags.set(FIRST_TAG_BIT + tag); return (*this); }
// Set ALL the tags in one call using the Tag bits
@@ -159,6 +163,12 @@ public:
bool isLayered() const { return _flags[LAYERED]; }
bool isSpatial() const { return !isLayered(); }
+ bool isMetaCullGroup() const { return _flags[META_CULL_GROUP]; }
+ void setMetaCullGroup(bool cullGroup) { (cullGroup ? _flags.set(META_CULL_GROUP) : _flags.reset(META_CULL_GROUP)); }
+
+ bool isSubMetaCulled() const { return _flags[SUB_META_CULLED]; }
+ void setSubMetaCulled(bool metaCulled) { (metaCulled ? _flags.set(SUB_META_CULLED) : _flags.reset(SUB_META_CULLED)); }
+
bool isTag(Tag tag) const { return _flags[FIRST_TAG_BIT + tag]; }
uint8_t getTagBits() const { return ((_flags.to_ulong() & KEY_TAG_BITS_MASK) >> FIRST_TAG_BIT); }
@@ -193,6 +203,7 @@ public:
ItemKey::Flags _mask{ 0 };
public:
Builder() {}
+ Builder(const ItemFilter& srcFilter) : _value(srcFilter._value), _mask(srcFilter._mask) {}
ItemFilter build() const { return ItemFilter(_value, _mask); }
@@ -221,6 +232,12 @@ public:
Builder& withoutLayered() { _value.reset(ItemKey::LAYERED); _mask.set(ItemKey::LAYERED); return (*this); }
Builder& withLayered() { _value.set(ItemKey::LAYERED); _mask.set(ItemKey::LAYERED); return (*this); }
+ Builder& withoutMetaCullGroup() { _value.reset(ItemKey::META_CULL_GROUP); _mask.set(ItemKey::META_CULL_GROUP); return (*this); }
+ Builder& withMetaCullGroup() { _value.set(ItemKey::META_CULL_GROUP); _mask.set(ItemKey::META_CULL_GROUP); return (*this); }
+
+ Builder& withoutSubMetaCulled() { _value.reset(ItemKey::SUB_META_CULLED); _mask.set(ItemKey::SUB_META_CULLED); return (*this); }
+ Builder& withSubMetaCulled() { _value.set(ItemKey::SUB_META_CULLED); _mask.set(ItemKey::SUB_META_CULLED); return (*this); }
+
Builder& withoutTag(ItemKey::Tag tagIndex) { _value.reset(ItemKey::FIRST_TAG_BIT + tagIndex); _mask.set(ItemKey::FIRST_TAG_BIT + tagIndex); return (*this); }
Builder& withTag(ItemKey::Tag tagIndex) { _value.set(ItemKey::FIRST_TAG_BIT + tagIndex); _mask.set(ItemKey::FIRST_TAG_BIT + tagIndex); return (*this); }
// Set ALL the tags in one call using the Tag bits and the Tag bits touched
@@ -420,6 +437,7 @@ public:
// Meta Type Interface
uint32_t fetchMetaSubItems(ItemIDs& subItems) const { return _payload->fetchMetaSubItems(subItems); }
+ uint32_t fetchMetaSubItemBounds(ItemBounds& subItemBounds, Scene& scene) const;
// Access the status
const StatusPointer& getStatus() const { return _payload->getStatus(); }
diff --git a/libraries/render/src/render/RenderFetchCullSortTask.cpp b/libraries/render/src/render/RenderFetchCullSortTask.cpp
index 6fb9ba88aa..7b9765dca1 100644
--- a/libraries/render/src/render/RenderFetchCullSortTask.cpp
+++ b/libraries/render/src/render/RenderFetchCullSortTask.cpp
@@ -30,7 +30,7 @@ void RenderFetchCullSortTask::build(JobModel& task, const Varying& input, Varyin
const auto culledSpatialSelection = task.addJob("CullSceneSelection", cullInputs, cullFunctor, RenderDetails::ITEM);
// Overlays are not culled
- const ItemFilter overlayfilter = ItemFilter::Builder().withVisible().withTagBits(tagBits, tagMask);
+ const ItemFilter overlayfilter = ItemFilter::Builder().withVisible().withoutSubMetaCulled().withTagBits(tagBits, tagMask);
const auto nonspatialFilter = render::Varying(overlayfilter);
const auto nonspatialSelection = task.addJob("FetchOverlaySelection", nonspatialFilter);
diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index 35235634e9..b27c852974 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -798,10 +798,13 @@ function loaded() {
// HTML workaround since image is not yet a separate entity type
var IMAGE_MODEL_NAME = 'default-image-model.fbx';
- var urlParts = properties.modelURL.split('/')
- var propsFilename = urlParts[urlParts.length - 1];
- if (properties.type === "Model" && propsFilename === IMAGE_MODEL_NAME) {
- properties.type = "Image";
+ if (properties.type === "Model") {
+ var urlParts = properties.modelURL.split('/');
+ var propsFilename = urlParts[urlParts.length - 1];
+
+ if (propsFilename === IMAGE_MODEL_NAME) {
+ properties.type = "Image";
+ }
}
// Create class name for css ruleset filtering
diff --git a/scripts/system/libraries/WebTablet.js b/scripts/system/libraries/WebTablet.js
index 05b4963280..a28de5abc2 100644
--- a/scripts/system/libraries/WebTablet.js
+++ b/scripts/system/libraries/WebTablet.js
@@ -47,7 +47,7 @@ function calcSpawnInfo(hand, landscape) {
var headPos = (HMD.active && Camera.mode === "first person") ? HMD.position : Camera.position;
var headRot = (HMD.active && Camera.mode === "first person") ? HMD.orientation : Camera.orientation;
- var forward = Quat.getForward(headRot);
+ var forward = Quat.getForward(Quat.cancelOutRollAndPitch(headRot));
var FORWARD_OFFSET = 0.5 * MyAvatar.sensorToWorldScale;
finalPosition = Vec3.sum(headPos, Vec3.multiply(FORWARD_OFFSET, forward));
var orientation = Quat.lookAt({x: 0, y: 0, z: 0}, forward, Vec3.multiplyQbyV(MyAvatar.orientation, Vec3.UNIT_Y));
@@ -269,8 +269,9 @@ WebTablet.prototype.setLandscape = function(newLandscapeValue) {
}
this.landscape = newLandscapeValue;
+ var cameraOrientation = Quat.cancelOutRollAndPitch(Camera.orientation);
Overlays.editOverlay(this.tabletEntityID,
- { rotation: Quat.multiply(Camera.orientation, this.landscape ? ROT_LANDSCAPE : ROT_Y_180) });
+ { rotation: Quat.multiply(cameraOrientation, this.landscape ? ROT_LANDSCAPE : ROT_Y_180) });
var tabletWidth = getTabletWidthFromSettings() * MyAvatar.sensorToWorldScale;
var tabletScaleFactor = tabletWidth / TABLET_NATURAL_DIMENSIONS.x;
@@ -278,7 +279,7 @@ WebTablet.prototype.setLandscape = function(newLandscapeValue) {
var screenWidth = 0.82 * tabletWidth;
var screenHeight = 0.81 * tabletHeight;
Overlays.editOverlay(this.webOverlayID, {
- rotation: Quat.multiply(Camera.orientation, ROT_LANDSCAPE_WINDOW),
+ rotation: Quat.multiply(cameraOrientation, ROT_LANDSCAPE_WINDOW),
dimensions: {x: this.landscape ? screenHeight : screenWidth, y: this.landscape ? screenWidth : screenHeight, z: 0.1}
});
};
diff --git a/server-console/package-lock.json b/server-console/package-lock.json
index 51b7f2c268..ba8ef3c720 100644
--- a/server-console/package-lock.json
+++ b/server-console/package-lock.json
@@ -5,11 +5,23 @@
"requires": true,
"dependencies": {
"abbrev": {
- "version": "1.0.7",
- "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz",
- "integrity": "sha1-W2A1su6dT7XPhZ8Iqb6BsghJGEM=",
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+ "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
"dev": true
},
+ "ajv": {
+ "version": "5.5.2",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+ "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+ "dev": true,
+ "requires": {
+ "co": "4.6.0",
+ "fast-deep-equal": "1.0.0",
+ "fast-json-stable-stringify": "2.0.0",
+ "json-schema-traverse": "0.3.1"
+ }
+ },
"always-tail": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/always-tail/-/always-tail-0.2.0.tgz",
@@ -28,10 +40,11 @@
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
},
- "ansicolors": {
- "version": "0.2.1",
- "resolved": "https://registry.npmjs.org/ansicolors/-/ansicolors-0.2.1.tgz",
- "integrity": "sha1-vgiVmQl7dKXJxKhKDNvNtivYeu8="
+ "any-promise": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+ "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=",
+ "dev": true
},
"array-find-index": {
"version": "1.0.1",
@@ -40,20 +53,37 @@
"dev": true
},
"asar": {
- "version": "0.11.0",
- "resolved": "https://registry.npmjs.org/asar/-/asar-0.11.0.tgz",
- "integrity": "sha1-uSbnksMV+MBIxDNx4yWwnJenZGQ=",
+ "version": "0.14.2",
+ "resolved": "https://registry.npmjs.org/asar/-/asar-0.14.2.tgz",
+ "integrity": "sha512-eKo4ywQDq9dC/0Pu6UJsX4PxNi5ZlC4/NQ1JORUW4xkMRrEWpoLPpkngmQ6K7ZkioVjE2ZafLMmHPAQKMO0BdA==",
"dev": true,
"requires": {
- "chromium-pickle-js": "0.1.0",
+ "chromium-pickle-js": "0.2.0",
"commander": "2.9.0",
- "cuint": "0.2.1",
+ "cuint": "0.2.2",
"glob": "6.0.4",
- "minimatch": "3.0.0",
+ "minimatch": "3.0.4",
"mkdirp": "0.5.1",
- "mksnapshot": "0.3.0"
+ "mksnapshot": "0.3.1",
+ "tmp": "0.0.28"
},
"dependencies": {
+ "balanced-match": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+ "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+ "dev": true
+ },
+ "brace-expansion": {
+ "version": "1.1.11",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+ "dev": true,
+ "requires": {
+ "balanced-match": "1.0.0",
+ "concat-map": "0.0.1"
+ }
+ },
"glob": {
"version": "6.0.4",
"resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
@@ -62,10 +92,19 @@
"requires": {
"inflight": "1.0.4",
"inherits": "2.0.1",
- "minimatch": "3.0.0",
+ "minimatch": "3.0.4",
"once": "1.3.3",
"path-is-absolute": "1.0.0"
}
+ },
+ "minimatch": {
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+ "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+ "dev": true,
+ "requires": {
+ "brace-expansion": "1.1.11"
+ }
}
}
},
@@ -84,6 +123,18 @@
"resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
"integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo="
},
+ "asynckit": {
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+ "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+ "dev": true
+ },
+ "author-regex": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/author-regex/-/author-regex-1.0.0.tgz",
+ "integrity": "sha1-0IiFvmubv5Q5/gh8dihyRfCoFFA=",
+ "dev": true
+ },
"aws-sign2": {
"version": "0.6.0",
"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
@@ -103,9 +154,9 @@
"integrity": "sha1-qRzdHr7xqGZZ5w/03vAWJfwtZ1Y="
},
"base64-js": {
- "version": "0.0.8",
- "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz",
- "integrity": "sha1-EQHpVE9KdrG8OybUUsqW16NeeXg=",
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz",
+ "integrity": "sha1-o5mS1yNYSBGYK+XikLtqU9hnAPE=",
"dev": true
},
"binary": {
@@ -147,9 +198,9 @@
}
},
"bluebird": {
- "version": "2.10.2",
- "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.10.2.tgz",
- "integrity": "sha1-AkpVFylTCIV/FPkfEQb8O1VfRGs=",
+ "version": "3.5.1",
+ "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
+ "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==",
"dev": true
},
"boolbase": {
@@ -201,15 +252,6 @@
"map-obj": "1.0.1"
}
},
- "cardinal": {
- "version": "0.5.0",
- "resolved": "https://registry.npmjs.org/cardinal/-/cardinal-0.5.0.tgz",
- "integrity": "sha1-ANX2YdvUqr/ffUHOSKWlm8o1opE=",
- "requires": {
- "ansicolors": "0.2.1",
- "redeyed": "0.5.0"
- }
- },
"caseless": {
"version": "0.11.0",
"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
@@ -249,36 +291,11 @@
}
},
"chromium-pickle-js": {
- "version": "0.1.0",
- "resolved": "https://registry.npmjs.org/chromium-pickle-js/-/chromium-pickle-js-0.1.0.tgz",
- "integrity": "sha1-HUixB9ghJqLz4hHC6iX4A7pVGyE=",
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz",
+ "integrity": "sha1-BKEGZywYsIWrd02YPfo+oTjyIgU=",
"dev": true
},
- "cli-table": {
- "version": "0.3.1",
- "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
- "integrity": "sha1-9TsFJmqLGguTSz0IIebi3FkUriM=",
- "requires": {
- "colors": "1.0.3"
- }
- },
- "cli-usage": {
- "version": "0.1.2",
- "resolved": "https://registry.npmjs.org/cli-usage/-/cli-usage-0.1.2.tgz",
- "integrity": "sha1-SXwg6vEuwneTk6m/rCJcX2y5FS0=",
- "requires": {
- "marked": "0.3.5",
- "marked-terminal": "1.6.1",
- "minimist": "0.2.0"
- },
- "dependencies": {
- "minimist": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz",
- "integrity": "sha1-Tf/lJdriuGTGbC4jxicdev3s784="
- }
- }
- },
"cliui": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
@@ -289,6 +306,12 @@
"wrap-ansi": "2.0.0"
}
},
+ "co": {
+ "version": "4.6.0",
+ "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+ "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+ "dev": true
+ },
"code-point-at": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.0.tgz",
@@ -297,11 +320,6 @@
"number-is-nan": "1.0.0"
}
},
- "colors": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
- "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs="
- },
"combined-stream": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
@@ -318,6 +336,12 @@
"graceful-readlink": "1.0.1"
}
},
+ "compare-version": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz",
+ "integrity": "sha1-AWLsLZNR9d3VmpICy6k1NmpyUIA=",
+ "dev": true
+ },
"concat-map": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -385,16 +409,10 @@
"resolved": "https://registry.npmjs.org/css-what/-/css-what-1.0.0.tgz",
"integrity": "sha1-18wt9FGAZm+Z0rFEYmOUaeAPc2w="
},
- "ctype": {
- "version": "0.5.3",
- "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
- "integrity": "sha1-gsGMJGH3QRTvFsE1IkrQuRRMoS8=",
- "dev": true
- },
"cuint": {
- "version": "0.2.1",
- "resolved": "https://registry.npmjs.org/cuint/-/cuint-0.2.1.tgz",
- "integrity": "sha1-VlBFzoEnxwxr80D1kcAEin1M/rw=",
+ "version": "0.2.2",
+ "resolved": "https://registry.npmjs.org/cuint/-/cuint-0.2.2.tgz",
+ "integrity": "sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=",
"dev": true
},
"dashdash": {
@@ -432,7 +450,7 @@
"graceful-fs": "4.1.3",
"mkpath": "0.1.0",
"nopt": "3.0.6",
- "q": "1.4.1",
+ "q": "1.5.1",
"readable-stream": "1.1.14",
"touch": "0.0.3"
}
@@ -527,37 +545,205 @@
"integrity": "sha1-DboCXtM9DkW/j0DG6b487i+YbCg="
},
"electron-osx-sign": {
- "version": "0.3.0",
- "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.3.0.tgz",
- "integrity": "sha1-SXIB38g1OMVLNPGkBexuIaAf904=",
+ "version": "0.4.8",
+ "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.4.8.tgz",
+ "integrity": "sha1-8Ln63e2eHlTsNfqJh3tcbDTHvEA=",
"dev": true,
"requires": {
+ "bluebird": "3.5.1",
+ "compare-version": "0.1.2",
+ "debug": "2.6.9",
+ "isbinaryfile": "3.0.2",
"minimist": "1.2.0",
- "run-series": "1.1.4"
+ "plist": "2.1.0"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "2.6.9",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+ "dev": true,
+ "requires": {
+ "ms": "2.0.0"
+ }
+ },
+ "ms": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+ "dev": true
+ }
}
},
"electron-packager": {
- "version": "6.0.2",
- "resolved": "https://registry.npmjs.org/electron-packager/-/electron-packager-6.0.2.tgz",
- "integrity": "sha1-juAGaf6KNjCVAnMvz+0RfX7prCk=",
+ "version": "11.0.0",
+ "resolved": "https://registry.npmjs.org/electron-packager/-/electron-packager-11.0.0.tgz",
+ "integrity": "sha512-ufyYMe3Gt6IEZm9RuG+KK3Nh+V2jZHWg9gihp8wylUNtleQihECIXtQdpPJxH9740XFERVPraNEaa7cZvDzpyw==",
"dev": true,
"requires": {
- "asar": "0.11.0",
- "electron-download": "2.1.1",
- "electron-osx-sign": "0.3.0",
+ "asar": "0.14.2",
+ "debug": "3.1.0",
+ "electron-download": "4.1.0",
+ "electron-osx-sign": "0.4.8",
"extract-zip": "1.5.0",
- "fs-extra": "0.26.7",
- "get-package-info": "0.0.2",
- "minimist": "1.2.0",
- "mkdirp": "0.5.1",
- "mv": "2.1.1",
- "ncp": "2.0.0",
- "object-assign": "4.0.1",
- "plist": "1.2.0",
- "rcedit": "0.5.0",
- "resolve": "1.1.7",
- "rimraf": "2.5.2",
- "run-series": "1.1.4"
+ "fs-extra": "5.0.0",
+ "get-package-info": "1.0.0",
+ "mz": "2.7.0",
+ "nodeify": "1.0.1",
+ "parse-author": "2.0.0",
+ "pify": "3.0.0",
+ "plist": "2.1.0",
+ "pruner": "0.0.7",
+ "rcedit": "0.9.0",
+ "resolve": "1.5.0",
+ "sanitize-filename": "1.6.1",
+ "semver": "5.5.0",
+ "yargs-parser": "8.1.0"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+ "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+ "dev": true,
+ "requires": {
+ "ms": "2.0.0"
+ }
+ },
+ "electron-download": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/electron-download/-/electron-download-4.1.0.tgz",
+ "integrity": "sha1-v5MsdG8vh//MCdHdRy8v9rkYeEU=",
+ "dev": true,
+ "requires": {
+ "debug": "2.6.9",
+ "env-paths": "1.0.0",
+ "fs-extra": "2.1.2",
+ "minimist": "1.2.0",
+ "nugget": "2.0.1",
+ "path-exists": "3.0.0",
+ "rc": "1.1.6",
+ "semver": "5.5.0",
+ "sumchecker": "2.0.2"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "2.6.9",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+ "dev": true,
+ "requires": {
+ "ms": "2.0.0"
+ }
+ },
+ "fs-extra": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz",
+ "integrity": "sha1-BGxwFjzvmq1GsOSn+kZ/si1x3jU=",
+ "dev": true,
+ "requires": {
+ "graceful-fs": "4.1.3",
+ "jsonfile": "2.2.3"
+ }
+ }
+ }
+ },
+ "fs-extra": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz",
+ "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
+ "dev": true,
+ "requires": {
+ "graceful-fs": "4.1.3",
+ "jsonfile": "4.0.0",
+ "universalify": "0.1.1"
+ },
+ "dependencies": {
+ "jsonfile": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+ "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+ "dev": true,
+ "requires": {
+ "graceful-fs": "4.1.11"
+ },
+ "dependencies": {
+ "graceful-fs": {
+ "version": "4.1.11",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+ "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+ "dev": true,
+ "optional": true
+ }
+ }
+ }
+ }
+ },
+ "ms": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+ "dev": true
+ },
+ "nugget": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/nugget/-/nugget-2.0.1.tgz",
+ "integrity": "sha1-IBCVpIfhrTYIGzQy+jytpPjQcbA=",
+ "dev": true,
+ "requires": {
+ "debug": "2.6.9",
+ "minimist": "1.2.0",
+ "pretty-bytes": "1.0.4",
+ "progress-stream": "1.2.0",
+ "request": "2.71.0",
+ "single-line-log": "1.1.2",
+ "throttleit": "0.0.2"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "2.6.9",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+ "dev": true,
+ "requires": {
+ "ms": "2.0.0"
+ }
+ }
+ }
+ },
+ "path-exists": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+ "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+ "dev": true
+ },
+ "pify": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+ "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+ "dev": true
+ },
+ "semver": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
+ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
+ "dev": true
+ },
+ "single-line-log": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/single-line-log/-/single-line-log-1.1.2.tgz",
+ "integrity": "sha1-wvg/Jzo+GhbtsJlWYdoO1e8DM2Q=",
+ "dev": true,
+ "requires": {
+ "string-width": "1.0.1"
+ }
+ },
+ "throttleit": {
+ "version": "0.0.2",
+ "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz",
+ "integrity": "sha1-z+34jmDADdlpe2H90qg0OptoDq8=",
+ "dev": true
+ }
}
},
"electron-prebuilt": {
@@ -583,6 +769,12 @@
"resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
"integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA="
},
+ "env-paths": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-1.0.0.tgz",
+ "integrity": "sha1-QWgTO0K7BcOKNbGuQ5fIKYqzaeA=",
+ "dev": true
+ },
"error-ex": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz",
@@ -597,11 +789,6 @@
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
},
- "esprima-fb": {
- "version": "12001.1.0-dev-harmony-fb",
- "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-12001.1.0-dev-harmony-fb.tgz",
- "integrity": "sha1-2EQAOEupXOJnjGF60kp/QICNqRU="
- },
"extend": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz",
@@ -641,6 +828,18 @@
"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz",
"integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA="
},
+ "fast-deep-equal": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
+ "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=",
+ "dev": true
+ },
+ "fast-json-stable-stringify": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+ "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
+ "dev": true
+ },
"fd-slicer": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
@@ -712,20 +911,87 @@
}
},
"get-package-info": {
- "version": "0.0.2",
- "resolved": "https://registry.npmjs.org/get-package-info/-/get-package-info-0.0.2.tgz",
- "integrity": "sha1-csOPvuLnZyhCSgDcFOJN0aKMI5E=",
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/get-package-info/-/get-package-info-1.0.0.tgz",
+ "integrity": "sha1-ZDJ5ZWPigRPNlHTbvQAFKYWkmZw=",
"dev": true,
"requires": {
- "bluebird": "3.3.5",
- "lodash.get": "4.2.1",
- "resolve": "1.1.7"
+ "bluebird": "3.5.1",
+ "debug": "2.6.9",
+ "lodash.get": "4.4.2",
+ "read-pkg-up": "2.0.0"
},
"dependencies": {
- "bluebird": {
- "version": "3.3.5",
- "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.3.5.tgz",
- "integrity": "sha1-XudH8ce9lnZYtoOTZDCu51OVWjQ=",
+ "debug": {
+ "version": "2.6.9",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+ "dev": true,
+ "requires": {
+ "ms": "2.0.0"
+ }
+ },
+ "find-up": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+ "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+ "dev": true,
+ "requires": {
+ "locate-path": "2.0.0"
+ }
+ },
+ "load-json-file": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+ "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+ "dev": true,
+ "requires": {
+ "graceful-fs": "4.1.3",
+ "parse-json": "2.2.0",
+ "pify": "2.3.0",
+ "strip-bom": "3.0.0"
+ }
+ },
+ "ms": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+ "dev": true
+ },
+ "path-type": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
+ "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+ "dev": true,
+ "requires": {
+ "pify": "2.3.0"
+ }
+ },
+ "read-pkg": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
+ "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+ "dev": true,
+ "requires": {
+ "load-json-file": "2.0.0",
+ "normalize-package-data": "2.3.5",
+ "path-type": "2.0.0"
+ }
+ },
+ "read-pkg-up": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+ "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+ "dev": true,
+ "requires": {
+ "find-up": "2.1.0",
+ "read-pkg": "2.0.0"
+ }
+ },
+ "strip-bom": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+ "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
"dev": true
}
}
@@ -763,6 +1029,12 @@
"resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
"integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE="
},
+ "har-schema": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+ "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+ "dev": true
+ },
"har-validator": {
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
@@ -893,14 +1165,6 @@
"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
"integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
},
- "is-absolute": {
- "version": "0.1.7",
- "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
- "integrity": "sha1-hHSREZ/MtftDYhfMc39/qtUPYD8=",
- "requires": {
- "is-relative": "0.1.3"
- }
- },
"is-arrayish": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -944,16 +1208,17 @@
"xtend": "4.0.1"
}
},
+ "is-promise": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz",
+ "integrity": "sha1-MVc3YcBX4zwukaq56W2gjO++duU=",
+ "dev": true
+ },
"is-property": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
"integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ="
},
- "is-relative": {
- "version": "0.1.3",
- "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz",
- "integrity": "sha1-kF/uiuhvRbPsYUvDwVyGnfCHboI="
- },
"is-typedarray": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
@@ -970,10 +1235,16 @@
"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
},
+ "isbinaryfile": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.2.tgz",
+ "integrity": "sha1-Sj6XTsDLqQBNP8bN5yCeppNopiE=",
+ "dev": true
+ },
"isexe": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/isexe/-/isexe-1.1.2.tgz",
- "integrity": "sha1-NvPiLmB1CSD15yQaR2qMakInWtA="
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+ "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
},
"isstream": {
"version": "0.1.2",
@@ -1000,6 +1271,12 @@
"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz",
"integrity": "sha1-UDVPGfYDkXxpX3C4Wvp3w7DyNQY="
},
+ "json-schema-traverse": {
+ "version": "0.3.1",
+ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+ "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
+ "dev": true
+ },
"json-stringify-safe": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
@@ -1051,136 +1328,34 @@
"strip-bom": "2.0.0"
}
},
+ "locate-path": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+ "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+ "dev": true,
+ "requires": {
+ "p-locate": "2.0.0",
+ "path-exists": "3.0.0"
+ },
+ "dependencies": {
+ "path-exists": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+ "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+ "dev": true
+ }
+ }
+ },
"lodash": {
"version": "3.10.1",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
"integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y="
},
- "lodash._arraycopy": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/lodash._arraycopy/-/lodash._arraycopy-3.0.0.tgz",
- "integrity": "sha1-due3wfH7klRzdIeKVi7Qaj5Q9uE="
- },
- "lodash._arrayeach": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/lodash._arrayeach/-/lodash._arrayeach-3.0.0.tgz",
- "integrity": "sha1-urFWsqkNPxu9XGU0AzSeXlkz754="
- },
- "lodash._baseassign": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
- "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=",
- "requires": {
- "lodash._basecopy": "3.0.1",
- "lodash.keys": "3.1.2"
- }
- },
- "lodash._baseclone": {
- "version": "3.3.0",
- "resolved": "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-3.3.0.tgz",
- "integrity": "sha1-MDUZv2OT/n5C802LYw73eU41Qrc=",
- "requires": {
- "lodash._arraycopy": "3.0.0",
- "lodash._arrayeach": "3.0.0",
- "lodash._baseassign": "3.2.0",
- "lodash._basefor": "3.0.3",
- "lodash.isarray": "3.0.4",
- "lodash.keys": "3.1.2"
- }
- },
- "lodash._basecopy": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
- "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY="
- },
- "lodash._basefor": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/lodash._basefor/-/lodash._basefor-3.0.3.tgz",
- "integrity": "sha1-dVC06SGO8J+tJDQ7YSAhx5tMIMI="
- },
- "lodash._bindcallback": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz",
- "integrity": "sha1-5THCdkTPi1epnhftlbNcdIeJOS4="
- },
- "lodash._createassigner": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz",
- "integrity": "sha1-g4pbri/aymOsIt7o4Z+k5taXCxE=",
- "requires": {
- "lodash._bindcallback": "3.0.1",
- "lodash._isiterateecall": "3.0.9",
- "lodash.restparam": "3.6.1"
- }
- },
- "lodash._getnative": {
- "version": "3.9.1",
- "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
- "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U="
- },
- "lodash._isiterateecall": {
- "version": "3.0.9",
- "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
- "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw="
- },
- "lodash._stringtopath": {
- "version": "4.7.1",
- "resolved": "https://registry.npmjs.org/lodash._stringtopath/-/lodash._stringtopath-4.7.1.tgz",
- "integrity": "sha1-1GYKFaWZeYj6WTAaO/2gXJpt494=",
- "dev": true
- },
- "lodash.assign": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz",
- "integrity": "sha1-POnwI0tLIiPilrj6CsH+6OvKZPo=",
- "requires": {
- "lodash._baseassign": "3.2.0",
- "lodash._createassigner": "3.1.1",
- "lodash.keys": "3.1.2"
- }
- },
- "lodash.clonedeep": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-3.0.2.tgz",
- "integrity": "sha1-oKHkDYKl6on/WxR7hETtY9koJ9s=",
- "requires": {
- "lodash._baseclone": "3.3.0",
- "lodash._bindcallback": "3.0.1"
- }
- },
"lodash.get": {
- "version": "4.2.1",
- "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.2.1.tgz",
- "integrity": "sha1-bpr8h7imwCFgZnpw9sjOEHiusRs=",
- "dev": true,
- "requires": {
- "lodash._stringtopath": "4.7.1"
- }
- },
- "lodash.isarguments": {
- "version": "3.0.8",
- "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.8.tgz",
- "integrity": "sha1-W/jaiH8B8qnknAoXXNrrMYoOQ9w="
- },
- "lodash.isarray": {
- "version": "3.0.4",
- "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
- "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U="
- },
- "lodash.keys": {
- "version": "3.1.2",
- "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
- "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
- "requires": {
- "lodash._getnative": "3.9.1",
- "lodash.isarguments": "3.0.8",
- "lodash.isarray": "3.0.4"
- }
- },
- "lodash.restparam": {
- "version": "3.6.1",
- "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
- "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU="
+ "version": "4.4.2",
+ "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+ "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
+ "dev": true
},
"loud-rejection": {
"version": "1.3.0",
@@ -1207,23 +1382,6 @@
"integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
"dev": true
},
- "marked": {
- "version": "0.3.5",
- "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.5.tgz",
- "integrity": "sha1-QROhWsXXvKFYpargciRYe5+hW5Q="
- },
- "marked-terminal": {
- "version": "1.6.1",
- "resolved": "https://registry.npmjs.org/marked-terminal/-/marked-terminal-1.6.1.tgz",
- "integrity": "sha1-BM0cfIsO9I2z9oAQ1zpXqWYcbM8=",
- "requires": {
- "cardinal": "0.5.0",
- "chalk": "1.1.3",
- "cli-table": "0.3.1",
- "lodash.assign": "3.2.0",
- "node-emoji": "0.1.0"
- }
- },
"meow": {
"version": "3.7.0",
"resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
@@ -1266,7 +1424,8 @@
"minimist": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
- "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+ "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+ "dev": true
},
"mkdirp": {
"version": "0.5.1",
@@ -1290,180 +1449,214 @@
"dev": true
},
"mksnapshot": {
- "version": "0.3.0",
- "resolved": "https://registry.npmjs.org/mksnapshot/-/mksnapshot-0.3.0.tgz",
- "integrity": "sha1-MuqYStb1MjJMaj+uZACHa4WChAc=",
+ "version": "0.3.1",
+ "resolved": "https://registry.npmjs.org/mksnapshot/-/mksnapshot-0.3.1.tgz",
+ "integrity": "sha1-JQHAVldDbXQs6Vik/5LHfkDdN+Y=",
"dev": true,
"requires": {
"decompress-zip": "0.3.0",
"fs-extra": "0.26.7",
- "request": "2.55.0"
+ "request": "2.83.0"
},
"dependencies": {
- "asn1": {
- "version": "0.1.11",
- "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
- "integrity": "sha1-VZvhg3bQik7E2+gId9J4GGObLfc=",
- "dev": true
- },
"assert-plus": {
- "version": "0.1.5",
- "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
- "integrity": "sha1-7nQAlBMALYTOxyGcasgRgS5yMWA=",
- "dev": true
- },
- "async": {
- "version": "0.9.2",
- "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
- "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+ "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
"dev": true
},
"aws-sign2": {
- "version": "0.5.0",
- "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
- "integrity": "sha1-xXED96F/wDfwLXwuZLYC6iI/fWM=",
+ "version": "0.7.0",
+ "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+ "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
"dev": true
},
- "bl": {
- "version": "0.9.5",
- "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.5.tgz",
- "integrity": "sha1-wGt5evCF6gC8Unr8jvzxHeIjIFQ=",
+ "aws4": {
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
+ "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
+ "dev": true
+ },
+ "boom": {
+ "version": "4.3.1",
+ "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
+ "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
"dev": true,
"requires": {
- "readable-stream": "1.0.34"
+ "hoek": "4.2.0"
}
},
"caseless": {
- "version": "0.9.0",
- "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.9.0.tgz",
- "integrity": "sha1-t7Zc5r8UE4hlOc/VM/CzDv+pz4g=",
+ "version": "0.12.0",
+ "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+ "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
"dev": true
},
- "combined-stream": {
- "version": "0.0.7",
- "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
- "integrity": "sha1-ATfmV7qlp1QcV6w3rF/AfXO03B8=",
+ "cryptiles": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
+ "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
"dev": true,
"requires": {
- "delayed-stream": "0.0.5"
+ "boom": "5.2.0"
+ },
+ "dependencies": {
+ "boom": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
+ "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
+ "dev": true,
+ "requires": {
+ "hoek": "4.2.0"
+ }
+ }
}
},
- "delayed-stream": {
- "version": "0.0.5",
- "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
- "integrity": "sha1-1LH0OpPoKW3+AmlPRoC8N6MTxz8=",
+ "extend": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+ "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
"dev": true
},
"form-data": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
- "integrity": "sha1-Jvi8JtpkQOKZy9z7aQNcT3em5GY=",
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
+ "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
"dev": true,
"requires": {
- "async": "0.9.2",
- "combined-stream": "0.0.7",
- "mime-types": "2.0.14"
+ "asynckit": "0.4.0",
+ "combined-stream": "1.0.5",
+ "mime-types": "2.1.17"
}
},
"har-validator": {
- "version": "1.8.0",
- "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz",
- "integrity": "sha1-2DhCsOtMQ1lgrrEIoGejqpTA7rI=",
+ "version": "5.0.3",
+ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
+ "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
"dev": true,
"requires": {
- "bluebird": "2.10.2",
- "chalk": "1.1.3",
- "commander": "2.9.0",
- "is-my-json-valid": "2.13.1"
+ "ajv": "5.5.2",
+ "har-schema": "2.0.0"
}
},
"hawk": {
- "version": "2.3.1",
- "resolved": "https://registry.npmjs.org/hawk/-/hawk-2.3.1.tgz",
- "integrity": "sha1-HnMc45RH+h0PbXB/e87r7A/R7B8=",
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
+ "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
"dev": true,
"requires": {
- "boom": "2.10.1",
- "cryptiles": "2.0.5",
- "hoek": "2.16.3",
- "sntp": "1.0.9"
+ "boom": "4.3.1",
+ "cryptiles": "3.1.2",
+ "hoek": "4.2.0",
+ "sntp": "2.1.0"
}
},
+ "hoek": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
+ "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==",
+ "dev": true
+ },
"http-signature": {
- "version": "0.10.1",
- "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
- "integrity": "sha1-T72sEyVZqoMjEh5UB3nAoBKyfmY=",
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+ "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
"dev": true,
"requires": {
- "asn1": "0.1.11",
- "assert-plus": "0.1.5",
- "ctype": "0.5.3"
+ "assert-plus": "1.0.0",
+ "jsprim": "1.2.2",
+ "sshpk": "1.7.4"
}
},
"mime-db": {
- "version": "1.12.0",
- "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz",
- "integrity": "sha1-PQxjGA9FjrENMlqqN9fFiuMS6dc=",
+ "version": "1.30.0",
+ "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
+ "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=",
"dev": true
},
"mime-types": {
- "version": "2.0.14",
- "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz",
- "integrity": "sha1-MQ4VnbI+B3+Lsit0jav6SVcUCqY=",
+ "version": "2.1.17",
+ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
+ "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
"dev": true,
"requires": {
- "mime-db": "1.12.0"
+ "mime-db": "1.30.0"
}
},
"oauth-sign": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.6.0.tgz",
- "integrity": "sha1-fb6uRPbKRU4fFoRR1jB0ZzWBPOM=",
+ "version": "0.8.2",
+ "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
+ "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
"dev": true
},
"qs": {
- "version": "2.4.2",
- "resolved": "https://registry.npmjs.org/qs/-/qs-2.4.2.tgz",
- "integrity": "sha1-9854jld33wtQENp/fE5zujJHD1o=",
+ "version": "6.5.1",
+ "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
+ "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==",
"dev": true
},
- "readable-stream": {
- "version": "1.0.34",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
- "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
- "dev": true,
- "requires": {
- "core-util-is": "1.0.2",
- "inherits": "2.0.1",
- "isarray": "0.0.1",
- "string_decoder": "0.10.31"
- }
- },
"request": {
- "version": "2.55.0",
- "resolved": "https://registry.npmjs.org/request/-/request-2.55.0.tgz",
- "integrity": "sha1-11wc32eddrsQD5v/4f5VG1wk6T0=",
+ "version": "2.83.0",
+ "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
+ "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==",
"dev": true,
"requires": {
- "aws-sign2": "0.5.0",
- "bl": "0.9.5",
- "caseless": "0.9.0",
- "combined-stream": "0.0.7",
+ "aws-sign2": "0.7.0",
+ "aws4": "1.6.0",
+ "caseless": "0.12.0",
+ "combined-stream": "1.0.5",
+ "extend": "3.0.1",
"forever-agent": "0.6.1",
- "form-data": "0.2.0",
- "har-validator": "1.8.0",
- "hawk": "2.3.1",
- "http-signature": "0.10.1",
+ "form-data": "2.3.1",
+ "har-validator": "5.0.3",
+ "hawk": "6.0.2",
+ "http-signature": "1.2.0",
+ "is-typedarray": "1.0.0",
"isstream": "0.1.2",
"json-stringify-safe": "5.0.1",
- "mime-types": "2.0.14",
- "node-uuid": "1.4.7",
- "oauth-sign": "0.6.0",
- "qs": "2.4.2",
+ "mime-types": "2.1.17",
+ "oauth-sign": "0.8.2",
+ "performance-now": "2.1.0",
+ "qs": "6.5.1",
+ "safe-buffer": "5.1.1",
"stringstream": "0.0.5",
- "tough-cookie": "2.2.2",
- "tunnel-agent": "0.4.2"
+ "tough-cookie": "2.3.3",
+ "tunnel-agent": "0.6.0",
+ "uuid": "3.2.1"
}
+ },
+ "sntp": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
+ "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==",
+ "dev": true,
+ "requires": {
+ "hoek": "4.2.0"
+ }
+ },
+ "tough-cookie": {
+ "version": "2.3.3",
+ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
+ "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
+ "dev": true,
+ "requires": {
+ "punycode": "1.4.1"
+ }
+ },
+ "tunnel-agent": {
+ "version": "0.6.0",
+ "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+ "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+ "dev": true,
+ "requires": {
+ "safe-buffer": "5.1.1"
+ }
+ },
+ "uuid": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz",
+ "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==",
+ "dev": true
}
}
},
@@ -1508,29 +1701,39 @@
}
}
},
+ "mz": {
+ "version": "2.7.0",
+ "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
+ "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+ "dev": true,
+ "requires": {
+ "any-promise": "1.3.0",
+ "object-assign": "4.0.1",
+ "thenify-all": "1.6.0"
+ }
+ },
"ncp": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
"integrity": "sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=",
"dev": true
},
- "node-emoji": {
- "version": "0.1.0",
- "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-0.1.0.tgz",
- "integrity": "sha1-P0QkpVuo7VDCVKE4WLJEVPQYJgI="
- },
"node-notifier": {
- "version": "4.5.0",
- "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-4.5.0.tgz",
- "integrity": "sha1-Ap7pjXqbxOlsnLUb6dTzYTI/6ps=",
+ "version": "5.2.1",
+ "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.2.1.tgz",
+ "integrity": "sha512-MIBs+AAd6dJ2SklbbE8RUDRlIVhU8MaNLh1A9SUZDUHPiZkWLFde6UNwG41yQHZEToHgJMXqyVZ9UcS/ReOVTg==",
"requires": {
- "cli-usage": "0.1.2",
"growly": "1.3.0",
- "lodash.clonedeep": "3.0.2",
- "minimist": "1.2.0",
- "semver": "5.1.0",
- "shellwords": "0.1.0",
- "which": "1.2.4"
+ "semver": "5.5.0",
+ "shellwords": "0.1.1",
+ "which": "1.3.0"
+ },
+ "dependencies": {
+ "semver": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
+ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="
+ }
}
},
"node-uuid": {
@@ -1538,13 +1741,23 @@
"resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz",
"integrity": "sha1-baWhdmjEs91ZYjvaEc9/pMH2Cm8="
},
+ "nodeify": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/nodeify/-/nodeify-1.0.1.tgz",
+ "integrity": "sha1-ZKtpp7268DzhB7TwM1yHwLnpGx0=",
+ "dev": true,
+ "requires": {
+ "is-promise": "1.0.1",
+ "promise": "1.3.0"
+ }
+ },
"nopt": {
"version": "3.0.6",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
"integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
"dev": true,
"requires": {
- "abbrev": "1.0.7"
+ "abbrev": "1.1.1"
}
},
"normalize-package-data": {
@@ -1642,6 +1855,45 @@
"lcid": "1.0.0"
}
},
+ "os-tmpdir": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+ "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+ "dev": true
+ },
+ "p-limit": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz",
+ "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==",
+ "dev": true,
+ "requires": {
+ "p-try": "1.0.0"
+ }
+ },
+ "p-locate": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+ "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+ "dev": true,
+ "requires": {
+ "p-limit": "1.2.0"
+ }
+ },
+ "p-try": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+ "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+ "dev": true
+ },
+ "parse-author": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/parse-author/-/parse-author-2.0.0.tgz",
+ "integrity": "sha1-00YL8d3Q367tQtp1QkLmX7aEqB8=",
+ "dev": true,
+ "requires": {
+ "author-regex": "1.0.0"
+ }
+ },
"parse-json": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
@@ -1662,6 +1914,12 @@
"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz",
"integrity": "sha1-Jj2tpmqz8vsQv3+dJN2PPlcO+RI="
},
+ "path-parse": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
+ "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
+ "dev": true
+ },
"path-type": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
@@ -1679,6 +1937,12 @@
"integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
"dev": true
},
+ "performance-now": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+ "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+ "dev": true
+ },
"pify": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
@@ -1699,15 +1963,14 @@
}
},
"plist": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/plist/-/plist-1.2.0.tgz",
- "integrity": "sha1-CEtQk93JJQbiWfh0uNmxr7jHlZM=",
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/plist/-/plist-2.1.0.tgz",
+ "integrity": "sha1-V8zbeggh3yGDEhejytVOPhRqECU=",
"dev": true,
"requires": {
- "base64-js": "0.0.8",
- "util-deprecate": "1.0.2",
- "xmlbuilder": "4.0.0",
- "xmldom": "0.1.22"
+ "base64-js": "1.2.0",
+ "xmlbuilder": "8.2.2",
+ "xmldom": "0.1.27"
}
},
"pretty-bytes": {
@@ -1735,6 +1998,55 @@
"through2": "0.2.3"
}
},
+ "promise": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/promise/-/promise-1.3.0.tgz",
+ "integrity": "sha1-5cyaTIJ45GZP/twBx9qEhCsEAXU=",
+ "dev": true,
+ "requires": {
+ "is-promise": "1.0.1"
+ }
+ },
+ "pruner": {
+ "version": "0.0.7",
+ "resolved": "https://registry.npmjs.org/pruner/-/pruner-0.0.7.tgz",
+ "integrity": "sha1-NF+8s+gHARY6HXrfVrrCKaWh5ME=",
+ "dev": true,
+ "requires": {
+ "fs-extra": "4.0.3"
+ },
+ "dependencies": {
+ "fs-extra": {
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
+ "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
+ "dev": true,
+ "requires": {
+ "graceful-fs": "4.1.3",
+ "jsonfile": "4.0.0",
+ "universalify": "0.1.1"
+ }
+ },
+ "jsonfile": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+ "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+ "dev": true,
+ "requires": {
+ "graceful-fs": "4.1.11"
+ },
+ "dependencies": {
+ "graceful-fs": {
+ "version": "4.1.11",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+ "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+ "dev": true,
+ "optional": true
+ }
+ }
+ }
+ }
+ },
"pseudomap": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
@@ -1749,10 +2061,16 @@
"once": "1.3.3"
}
},
- "q": {
+ "punycode": {
"version": "1.4.1",
- "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz",
- "integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=",
+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+ "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+ "dev": true
+ },
+ "q": {
+ "version": "1.5.1",
+ "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
+ "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
"dev": true
},
"qs": {
@@ -1773,9 +2091,9 @@
}
},
"rcedit": {
- "version": "0.5.0",
- "resolved": "https://registry.npmjs.org/rcedit/-/rcedit-0.5.0.tgz",
- "integrity": "sha1-72a1p/AxB1IUGjTiLyPCJDPBzxU=",
+ "version": "0.9.0",
+ "resolved": "https://registry.npmjs.org/rcedit/-/rcedit-0.9.0.tgz",
+ "integrity": "sha1-ORDfVzRTmeKwMl9KUZAH+J5V7xw=",
"dev": true
},
"read-pkg": {
@@ -1820,14 +2138,6 @@
"strip-indent": "1.0.1"
}
},
- "redeyed": {
- "version": "0.5.0",
- "resolved": "https://registry.npmjs.org/redeyed/-/redeyed-0.5.0.tgz",
- "integrity": "sha1-erAA5g7jh1rBFdKe2zLBQDxsJdE=",
- "requires": {
- "esprima-fb": "12001.1.0-dev-harmony-fb"
- }
- },
"request": {
"version": "2.71.0",
"resolved": "https://registry.npmjs.org/request/-/request-2.71.0.tgz",
@@ -1865,10 +2175,13 @@
}
},
"resolve": {
- "version": "1.1.7",
- "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
- "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
- "dev": true
+ "version": "1.5.0",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz",
+ "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==",
+ "dev": true,
+ "requires": {
+ "path-parse": "1.0.5"
+ }
},
"rimraf": {
"version": "2.5.2",
@@ -1878,21 +2191,31 @@
"glob": "7.0.3"
}
},
- "run-series": {
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/run-series/-/run-series-1.1.4.tgz",
- "integrity": "sha1-iac93F51ye+KtjIMChYA1qQRebk=",
+ "safe-buffer": {
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+ "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
"dev": true
},
+ "sanitize-filename": {
+ "version": "1.6.1",
+ "resolved": "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.1.tgz",
+ "integrity": "sha1-YS2hyWRz+gLczaktzVtKsWSmdyo=",
+ "dev": true,
+ "requires": {
+ "truncate-utf8-bytes": "1.0.2"
+ }
+ },
"semver": {
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz",
- "integrity": "sha1-hfLPhVBGXE3wAM99hvawVBBqueU="
+ "integrity": "sha1-hfLPhVBGXE3wAM99hvawVBBqueU=",
+ "dev": true
},
"shellwords": {
- "version": "0.1.0",
- "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.0.tgz",
- "integrity": "sha1-Zq/Ue2oSky2Qccv9mKUueFzQuhQ="
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
+ "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww=="
},
"signal-exit": {
"version": "2.1.2",
@@ -2017,6 +2340,32 @@
"integrity": "sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E=",
"dev": true
},
+ "sumchecker": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-2.0.2.tgz",
+ "integrity": "sha1-D0LBDl0F2l1C7qPlbDOZo31sWz4=",
+ "dev": true,
+ "requires": {
+ "debug": "2.6.9"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "2.6.9",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+ "dev": true,
+ "requires": {
+ "ms": "2.0.0"
+ }
+ },
+ "ms": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+ "dev": true
+ }
+ }
+ },
"supports-color": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
@@ -2063,6 +2412,24 @@
}
}
},
+ "thenify": {
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz",
+ "integrity": "sha1-5p44obq+lpsBCCB5eLn2K4hgSDk=",
+ "dev": true,
+ "requires": {
+ "any-promise": "1.3.0"
+ }
+ },
+ "thenify-all": {
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
+ "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=",
+ "dev": true,
+ "requires": {
+ "thenify": "3.3.0"
+ }
+ },
"throttleit": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz",
@@ -2089,6 +2456,15 @@
}
}
},
+ "tmp": {
+ "version": "0.0.28",
+ "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.28.tgz",
+ "integrity": "sha1-Fyc1t/YU6nrzlmT6hM8N5OUV0SA=",
+ "dev": true,
+ "requires": {
+ "os-tmpdir": "1.0.2"
+ }
+ },
"touch": {
"version": "0.0.3",
"resolved": "https://registry.npmjs.org/touch/-/touch-0.0.3.tgz",
@@ -2104,7 +2480,7 @@
"integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=",
"dev": true,
"requires": {
- "abbrev": "1.0.7"
+ "abbrev": "1.1.1"
}
}
}
@@ -2126,6 +2502,15 @@
"integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
"dev": true
},
+ "truncate-utf8-bytes": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz",
+ "integrity": "sha1-QFkjkJWS1W94pYGENLC3hInKXys=",
+ "dev": true,
+ "requires": {
+ "utf8-byte-length": "1.0.4"
+ }
+ },
"tunnel-agent": {
"version": "0.4.2",
"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.2.tgz",
@@ -2143,6 +2528,18 @@
"integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
"dev": true
},
+ "universalify": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz",
+ "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=",
+ "dev": true
+ },
+ "utf8-byte-length": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz",
+ "integrity": "sha1-9F8VDExm7uloGGUFq5P8u4rWv2E=",
+ "dev": true
+ },
"util-deprecate": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -2167,12 +2564,11 @@
}
},
"which": {
- "version": "1.2.4",
- "resolved": "https://registry.npmjs.org/which/-/which-1.2.4.tgz",
- "integrity": "sha1-FVf5YIBgTlsRs1meufRbUKnv1yI=",
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
+ "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
"requires": {
- "is-absolute": "0.1.7",
- "isexe": "1.1.2"
+ "isexe": "2.0.0"
}
},
"window-size": {
@@ -2194,18 +2590,15 @@
"integrity": "sha1-HmWWmWXMvC20VIxrhKbyxa7dRzk="
},
"xmlbuilder": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.0.0.tgz",
- "integrity": "sha1-mLj2UcowqmJANvEn0RzGbce5B6M=",
- "dev": true,
- "requires": {
- "lodash": "3.10.1"
- }
+ "version": "8.2.2",
+ "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-8.2.2.tgz",
+ "integrity": "sha1-aSSGc0ELS6QuGmE2VR0pIjNap3M=",
+ "dev": true
},
"xmldom": {
- "version": "0.1.22",
- "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.22.tgz",
- "integrity": "sha1-EN5OXpZJgfA8jMcvrcCNFLbDqiY=",
+ "version": "0.1.27",
+ "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",
+ "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk=",
"dev": true
},
"xtend": {
@@ -2237,6 +2630,23 @@
"y18n": "3.2.1"
}
},
+ "yargs-parser": {
+ "version": "8.1.0",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-8.1.0.tgz",
+ "integrity": "sha512-yP+6QqN8BmrgW2ggLtTbdrOyBNSI7zBa4IykmiV5R1wl1JWNxQvWhMfMdmzIYtKU7oP3OOInY/tl2ov3BDjnJQ==",
+ "dev": true,
+ "requires": {
+ "camelcase": "4.1.0"
+ },
+ "dependencies": {
+ "camelcase": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+ "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+ "dev": true
+ }
+ }
+ },
"yauzl": {
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz",
diff --git a/server-console/package.json b/server-console/package.json
index 8d2a177e0a..9f47d0e4cc 100644
--- a/server-console/package.json
+++ b/server-console/package.json
@@ -8,7 +8,7 @@
""
],
"devDependencies": {
- "electron-packager": "^6.0.2",
+ "electron-packager": "^11.0.0",
"electron-prebuilt": "0.37.5"
},
"repository": {
@@ -27,7 +27,7 @@
"cheerio": "^0.19.0",
"extend": "^3.0.0",
"fs-extra": "^0.26.4",
- "node-notifier": "^4.4.0",
+ "node-notifier": "^5.2.1",
"os-homedir": "^1.0.1",
"request": "^2.67.0",
"request-progress": "1.0.2",
-
+
-
-
-
-
-
+
+
-
-
-
+
-
-
-
-
+
+
+
+
+
diff --git a/domain-server/resources/web/settings/js/settings.js b/domain-server/resources/web/settings/js/settings.js
index 3faeff4482..68684c9106 100644
--- a/domain-server/resources/web/settings/js/settings.js
+++ b/domain-server/resources/web/settings/js/settings.js
@@ -1,1262 +1,32 @@
-var DomainInfo = null;
-
-var viewHelpers = {
- getFormGroup: function(keypath, setting, values, isAdvanced) {
- form_group = "
-
-
-
-
-
-
- -
-
+
+
-
-
+
-
-
-
-
-
- Visit Cloud Hosted Domains to manage all your cloud domains
-
-
-
-
-
-
-
+ Your domain content settings are now available in Content
+ ";
- 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();
+ 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 {
-
- // 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;
+ b[p[0]] = decodeURIComponent(p[1].replace(/\+/g, " "));
}
}
-
- 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 = '
'; - spinner += 'Loading '; - 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: [
- {
- "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');
- }
+ return b;
+ })(window.location.search.substr(1).split('&'));
+
+ // define extra groups to add to description, with their splice index
+ Settings.extraGroups = {
+ 1: {
+ html_id: 'places',
+ label: 'Places'
},
- {
- 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" - }) + "-1": { + html_id: 'settings_backup', + label: 'Settings Backup' } } -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); - + Settings.afterReloadActions = function() { // append the domain selection modal appendDomainIDButtons(); @@ -1267,9 +37,11 @@ function reloadSettings(callback) { setupPlacesTable(); setupDomainNetworkingSettings(); - setupDomainLabelSetting(); + // setupDomainLabelSetting(); - if (Settings.data.values.metaverse.id.length > 0) { + setupSettingsBackup(); + + if (domainIDIsSet()) { // now, ask the API for what places, if any, point to this domain reloadDomainInfo(); @@ -1291,117 +63,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 +89,1016 @@ 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 += ""; + $('#' + 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('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(); + }); + }); + + function accessTokenIsSet() { + if (typeof Settings.data.values.metaverse !== 'undefined' && + typeof Settings.data.values.metaverse.access_token !== 'undefined') { + + return Settings.data.values.metaverse.access_token.length > 0; + } else { + return false; } - 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 = '"; + } 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("
";
- if (isArray) {
- updateDataChangedForSiblingRows(row, true)
+ html += "";
+ html += "Download this domain's settings to quickly configure another domain or to restore them later";
+ html += "Download Domain Settings";
+ html += "
";
+
+ html += "";
+ html += "";
+ html += "Upload a settings configuration to quickly configure this domain";
+ html += "
Note: Your domain's settings will be replaced by the settings you upload"; + + html += ""; + html += ""; + + html += "
";
+
+ $('#settings_backup .panel-body').html(html);
+
+ // add an upload button to the footer to kick off the upload form
- // the addition of any table row should remove the empty-array-row
- row.siblings('.empty-array-row').remove()
}
-
- badgeSidebarForDifferences($(table))
-
- row.after(input_clone)
-}
-
-function deleteTableRow($row) {
- var $table = $row.closest('table');
- var categoryName = $row.data("category");
- var isArray = $table.data('setting-type') === 'array';
-
- $row.empty();
-
- if (!isArray) {
- if ($row.attr('name')) {
- $row.html("");
- } else {
- // for rows that didn't have a key, simply remove the row
- $row.remove();
- }
- } else {
- if ($table.find('.' + Settings.DATA_ROW_CLASS + "[data-category='" + categoryName + "']").length <= 1) {
- // This is the last row of the category, so delete the header
- $table.find('.' + Settings.DATA_CATEGORY_CLASS + "[data-category='" + categoryName + "']").remove();
- }
-
- if ($table.find('.' + Settings.DATA_ROW_CLASS).length > 1) {
- updateDataChangedForSiblingRows($row);
-
- // this isn't the last row - we can just remove it
- $row.remove();
- } else {
- // this is the last row, we can't remove it completely since we need to post an empty array
- $row
- .removeClass(Settings.DATA_ROW_CLASS)
- .removeClass(Settings.NEW_ROW_CLASS)
- .removeAttr("data-category")
- .addClass('empty-array-row')
- .html("");
- }
- }
-
- // we need to fire a change event on one of the remaining inputs so that the sidebar badge is updated
- badgeSidebarForDifferences($table);
-}
-
-function addTableCategory($categoryInputRow) {
- var $input = $categoryInputRow.find("input").first();
- var categoryValue = $input.prop("value");
- if (!categoryValue || $categoryInputRow.closest("table").find("tr[data-category='" + categoryValue + "']").length !== 0) {
- $categoryInputRow.addClass("has-warning");
-
- setTimeout(function () {
- $categoryInputRow.removeClass("has-warning");
- }, 400);
-
- return;
- }
-
- var $rowInput = $categoryInputRow.next(".inputs").clone();
- if (!$rowInput) {
- console.error("Error cloning inputs");
- }
-
- var canAddRows = $categoryInputRow.data("can-add-rows");
- var message = $categoryInputRow.data("message");
- var categoryKey = $categoryInputRow.data("key");
- var width = 0;
- $categoryInputRow
- .children("td")
- .each(function () {
- width += $(this).prop("colSpan") || 1;
- });
-
- $input
- .prop("value", "")
- .focus();
-
- $rowInput.find("td[name='" + categoryKey + "'] > input").first()
- .prop("value", categoryValue);
- $rowInput
- .attr("data-category", categoryValue)
- .addClass(Settings.NEW_ROW_CLASS);
-
- var $newCategoryRow = $(makeTableCategoryHeader(categoryKey, categoryValue, width, true, " - " + message));
- $newCategoryRow.addClass(Settings.NEW_ROW_CLASS);
-
- $categoryInputRow
- .before($newCategoryRow)
- .before($rowInput);
-
- if (canAddRows) {
- $rowInput.removeAttr("hidden");
- } else {
- addTableRow($rowInput);
- }
-}
-
-function deleteTableCategory($categoryHeaderRow) {
- var categoryName = $categoryHeaderRow.data("category");
-
- $categoryHeaderRow
- .closest("table")
- .find("tr[data-category='" + categoryName + "']")
- .each(function () {
- if ($(this).hasClass(Settings.DATA_ROW_CLASS)) {
- deleteTableRow($(this));
- } else {
- $(this).remove();
- }
- });
-}
-
-function toggleTableCategory($categoryHeaderRow) {
- var $icon = $categoryHeaderRow.find("." + Settings.TOGGLE_CATEGORY_SPAN_CLASS).first();
- var categoryName = $categoryHeaderRow.data("category");
- var wasExpanded = $icon.hasClass(Settings.TOGGLE_CATEGORY_EXPANDED_CLASS);
- if (wasExpanded) {
- $icon
- .addClass(Settings.TOGGLE_CATEGORY_CONTRACTED_CLASS)
- .removeClass(Settings.TOGGLE_CATEGORY_EXPANDED_CLASS);
- } else {
- $icon
- .addClass(Settings.TOGGLE_CATEGORY_EXPANDED_CLASS)
- .removeClass(Settings.TOGGLE_CATEGORY_CONTRACTED_CLASS);
- }
- $categoryHeaderRow
- .closest("table")
- .find("tr[data-category='" + categoryName + "']")
- .toggleClass("contracted", wasExpanded);
-}
-
-function moveTableRow(row, move_up) {
- var table = $(row).closest('table')
- var isArray = table.data('setting-type') === 'array'
- if (!isArray) {
- return;
- }
-
- if (move_up) {
- var prev_row = row.prev()
- if (prev_row.hasClass(Settings.DATA_ROW_CLASS)) {
- prev_row.before(row)
- }
- } else {
- var next_row = row.next()
- if (next_row.hasClass(Settings.DATA_ROW_CLASS)) {
- next_row.after(row)
- }
- }
-
- // we need to fire a change event on one of the remaining inputs so that the sidebar badge is updated
- badgeSidebarForDifferences($(table))
-}
-
-function updateDataChangedForSiblingRows(row, forceTrue) {
- // anytime a new row is added to an array we need to set data-changed for all sibling row inputs to true
- // unless it matches the inital set of values
-
- if (!forceTrue) {
- // figure out which group this row is in
- var panelParentID = row.closest('.panel').attr('id')
- // get the short name for the setting from the table
- var tableShortName = row.closest('table').data('short-name')
-
- // get a JSON representation of that section
- var panelSettingJSON = form2js(panelParentID, ".", false, cleanupFormValues, true)[panelParentID][tableShortName]
- if (Settings.initialValues[panelParentID]) {
- var initialPanelSettingJSON = Settings.initialValues[panelParentID][tableShortName]
- } else {
- var initialPanelSettingJSON = {};
- }
-
- // if they are equal, we don't need data-changed
- isTrue = !_.isEqual(panelSettingJSON, initialPanelSettingJSON)
- } else {
- isTrue = true
- }
-
- row.siblings('.' + Settings.DATA_ROW_CLASS).each(function(){
- var hiddenInput = $(this).find('td.' + Settings.DATA_COL_CLASS + ' input')
- if (isTrue) {
- hiddenInput.attr('data-changed', isTrue)
- } else {
- hiddenInput.removeAttr('data-changed')
- }
- })
-}
-
-function cleanupFormValues(node) {
- if (node.type && node.type === 'checkbox') {
- return { name: node.name, value: node.checked ? true : false };
- } else {
- return false;
- }
-}
-
-function showErrorMessage(title, message) {
- swal(title, message)
-}
+});
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 65053b7366..68a36195d9 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -501,7 +501,7 @@ void DomainServer::handleTempDomainSuccess(QNetworkReply& requestReply) {
// store the new domain ID and auto network setting immediately
QString newSettingsJSON = QString("{\"metaverse\": { \"id\": \"%1\", \"automatic_networking\": \"full\"}}").arg(id);
auto settingsDocument = QJsonDocument::fromJson(newSettingsJSON.toUtf8());
- _settingsManager.recurseJSONObjectAndOverwriteSettings(settingsDocument.object());
+ _settingsManager.recurseJSONObjectAndOverwriteSettings(settingsDocument.object(), DomainSettings);
// store the new ID and auto networking setting on disk
_settingsManager.persistToFile();
diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index 05227d35b7..8febbd5769 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -39,8 +39,11 @@ const QString SETTINGS_DESCRIPTION_RELATIVE_PATH = "/resources/describe-settings
const QString DESCRIPTION_SETTINGS_KEY = "settings";
const QString SETTING_DEFAULT_KEY = "default";
const QString DESCRIPTION_NAME_KEY = "name";
+const QString DESCRIPTION_GROUP_LABEL_KEY = "label";
+const QString DESCRIPTION_BACKUP_FLAG_KEY = "backup";
const QString SETTING_DESCRIPTION_TYPE_KEY = "type";
const QString DESCRIPTION_COLUMNS_KEY = "columns";
+const QString CONTENT_SETTING_FLAG_KEY = "content_setting";
const QString SETTINGS_VIEWPOINT_KEY = "viewpoint";
@@ -63,6 +66,8 @@ DomainServerSettingsManager::DomainServerSettingsManager() {
if (descriptionObject.contains(DESCRIPTION_SETTINGS_KEY)) {
_descriptionArray = descriptionDocument.object()[DESCRIPTION_SETTINGS_KEY].toArray();
+ splitSettingsDescription();
+
return;
}
}
@@ -78,11 +83,99 @@ DomainServerSettingsManager::DomainServerSettingsManager() {
Q_ARG(int, MISSING_SETTINGS_DESC_ERROR_CODE));
}
+void DomainServerSettingsManager::splitSettingsDescription() {
+ // construct separate description arrays for domain settings and content settings
+ // since they are displayed on different pages
+
+ // along the way we also construct one object that holds the groups separated by domain settings
+ // and content settings, so that the DS can setup dropdown menus below "Content" and "Settings"
+ // headers to jump directly to a settings group on the page of either
+ QJsonArray domainSettingsMenuGroups;
+ QJsonArray contentSettingsMenuGroups;
+
+ foreach(const QJsonValue& group, _descriptionArray) {
+ QJsonObject groupObject = group.toObject();
+
+ static const QString HIDDEN_GROUP_KEY = "hidden";
+ bool groupHidden = groupObject.contains(HIDDEN_GROUP_KEY) && groupObject[HIDDEN_GROUP_KEY].toBool();
+
+ QJsonArray domainSettingArray;
+ QJsonArray contentSettingArray;
+
+ foreach(const QJsonValue& settingDescription, groupObject[DESCRIPTION_SETTINGS_KEY].toArray()) {
+ QJsonObject settingDescriptionObject = settingDescription.toObject();
+
+ bool isContentSetting = settingDescriptionObject.contains(CONTENT_SETTING_FLAG_KEY)
+ && settingDescriptionObject[CONTENT_SETTING_FLAG_KEY].toBool();
+
+ if (isContentSetting) {
+ // push the setting description to the pending content setting array
+ contentSettingArray.push_back(settingDescriptionObject);
+ } else {
+ // push the setting description to the pending domain setting array
+ domainSettingArray.push_back(settingDescriptionObject);
+ }
+ }
+
+ if (!domainSettingArray.isEmpty() || !contentSettingArray.isEmpty()) {
+
+ // we know for sure we'll have something to add to our settings menu groups
+ // so setup that object for the group now, as long as the group isn't hidden alltogether
+ QJsonObject settingsDropdownGroup;
+
+ if (!groupHidden) {
+ if (groupObject.contains(DESCRIPTION_NAME_KEY)) {
+ settingsDropdownGroup[DESCRIPTION_NAME_KEY] = groupObject[DESCRIPTION_NAME_KEY];
+ }
+
+ settingsDropdownGroup[DESCRIPTION_GROUP_LABEL_KEY] = groupObject[DESCRIPTION_GROUP_LABEL_KEY];
+
+ static const QString DESCRIPTION_GROUP_HTML_ID_KEY = "html_id";
+ if (groupObject.contains(DESCRIPTION_GROUP_HTML_ID_KEY)) {
+ settingsDropdownGroup[DESCRIPTION_GROUP_HTML_ID_KEY] = groupObject[DESCRIPTION_GROUP_HTML_ID_KEY];
+ }
+ }
+
+ if (!domainSettingArray.isEmpty()) {
+ // we have some domain settings from this group, add the group with the filtered settings
+ QJsonObject filteredGroupObject = groupObject;
+ filteredGroupObject[DESCRIPTION_SETTINGS_KEY] = domainSettingArray;
+ _domainSettingsDescription.push_back(filteredGroupObject);
+
+ // if the group isn't hidden, add its information to the domain settings menu groups
+ if (!groupHidden) {
+ domainSettingsMenuGroups.push_back(settingsDropdownGroup);
+ }
+ }
+
+ if (!contentSettingArray.isEmpty()) {
+ // we have some content settings from this group, add the group with the filtered settings
+ QJsonObject filteredGroupObject = groupObject;
+ filteredGroupObject[DESCRIPTION_SETTINGS_KEY] = contentSettingArray;
+ _contentSettingsDescription.push_back(filteredGroupObject);
+
+ // if the group isn't hidden, add its information to the content settings menu groups
+ if (!groupHidden) {
+ contentSettingsMenuGroups.push_back(settingsDropdownGroup);
+ }
+ }
+ }
+ }
+
+ // populate the settings menu groups with what we've collected
+
+ static const QString SPLIT_MENU_GROUPS_DOMAIN_SETTINGS_KEY = "domain_settings";
+ static const QString SPLIT_MENU_GROUPS_CONTENT_SETTINGS_KEY = "content_settings";
+
+ _settingsMenuGroups[SPLIT_MENU_GROUPS_DOMAIN_SETTINGS_KEY] = domainSettingsMenuGroups;
+ _settingsMenuGroups[SPLIT_MENU_GROUPS_CONTENT_SETTINGS_KEY] = contentSettingsMenuGroups;
+}
+
void DomainServerSettingsManager::processSettingsRequestPacket(QSharedPointerNote: Your domain's settings will be replaced by the settings you upload"; + + html += ""; + html += ""; + + html += "
outerStartColor and outerEndColor.
* Write-only.
- * @property {Color} innerStartcolor - The color at the inner start point of the overlay. Write-only.
- * @property {Color} innerEndColor - The color at the inner end point of the overlay. Write-only.
- * @property {Color} outerStartColor - The color at the outer start point of the overlay. Write-only.
- * @property {Color} outerEndColor - The color at the outer end point of the overlay. Write-only.
+ * @property {Color} innerStartcolor - The color at the inner start point of the overlay.
+ * @property {Color} innerEndColor - The color at the inner end point of the overlay.
+ * @property {Color} outerStartColor - The color at the outer start point of the overlay.
+ * @property {Color} outerEndColor - The color at the outer end point of the overlay.
* @property {number} alpha=0.5 - The opacity of the overlay, 0.0 - 1.0. Setting this value also sets
* the values of innerStartAlpha, innerEndAlpha, outerStartAlpha, and
* outerEndAlpha. Synonym: Alpha; write-only.
@@ -440,10 +440,10 @@ void Circle3DOverlay::setProperties(const QVariantMap& properties) {
* Write-only.
* @property {number} outerAlpha - Sets the values of outerStartAlpha and outerEndAlpha.
* Write-only.
- * @property {number} innerStartAlpha=0 - The alpha at the inner start point of the overlay. Write-only.
- * @property {number} innerEndAlpha=0 - The alpha at the inner end point of the overlay. Write-only.
- * @property {number} outerStartAlpha=0 - The alpha at the outer start point of the overlay. Write-only.
- * @property {number} outerEndAlpha=0 - The alpha at the outer end point of the overlay. Write-only.
+ * @property {number} innerStartAlpha=0 - The alpha at the inner start point of the overlay.
+ * @property {number} innerEndAlpha=0 - The alpha at the inner end point of the overlay.
+ * @property {number} outerStartAlpha=0 - The alpha at the outer start point of the overlay.
+ * @property {number} outerEndAlpha=0 - The alpha at the outer end point of the overlay.
* @property {boolean} hasTickMarks=false - If true, tick marks are drawn.
* @property {number} majorTickMarksAngle=0 - The angle between major tick marks, in degrees.
diff --git a/interface/src/ui/overlays/ModelOverlay.cpp b/interface/src/ui/overlays/ModelOverlay.cpp
index 4847650163..2b2c1403ff 100644
--- a/interface/src/ui/overlays/ModelOverlay.cpp
+++ b/interface/src/ui/overlays/ModelOverlay.cpp
@@ -87,7 +87,7 @@ void ModelOverlay::update(float deltatime) {
if (_visibleDirty) {
_visibleDirty = false;
// don't show overlays in mirrors
- _model->setVisibleInScene(getVisible(), scene, render::ItemKey::TAG_BITS_0);
+ _model->setVisibleInScene(getVisible(), scene, render::ItemKey::TAG_BITS_0, false);
}
if (_drawInFrontDirty) {
_drawInFrontDirty = false;
diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
index 86635cd3bf..a2a23f2508 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
@@ -50,7 +50,7 @@ const glm::vec3 HAND_TO_PALM_OFFSET(0.0f, 0.12f, 0.08f);
namespace render {
template <> const ItemKey payloadGetKey(const AvatarSharedPointer& avatar) {
- return ItemKey::Builder::opaqueShape().withTypeMeta().withTagBits(ItemKey::TAG_BITS_0 | ItemKey::TAG_BITS_1);
+ return ItemKey::Builder::opaqueShape().withTypeMeta().withTagBits(ItemKey::TAG_BITS_0 | ItemKey::TAG_BITS_1).withMetaCullGroup();
}
template <> const Item::Bound payloadGetBound(const AvatarSharedPointer& avatar) {
return static_pointer_cast