浏览代码

HUE-6091 [core] Improved waitForObservable

Enrico Berti 8 年之前
父节点
当前提交
d633ee6

+ 6 - 3
desktop/core/src/desktop/static/desktop/js/hue.utils.js

@@ -287,9 +287,12 @@ if (!('addRule' in CSSStyleSheet.prototype)) {
       callback(observable);
     }
     else {
-      window.setTimeout(function () {
-        hueUtils.waitForObservable(observable, callback);
-      }, timeout || 100)
+      var subscription = observable.subscribe(function(newValue) {
+        if (newValue) {
+          subscription.remove();
+          callback(observable);
+        }
+      });
     }
   }
 

+ 1 - 3
desktop/core/src/desktop/templates/hue.mako

@@ -910,9 +910,7 @@ ${ assist.assistPanel() }
 
         page();
 
-        huePubSub.subscribe('page.route', function (path) {
-          page(path);
-        });
+        huePubSub.subscribe('page.route', page);
 
       };