1 files changed, 10 insertions, 13 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 1ab2e69..3d9d6d3 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/AppController.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/AppController.js
@@ -1,118 +1,116 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Controllers');
 
 Clipperz.PM.UI.Web.Controllers.AppController = function(args) {
 
         this._user = null;
         this._tabSlotNames = {
                         //tabName:       slotName
                         'cards':        'cardGrid',
         //              'directLogins':'directLoginGrid',
                         'account':      'accountPanel',
                         'data':                 'dataPanel',
                         'tools':        'toolsPanel'
         };
         
         //controllers
                 this._cardsController= null;
         //this._directLoginsController = null;
                 this._filterController  = null;                 //new Clipperz.PM.UI.Web.Controllers.FilterController();
         
         //components
         this._appPage = null;
         this._userInfoBox = null;
         this._tabSidePanel = null;
 
         //      MochiKit.Signal.connect(Clipperz.Signal.NotificationCenter, 'editCard',         this, 'handleEditCard');
         //      MochiKit.Signal.connect(Clipperz.Signal.NotificationCenter, 'deleteCard',this, 'handleDeleteCard');
 
                 MochiKit.Signal.connect(Clipperz.Signal.NotificationCenter, 'userDataSuccessfullySaved',this, 'userDataSuccessfullySavedHandler');
 
         return this;
 }
 
 MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.AppController.prototype, {
 
         'toString': function() {
                 return "Clipperz.PM.UI.Web.Controllers.AppController";
         },
 
         //-----------------------------------------------------------------------------
         
         'setUser': function(anUser) {
                 this._user = anUser;
         },
         
         'user': function() {
                 return this._user;
         },
 
         //-----------------------------------------------------------------------------
         /*
         'tabSlotNames': function() {
                 return this._tabSlotNames;
         },
 */
         'slotNameForTab': function(aTabName) {
                 return this._tabSlotNames[aTabName];
         },
         
         'hideAllAppPageTabSlots': function() {
                 var aTabName;
                 
                 for (aTabName in this._tabSlotNames) {
                         this.appPage().hideSlot(this.slotNameForTab(aTabName));
                 }
         },
         
         //-----------------------------------------------------------------------------
 
         'appPage': function() {
                 if (this._appPage == null) {
                         this._appPage = new Clipperz.PM.UI.Web.Components.AppPage();
                 }
                 
                 return this._appPage;
         },
 
         //-----------------------------------------------------------------------------
 
         'tabSidePanel': function() {
                 if (this._tabSidePanel == null) {
                         this._tabSidePanel = new Clipperz.PM.UI.Web.Components.TabSidePanel();
                 }
                 
                 return this._tabSidePanel;
         },
 
         //-----------------------------------------------------------------------------
 
         'userInfoBox': function() {
                 if (this._userInfoBox == null) {
                         this._userInfoBox = new Clipperz.PM.UI.Web.Components.UserInfoBox();
                         
                                 MochiKit.Signal.connect(this._userInfoBox, 'logout',this, 'handleLogout');
@@ -231,121 +229,120 @@ MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.AppController.prototype, {
                 this.hideAllAppPageTabSlots();
                 this.appPage().showSlot(this.slotNameForTab('cards'));
                 
                         MochiKit.Signal.connect(this.tabSidePanel(),                            'tabSelected',          this, 'handleTabSelected');
                         MochiKit.Signal.connect(this.tabSidePanel(),                            'addCard',                      this, 'handleAddCard');
                         MochiKit.Signal.connect(Clipperz.Signal.NotificationCenter, 'addCard',                  this, 'handleAddCard');
 
                         MochiKit.Signal.connect(Clipperz.Signal.NotificationCenter, 'downloadOfflineCopy',this, 'handleDownloadOfflineCopy');
 
                 deferredResult = new Clipperz.Async.Deferred("AppController.run", {trace:false});
 
                 deferredResult.addMethod(this.cardsController(),        'run', {slot:this.appPage().slotNamed('cardGrid'), user:user});
         //      deferredResult.addMethod(this.directLoginsController(), 'run', {slot:this.appPage().slotNamed('directLoginGrid'), user:user});
                         deferredResult.addMethod(this,                                             'populateUserInfo');
                 
                 deferredResult.addCallback(MochiKit.Visual.ScrollTo, 'miscLinks', {duration:0});
                 deferredResult.addCallback(MochiKit.Signal.signal, Clipperz.Signal.NotificationCenter, 'CARDS_CONTROLLER_DID_RUN');
                 deferredResult.addMethod(this.tabSidePanel(), 'selectTab', 'cards');
                 deferredResult.callback();
         },
 
         //-----------------------------------------------------------------------------
 
         'handleTabSelected': function (selectedTabName) {
                 var aTabName;
                 var aSlotName;
                 
 //Clipperz.log(">>> AppController.handleTabSelected", selectedTabName); 
                 this.hideAllAppPageTabSlots();
                 this.appPage().showSlot(this.slotNameForTab(selectedTabName));
 
                 switch (selectedTabName) {
                         case 'cards':
                                 this.cardsController().focus();
                                 break;
         //              case 'directLogins':
         //                      this.directLoginsController().focus();
         //                      break;
                         case 'data':
                                 break;
                         case 'account':
                                 break;
                         case 'tools':
                                 break;
                 }
 //Clipperz.log("<-- AppController.handleTabSelected", aTabName);
         },
         
         //=============================================================================
 
         'handleAddCard': function (aSourceElement) {
 //Clipperz.log("=== AppController.addCard", aSourceElement);
                 this.cardsController().addCard(aSourceElement);
         },
 
         //=============================================================================
 
         'userDataSuccessfullySavedHandler': function (anEvent) {
                 this.populateUserInfo();
         },
 
         //=============================================================================
 
         'handleLogout': function(anEvent) {
                 var deferredResult;
 
                 deferredResult = new Clipperz.Async.Deferred("AppController.handleLogout", {trace:false});
                 deferredResult.addMethod(this.user(), 'logout');
                 deferredResult.addCallback(MochiKit.Signal.signal, this, 'logout');
                 deferredResult.callback();
                 
                 return deferredResult;
         },
 
         //-----------------------------------------------------------------------------
 
         'handleLock': function (anEvent) {
                 return Clipperz.Async.callbacks("AppController.handleLock", [
                         MochiKit.Base.method(this.cardsController(), 'deleteAllCleanTextData'),
                         MochiKit.Base.method(this.user(), 'lock')
                 ], {trace:false});
         },
 
         //.............................................................................
 
         'handleUnlock': function (anEvent) {
                 return Clipperz.Async.callbacks("AppController.handleUnock", [
                         MochiKit.Base.partial(MochiKit.Signal.signal, Clipperz.Signal.NotificationCenter, 'initProgress'),
                         MochiKit.Base.method(this.user(), 'login'),
                         MochiKit.Base.method(this.cardsController(), 'focus'),
                         MochiKit.Base.partial(MochiKit.Signal.signal, Clipperz.Signal.NotificationCenter, 'progressDone'),
                         MochiKit.Base.method(this.userInfoBox(), 'unlock')
                 ], {trace:false});
         },
 
         'handleDownloadOfflineCopy': function (anEvent) {
-console.log("AppController.handleDownloadOfflineCopy");
                 var downloadHref;
                 
                 downloadHref = window.location.href.replace(/\/[^\/]*$/,'') + Clipperz_dumpUrl;
 
                 if (Clipperz_IEisBroken == true) {
                         window.open(downloadHref, "");
                 } else {
                                 vardeferredResult;
                         var newWindow;
 
                         newWindow = window.open("", "");
 
                         deferredResult = new Clipperz.Async.Deferred("AppController.handleDownloadOfflineCopy", {trace:true});
                         deferredResult.addCallback(MochiKit.Base.method(this.user().connection(), 'message'), 'echo', {'echo':"echo"});
                         deferredResult.addCallback(function(aWindow) {
                                 aWindow.location.href = downloadHref;
                         }, newWindow);
                         deferredResult.callback();
                 }
         },
 
         //=============================================================================
         __syntaxFix__: "syntax fix"
 });