From 51c175d160d4d9b0fce6ca9194131c059e6cf90c Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 6 Jan 2015 15:30:38 -0800 Subject: [PATCH 1/4] put input default back after row add --- domain-server/resources/web/js/settings.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js index 141bd72a26..cf39012d0f 100644 --- a/domain-server/resources/web/js/settings.js +++ b/domain-server/resources/web/js/settings.js @@ -364,7 +364,7 @@ function makeTableInputs(setting) { _.each(setting.columns, function(col) { html += "\ \ + value='" + (col.default ? col.default : "") + "' data-default='" + (col.default ? col.default : "") + "'>\ " }) @@ -504,7 +504,7 @@ function addTableRow(add_glyphicon) { }) input_clone.find('input').each(function(){ - $(this).val('') + $(this).val($(this).attr('data-default')); }); if (isArray) { From 2103e0150fe3b00e620dc5682e36937ec3e7c13f Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 6 Jan 2015 15:42:01 -0800 Subject: [PATCH 2/4] fix for row removal in domain array settings --- domain-server/resources/web/js/settings.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js index cf39012d0f..1e9051d717 100644 --- a/domain-server/resources/web/js/settings.js +++ b/domain-server/resources/web/js/settings.js @@ -525,9 +525,9 @@ function deleteTableRow(delete_glyphicon) { var table = $(row).closest('table') var isArray = table.data('setting-type') === 'array' + row.empty(); + if (!isArray) { - // this is a hash row, so we empty it but leave the hidden input blank so it is cleared when we save - row.empty() row.html(""); } else { @@ -538,7 +538,6 @@ function deleteTableRow(delete_glyphicon) { row.remove() } else { // this is the last row, we can't remove it completely since we need to post an empty array - row.empty() row.removeClass(Settings.DATA_ROW_CLASS).removeClass(Settings.NEW_ROW_CLASS) row.addClass('empty-array-row') @@ -592,7 +591,7 @@ function updateDataChangedForSiblingRows(row, forceTrue) { var initialPanelSettingJSON = Settings.initialValues[panelParentID][tableShortName] // if they are equal, we don't need data-changed - isTrue = _.isEqual(panelSettingJSON, initialPanelSettingJSON) + isTrue = !_.isEqual(panelSettingJSON, initialPanelSettingJSON) } else { isTrue = true } From 8c8a925085a978b94c34daed1a527ee6aa134009 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 6 Jan 2015 16:06:07 -0800 Subject: [PATCH 3/4] put back current address storage in Menu --- interface/src/Menu.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 4201a31fc7..f74ef287dc 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -749,6 +749,9 @@ void Menu::saveSettings(QSettings* settings) { scanMenuBar(&saveAction, settings); Application::getInstance()->getAvatar()->saveData(settings); + + const QString SETTINGS_ADDRESS_KEY = "address"; + settings->setValue(SETTINGS_ADDRESS_KEY, DependencyManager::get()->currentAddress()); if (lockedSettings) { Application::getInstance()->unlockSettings(); From 9c191be1067bfe6d617223977e5356b2668ecc85 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 6 Jan 2015 16:13:06 -0800 Subject: [PATCH 4/4] use the AddressManager's method to store current address --- interface/src/Menu.cpp | 3 +-- libraries/networking/src/AddressManager.h | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index f74ef287dc..1399388a60 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -750,8 +750,7 @@ void Menu::saveSettings(QSettings* settings) { scanMenuBar(&saveAction, settings); Application::getInstance()->getAvatar()->saveData(settings); - const QString SETTINGS_ADDRESS_KEY = "address"; - settings->setValue(SETTINGS_ADDRESS_KEY, DependencyManager::get()->currentAddress()); + DependencyManager::get()->storeCurrentAddress(); if (lockedSettings) { Application::getInstance()->unlockSettings(); diff --git a/libraries/networking/src/AddressManager.h b/libraries/networking/src/AddressManager.h index 370fd0e07d..dee070740f 100644 --- a/libraries/networking/src/AddressManager.h +++ b/libraries/networking/src/AddressManager.h @@ -58,6 +58,8 @@ public slots: void goToUser(const QString& username); void goToAddressFromObject(const QVariantMap& addressMap); + void storeCurrentAddress(); + signals: void lookupResultsFinished(); void lookupResultIsOffline(); @@ -72,7 +74,6 @@ protected: private slots: void handleAPIResponse(QNetworkReply& requestReply); void handleAPIError(QNetworkReply& errorReply); - void storeCurrentAddress(); private: void setDomainInfo(const QString& hostname, quint16 port, const QString& domainName = QString());