clipperz/password-manager-mirror
1
0
Fork 0
mirror of http://git.whoc.org.uk/git/password-manager.git synced 2025-01-10 07:20:04 +01:00
Code Issues Releases Wiki Activity

Fixed add card behaviour when in ‘compact’ mode

Browse Source
This commit is contained in:
Giulio Cesare Solaroli 2015-02-03 18:23:30 +01:00
parent 98425821ed
commit 34bf41228d
1 changed files with 40 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
frontend/delta/js/Clipperz/PM/UI/MainController.js
View File

@ -1133,20 +1133,30 @@ console.log("THE BROWSER IS OFFLINE");
} }
}, },
selectCard: function (someInfo, shouldUpdateCardDetail) {
var result;
if (this.userAccountInfo()['featureSet'] != 'EXPIRED') {
this._selectedCardInfo = someInfo;
this.refreshSelectedCards();
result = this.updateSelectedCard(someInfo, true, shouldUpdateCardDetail);
// # TODO: make the selected element visible;
// this may not always be the case, as selection can also be changed using keys.
// MochiKit.Visual.ScrollTo(MochiKit.DOM.getElement("xxx"));
} else {
result = MochiKit.Async.succeed();
};
return result;
},
resetSelectedCard: function () { resetSelectedCard: function () {
this._selectedCardInfo = null; this._selectedCardInfo = null;
}, },
selectCard_handler: function (someInfo, shouldUpdateCardDetail) { selectCard_handler: function (someInfo, shouldUpdateCardDetail) {
if (this.userAccountInfo()['featureSet'] != 'EXPIRED') { this.selectCard(someInfo, shouldUpdateCardDetail);
this._selectedCardInfo = someInfo;
this.refreshSelectedCards();
this.updateSelectedCard(someInfo, true, shouldUpdateCardDetail);
// # TODO: make the selected element visible;
// this may not always be the case, as selection can also be changed using keys.
// MochiKit.Visual.ScrollTo(MochiKit.DOM.getElement("xxx"));
}
}, },
refreshCardEditDetail_handler: function (aRecordReference) { refreshCardEditDetail_handler: function (aRecordReference) {
@ -1212,7 +1222,13 @@ console.log("THE BROWSER IS OFFLINE");
} }
this.updateSelectedCard(info, false, true); this.updateSelectedCard(info, false, true);
}, this) }, this),
MochiKit.Base.bind(function () {
if ((wasBrandNew == true) && (this.currentPage() == 'cardDetailPage')) {
this.goBackToMainPage();
}
},this),
], {trace:false}); ], {trace:false});
}, },
@ -1244,13 +1260,23 @@ console.log("THE BROWSER IS OFFLINE");
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
addCardClick_handler: function () { addCardClick_handler: function () {
var newRecordReference;
return Clipperz.Async.callbacks("MainController.addCardClick_handler", [ return Clipperz.Async.callbacks("MainController.addCardClick_handler", [
MochiKit.Base.method(this.user(), 'createNewRecord'), MochiKit.Base.method(this.user(), 'createNewRecord'),
MochiKit.Base.methodcaller('reference'), MochiKit.Base.methodcaller('reference'),
// MochiKit.Base.method(this, 'selectCard'),
function (aValue) {
newRecordReference = aValue;
// return {'reference': newRecordReference, 'label': ""};
return newRecordReference;
},
MochiKit.Base.method(this, 'refreshUI'), MochiKit.Base.method(this, 'refreshUI'),
// MochiKit.Base.bind(function () { MochiKit.Base.bind(function () {
// this.pages()[this.currentPage()].setProps({'mode': 'edit'}); return this.selectCard({
// }, this), 'reference': newRecordReference,
'label': ""
}, true);
}, this),
MochiKit.Base.method(this, 'enterEditMode'), MochiKit.Base.method(this, 'enterEditMode'),
], {trace:false}); ], {trace:false});
}, },
@ -1479,6 +1505,7 @@ console.log("THE BROWSER IS OFFLINE");
focusOnSearch: function (anEvent) { focusOnSearch: function (anEvent) {
anEvent.preventDefault(); anEvent.preventDefault();
MochiKit.Signal.signal(Clipperz.Signal.NotificationCenter, 'toggleSelectionPanel'); MochiKit.Signal.signal(Clipperz.Signal.NotificationCenter, 'toggleSelectionPanel');
MochiKit.DOM.getElement('searchValue').focus(); MochiKit.DOM.getElement('searchValue').focus();
MochiKit.DOM.getElement('searchValue').select(); MochiKit.DOM.getElement('searchValue').select();