1 files changed, 10 insertions, 15 deletions

diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/DirectLoginWizardController.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/DirectLoginWizardController.js
index c025a51..92ed6e3 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/DirectLoginWizardController.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/DirectLoginWizardController.js
@@ -1,70 +1,68 @@
 /*
 
-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.DirectLoginWizardController = function(args) {
                 this._directLoginEditingComponent       = args.directLoginEditingComponent|| Clipperz.Base.exception.raise('MandatoryParameter');
                 this._cardLabel                                         = args.cardLabel                                || Clipperz.Base.exception.raise('MandatoryParameter');
 
                 MochiKit.Signal.connect(this._directLoginEditingComponent, 'changedValue',this, 'handleChangedValue');
                 MochiKit.Signal.connect(this._directLoginEditingComponent, 'moveForward',this, 'handleMoveForward');
                 MochiKit.Signal.connect(this._directLoginEditingComponent, 'keyPressed',this, 'handleDirectLoginEditingComponentKeyPressed');
 
         this._directLogin = null;
         this._directLoginHasJustBeenAdded = false;
         
         this._rulerComponent = null;
 
         this._steps = null;
         this._currentStepIndex = 0;
         this._isNextEnabled = false;
 
         this._recordFields = null;
         this._originalBindings = null;
 
         this._bindingComponents = [];
         this._formValueComponents = [];
 
         return this;
 }
 
 MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.DirectLoginWizardController.prototype, {
 
         'toString': function() {
                 return "Clipperz.PM.UI.Web.Controllers.DirectLoginWizardController";
         },
 
         //-------------------------------------------------------------------------
 
         'directLogin': function () {
                 return this._directLogin;
         },
 
         //-------------------------------------------------------------------------
 
         'directLoginHasJustBeenAdded': function () {
                 return this._directLoginHasJustBeenAdded;
         },
@@ -118,97 +116,96 @@ MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.DirectLoginWizardController.
         'resetBindingComponents': function () {
                 this.directLoginEditingComponent().clearAllBindingsComponents();
                 this._bindingComponents = [];
         },
 
         //=============================================================================
 
         'formValueComponents': function () {
                 return this._formValueComponents;
         },
 
         'resetFormValueComponents': function () {
                 this.directLoginEditingComponent().clearAllFormValueComponents();
                 this._formValueComponents = [];
         },
 
         //=============================================================================
 
         'recordFields': function () {
                 return this._recordFields;
         },
         
         'setRecordFields': function (aValue) {
                 this._recordFields = aValue;
         },
 
         'recordFieldWithReference': function (aReference) {
                 var matchingValues;
                 var result;
 
                 matchingValues = MochiKit.Base.filter(function (aField) { return aField['reference'] == aReference; }, this.recordFields());
 
                 if (matchingValues.length == 0) {
                         result = null;
                 } else {
                         result = matchingValues[0];
                 }
                 
                 return result;
         },
 
         //-----------------------------------------------------------------------------
 
         'originalBindings': function () {
                 return this._originalBindings;
         },
         
         'setOriginalBindings': function (aValue) {
-//console.log("BINDINGS", aValue);
                 this._originalBindings = aValue;
         },
 
         //=============================================================================
 
         'rulerComponent': function () {
                 if (this._rulerComponent == null) {
                         this._rulerComponent = new Clipperz.PM.UI.Web.Components.RulerComponent({
                                 translationContext:'Wizards.DirectLoginWizard'
                         });
                         this._rulerComponent.render();
                         
                                 MochiKit.Signal.connect(this._rulerComponent, 'exit',           this, 'handleExit');
                                 MochiKit.Signal.connect(this._rulerComponent, 'done',           this, 'done');
                                 MochiKit.Signal.connect(this._rulerComponent, 'moveForward',this, 'handleMoveForward');
                                 MochiKit.Signal.connect(this._rulerComponent, 'moveBackward',this, 'handleMoveBackward');
                                 MochiKit.Signal.connect(this._rulerComponent, 'cursorMoved',this, 'handleCursorMoved');
                 }
                 
                 return this._rulerComponent;
         },
 
         //-----------------------------------------------------------------------------
 
         'showRuler': function (someSteps) {
                 var rulerElement;
 
                 this.setSteps(someSteps);
 
                 rulerElement = this.rulerComponent().element();
                 this.directLoginEditingComponent().disableAllPanels();
 
                 MochiKit.Style.showElement(rulerElement);
                 MochiKit.Style.setElementPosition(rulerElement, {x:-1000, y:this.directLoginEditingComponent().bottomMargin()});
                 new MochiKit.Visual.Move(rulerElement, {
                         x:0, y:this.directLoginEditingComponent().bottomMargin(),
                         mode:'absolute',
                         duration:1,
                         afterFinish:MochiKit.Base.method(this, 'handleCursorMoved')
                 });
         },
 
         'fixRulerRendering': function (aValue) {
                 this.rulerComponent().setDisplayMode(aValue);
         },
 
         //-----------------------------------------------------------------------------
 
@@ -362,98 +359,96 @@ MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.DirectLoginWizardController.
                                 this.directLoginEditingComponent().focusOnFaviconElement();
                                 break;
                         case 'DONE':
                                 break;
                 }
         },
 
         //=============================================================================
 
         'steps': function () {
                 return this._steps;
         },
 
         'setSteps': function (aValue) {
                 this._steps = aValue;
 
                 this.rulerComponent().setSteps(aValue);
                 this.resetCurrentStepIndex();
         },
         
         'currentStepIndex': function () {
                 return this._currentStepIndex;
         },
         
         'currentStep': function () {
                 return this.steps()[this.currentStepIndex()];
         },
 
         //=============================================================================
 
         'handleExit': function () {
                 MochiKit.Signal.signal(this, 'exit');
         },
 
         'done': function () {
                 this.doneWithRuler();
 
                 Clipperz.Async.callbacks("DirectLoginWizardController.done", [
                         MochiKit.Base.method(this.directLoginEditingComponent(), 'label'),
                         MochiKit.Base.method(this.directLogin(), 'setLabel'),
                         
                         MochiKit.Base.method(this.directLoginEditingComponent(), 'bookmarkletConfiguration'),
                         MochiKit.Base.method(this.directLogin(), 'setBookmarkletConfiguration'),
 
                                 //Bindings
                         MochiKit.Base.method(this.directLoginEditingComponent(), 'bindingComponents'),
         //              MochiKit.Base.partial(MochiKit.Base.map, MochiKit.Base.bind(function (aBindingComponent) {
                         Clipperz.Async.forEach(MochiKit.Base.bind(function (aBindingComponent) {
-//console.log("aBindingComponent", aBindingComponent);
-        //                      this.directLogin().
                                 return Clipperz.Async.callbacks("DirectLoginWizardController.done - update directLogin bindings", [
                                         MochiKit.Base.method(this.directLogin(), 'bindings'),
                                         MochiKit.Base.itemgetter(aBindingComponent.formFieldName()),
                                         MochiKit.Base.methodcaller('setFieldKey', aBindingComponent.selectedValue())
                                 ], {trace:false});
                         }, this)),
 
                         MochiKit.Base.method(this.directLoginEditingComponent(), 'favicon'),
                         MochiKit.Base.method(this.directLogin(), 'setFavicon'),
                         
                         MochiKit.Base.partial(MochiKit.Signal.signal, this, 'done', {
                                         'directLogin':  this.directLogin(),
                                         'hasJustBeenAdded':this.directLoginHasJustBeenAdded()
                         })
                 ], {trace:false});
         },
         
         //=============================================================================
 
         'handleMoveBackward': function () {
                 if (this._currentStepIndex > 0) {
                                 varafterMoveAction;
 
                         this._currentStepIndex --;
                         afterMoveAction = MochiKit.Base.noop;
 
                         switch(this.currentStep()) {
                                 case 'LABEL':
                                         break;
                                 case 'TYPE':
                                         break;
                                 case 'CONFIGURATION':
                                         break;
                                 case 'BINDINGS':
                                         break;
                                 case 'FAVICON':
                                         break;
                                 case 'DONE':
                                         break;
                         };
 
                         this.rulerComponent().moveBackward(afterMoveAction);
                 }
                 
                 if (this._currentStepIndex == 0) {
                         this.enablePrevious(false);
                 }
         },