Diffstat (limited to 'frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/AppController.js') (more/less context) (ignore whitespace changes)
-rw-r--r-- | frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/AppController.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/AppController.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/AppController.js index 3d9d6d3..1448dee 100644 --- a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/AppController.js +++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/AppController.js | |||
@@ -289,60 +289,60 @@ MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.AppController.prototype, { | |||
289 | 289 | ||
290 | //============================================================================= | 290 | //============================================================================= |
291 | 291 | ||
292 | 'handleLogout': function(anEvent) { | 292 | 'handleLogout': function(anEvent) { |
293 | var deferredResult; | 293 | var deferredResult; |
294 | 294 | ||
295 | deferredResult = new Clipperz.Async.Deferred("AppController.handleLogout", {trace:false}); | 295 | deferredResult = new Clipperz.Async.Deferred("AppController.handleLogout", {trace:false}); |
296 | deferredResult.addMethod(this.user(), 'logout'); | 296 | deferredResult.addMethod(this.user(), 'logout'); |
297 | deferredResult.addCallback(MochiKit.Signal.signal, this, 'logout'); | 297 | deferredResult.addCallback(MochiKit.Signal.signal, this, 'logout'); |
298 | deferredResult.callback(); | 298 | deferredResult.callback(); |
299 | 299 | ||
300 | return deferredResult; | 300 | return deferredResult; |
301 | }, | 301 | }, |
302 | 302 | ||
303 | //----------------------------------------------------------------------------- | 303 | //----------------------------------------------------------------------------- |
304 | 304 | ||
305 | 'handleLock': function (anEvent) { | 305 | 'handleLock': function (anEvent) { |
306 | return Clipperz.Async.callbacks("AppController.handleLock", [ | 306 | return Clipperz.Async.callbacks("AppController.handleLock", [ |
307 | MochiKit.Base.method(this.cardsController(), 'deleteAllCleanTextData'), | 307 | MochiKit.Base.method(this.cardsController(), 'deleteAllCleanTextData'), |
308 | MochiKit.Base.method(this.user(), 'lock') | 308 | MochiKit.Base.method(this.user(), 'lock') |
309 | ], {trace:false}); | 309 | ], {trace:false}); |
310 | }, | 310 | }, |
311 | 311 | ||
312 | //............................................................................. | 312 | //............................................................................. |
313 | 313 | ||
314 | 'handleUnlock': function (anEvent) { | 314 | 'handleUnlock': function (anEvent) { |
315 | return Clipperz.Async.callbacks("AppController.handleUnock", [ | 315 | return Clipperz.Async.callbacks("AppController.handleUnock", [ |
316 | MochiKit.Base.partial(MochiKit.Signal.signal, Clipperz.Signal.NotificationCenter, 'initProgress'), | 316 | MochiKit.Base.partial(MochiKit.Signal.signal, Clipperz.Signal.NotificationCenter, 'initProgress'), |
317 | MochiKit.Base.method(this.user(), 'login'), | 317 | MochiKit.Base.method(this.user(), 'login'), |
318 | MochiKit.Base.method(this.cardsController(), 'focus'), | 318 | MochiKit.Base.method(this.cardsController(), 'focus'), |
319 | MochiKit.Base.partial(MochiKit.Signal.signal, Clipperz.Signal.NotificationCenter, 'progressDone'), | 319 | MochiKit.Base.partial(MochiKit.Signal.signal, Clipperz.Signal.NotificationCenter, 'progressDone'), |
320 | MochiKit.Base.method(this.userInfoBox(), 'unlock') | 320 | MochiKit.Base.method(this.userInfoBox(), 'unlock') |
321 | ], {trace:false}); | 321 | ], {trace:false}); |
322 | }, | 322 | }, |
323 | 323 | ||
324 | 'handleDownloadOfflineCopy': function (anEvent) { | 324 | 'handleDownloadOfflineCopy': function (anEvent) { |
325 | var downloadHref; | 325 | var downloadHref; |
326 | 326 | ||
327 | downloadHref = window.location.href.replace(/\/[^\/]*$/,'') + Clipperz_dumpUrl; | 327 | downloadHref = window.location.href.replace(/\/[^\/]*$/,'') + Clipperz_dumpUrl; |
328 | 328 | ||
329 | if (Clipperz_IEisBroken == true) { | 329 | if (Clipperz_IEisBroken == true) { |
330 | window.open(downloadHref, ""); | 330 | window.open(downloadHref, ""); |
331 | } else { | 331 | } else { |
332 | vardeferredResult; | 332 | vardeferredResult; |
333 | var newWindow; | 333 | var newWindow; |
334 | 334 | ||
335 | newWindow = window.open("", ""); | 335 | newWindow = window.open("", ""); |
336 | 336 | ||
337 | deferredResult = new Clipperz.Async.Deferred("AppController.handleDownloadOfflineCopy", {trace:true}); | 337 | deferredResult = new Clipperz.Async.Deferred("AppController.handleDownloadOfflineCopy", {trace:false}); |
338 | deferredResult.addCallback(MochiKit.Base.method(this.user().connection(), 'message'), 'echo', {'echo':"echo"}); | 338 | deferredResult.addCallback(MochiKit.Base.method(this.user().connection(), 'message'), 'echo', {'echo':"echo"}); |
339 | deferredResult.addCallback(function(aWindow) { | 339 | deferredResult.addCallback(function(aWindow) { |
340 | aWindow.location.href = downloadHref; | 340 | aWindow.location.href = downloadHref; |
341 | }, newWindow); | 341 | }, newWindow); |
342 | deferredResult.callback(); | 342 | deferredResult.callback(); |
343 | } | 343 | } |
344 | }, | 344 | }, |
345 | 345 | ||
346 | //============================================================================= | 346 | //============================================================================= |
347 | __syntaxFix__: "syntax fix" | 347 | __syntaxFix__: "syntax fix" |
348 | }); | 348 | }); |