From e32f30f3ba275411228d27c3ee06403c5e60e566 Mon Sep 17 00:00:00 2001 From: Giulio Cesare Solaroli Date: Wed, 23 Sep 2015 17:47:55 +0200 Subject: [PATCH] Streamlined MainController --- frontend/delta/js/Clipperz/PM/UI/MainController.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/frontend/delta/js/Clipperz/PM/UI/MainController.js b/frontend/delta/js/Clipperz/PM/UI/MainController.js index 6ed776e..34cfc6c 100644 --- a/frontend/delta/js/Clipperz/PM/UI/MainController.js +++ b/frontend/delta/js/Clipperz/PM/UI/MainController.js @@ -441,7 +441,6 @@ Clipperz.log("THE BROWSER IS OFFLINE"); deferredResult.addMethod(this, 'refreshUI'); deferredResult.addMethod(unlockPage, 'setProps', {'disabled': false}); deferredResult.addMethod(unlockPage, 'resetUnlockForm'); -// deferredResult.addMethod(this, 'resetLockTimeout'); deferredResult.addCallback(MochiKit.Signal.signal, Clipperz.Signal.NotificationCenter, 'enableLock'); deferredResult.addMethod(overlay, 'done', "", 0.5); @@ -1218,10 +1217,8 @@ Clipperz.log("THE BROWSER IS OFFLINE"); }; } - if (extraProperties != null) { - result = MochiKit.Base.update(result, extraProperties); - } -//console.log("MainController.pageProperties", result); + result = MochiKit.Base.update(result, extraProperties); + return result; },