Fixed background not being set from config on load.

jstnhuang · Jul 21, 2017 · 078fba8 · 078fba8
1 parent b9ce6b7
commit 078fba8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/ros-rviz-display.html b/ros-rviz-display.html
@@ -207,10 +207,12 @@ <h1 hidden$="[[!permanent]]">{{name}}</h1>
 
       // Currently only used by global options display.
       loadConfig: function(config) {
-        var display = this.$$('#display');
-        if (display && display.loadConfig) {
-          display.loadConfig(config);
-        }
+        Polymer.RenderStatus.afterNextRender(this, function() {
+          var display = this.$$('#display');
+          if (display && display.loadConfig) {
+            display.loadConfig(config);
+          }
+        });
       },
 
       _handleCheckbox: function(evt) {

diff --git a/ros-rviz-options.html b/ros-rviz-options.html
@@ -128,15 +128,13 @@
 
       _updateGlobalOptions: function() {
         var that = this;
-        this.debounce('updateGlobalOptions', function() {
-          that.set('globalOptions.background', that.background);
-          that.set('globalOptions.clientId', that.clientId);
-          that.set('globalOptions.colladaLoader', that.colladaLoader);
-          that.set('globalOptions.colladaServer', that.colladaServer);
-          that.set('globalOptions.fixedFrame', that.fixedFrame);
-          that.set('globalOptions.url', that.url);
-          that.set('globalOptions.videoServer', that.videoServer);
-        }, 500);
+        that.set('globalOptions.background', that.background);
+        that.set('globalOptions.clientId', that.clientId);
+        that.set('globalOptions.colladaLoader', that.colladaLoader);
+        that.set('globalOptions.colladaServer', that.colladaServer);
+        that.set('globalOptions.fixedFrame', that.fixedFrame);
+        that.set('globalOptions.url', that.url);
+        that.set('globalOptions.videoServer', that.videoServer);
       },
     });
   </script>