From 3d3c0fe487cb9b6fd2c708b91b3505c5d786b128 Mon Sep 17 00:00:00 2001 From: Jonathan Pevarnek Date: Tue, 4 Aug 2015 17:44:40 -0400 Subject: [PATCH] Stop trying to update advanced settings autogrow textarea The autogrow textarea has been removed. The attempt to update it is causing a runtime error. This removes that attempt (and moves a few other lines around) Fixes #1797 --- src/generic_ui/polymer/advanced-settings.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/generic_ui/polymer/advanced-settings.ts b/src/generic_ui/polymer/advanced-settings.ts index 5c0797bcbe..352a281554 100644 --- a/src/generic_ui/polymer/advanced-settings.ts +++ b/src/generic_ui/polymer/advanced-settings.ts @@ -39,13 +39,11 @@ Polymer({ checkSettings_: function(oldSettings :any, newSettings :any) { for (var key in oldSettings){ if (!(key in newSettings)) { - this.status = StatusState.KEY_VALUE_ERROR; return false; } } for (var key in newSettings){ if (!(key in oldSettings)) { - this.status = StatusState.KEY_VALUE_ERROR; return false; } } @@ -54,14 +52,16 @@ Polymer({ setAdvancedSettings: function() { try { var newSettings = JSON.parse(this.settings); - if (this.checkSettings_(ui_context.model.globalSettings, newSettings)) { - ui_context.model.globalSettings = newSettings; - this.status = StatusState.SET; - ui_context.core.updateGlobalSettings(ui_context.model.globalSettings); - - this.settings = this.jsonifySettings_(ui_context.model.globalSettings); - this.$.advancedSettingsPaperTextarea.update(); + if (!this.checkSettings_(ui_context.model.globalSettings, newSettings)) { + this.status = StatusState.KEY_VALUE_ERROR; + return; } + + ui_context.model.globalSettings = newSettings; + this.status = StatusState.SET; + ui_context.core.updateGlobalSettings(ui_context.model.globalSettings); + + this.settings = this.jsonifySettings_(ui_context.model.globalSettings); } catch (e) { this.status = StatusState.PARSE_ERROR; }