Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing

domain-server/resources/web/js/settings.js

@@ -364,7 +364,7 @@ function makeTableInputs(setting) {
   _.each(setting.columns, function(col) {
     html += "<td class='" + Settings.DATA_COL_CLASS + "'name='" + col.name + "'>\
              <input type='text' class='form-control' placeholder='" + (col.placeholder ? col.placeholder : "") + "'\
-             value='" + (col.default ? col.default : "") + "'>\
+             value='" + (col.default ? col.default : "") + "' data-default='" + (col.default ? col.default : "") + "'>\
              </td>"
   })
     
@@ -504,7 +504,7 @@ function addTableRow(add_glyphicon) {
   })
   
   input_clone.find('input').each(function(){
-    $(this).val('')
+    $(this).val($(this).attr('data-default'));
   });
   
   if (isArray) {
@@ -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("<input type='hidden' class='form-control' name='" 
       + row.attr('name') + "' data-changed='true' value=''>");
   } 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
   }

interface/src/Menu.cpp

@@ -720,6 +720,8 @@ void Menu::saveSettings(QSettings* settings) {
 
     scanMenuBar(&saveAction, settings);
     Application::getInstance()->getAvatar()->saveData(settings);
+    
+    DependencyManager::get<AddressManager>()->storeCurrentAddress();
 
     if (lockedSettings) {
         Application::getInstance()->unlockSettings();

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());