clipperz/password-manager-mirror
1
0
Fork 0
mirror of http://git.whoc.org.uk/git/password-manager.git synced 2025-01-25 02:01:32 +01:00
Code Issues Releases Wiki Activity

Basic implementation of search feature

Browse Source
This commit is contained in:
Giulio Cesare Solaroli 2014-09-22 16:53:44 +02:00
parent f42c469663
commit 093d5e7965
4 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/delta/js/Clipperz/PM/UI/Components/Panels/MainPanel.js
View File

@ -156,8 +156,8 @@ Clipperz.PM.UI.Components.Panels.MainPanel = React.createClass({
result = this.renderWide(); result = this.renderWide();
} else if (aLayout == 'narrow') { } else if (aLayout == 'narrow') {
result = this.renderNarrow(); result = this.renderNarrow();
} else if (aLayout == 'extra-short') { // } else if (aLayout == 'extra-short') {
result = this.renderNarrow(); // result = this.renderNarrow();
} else { } else {
Clipperz.Base.exception.raise('UnknownType'); Clipperz.Base.exception.raise('UnknownType');
} }

25
frontend/delta/js/Clipperz/PM/UI/Components/Selections.js
View File

@ -48,27 +48,36 @@ Clipperz.PM.UI.Components.Selections = React.createClass({
} }
}, },
handleSearchChange: function (anEvent) {
MochiKit.Signal.signal(Clipperz.Signal.NotificationCenter, 'search', anEvent.currentTarget.value);
},
render: function () { render: function () {
var tagInfo; var tagInfo;
var tags; var tags;
var archivedCardsCount; var archivedCardsCount;
var selectedCardCount;
var filterType;
tagInfo = this.props['tags'] ? this.props['tags'] : {}; tagInfo = this.props['tags'] ? this.props['tags'] : {};
tags = MochiKit.Base.filter(Clipperz.PM.DataModel.Record.isRegularTag, MochiKit.Base.keys(tagInfo)).sort(Clipperz.Base.caseInsensitiveCompare); tags = MochiKit.Base.filter(Clipperz.PM.DataModel.Record.isRegularTag, MochiKit.Base.keys(tagInfo)).sort(Clipperz.Base.caseInsensitiveCompare);
// archivedCardsCount = tagInfo[Clipperz.PM.DataModel.Record.archivedTag] ? tagInfo[Clipperz.PM.DataModel.Record.archivedTag] : 0;
archivedCardsCount = this.props['archivedCardsCount']; archivedCardsCount = this.props['archivedCardsCount'];
selectedCardCount = this.props['cards'] ? this.props['cards'].length : 0;
filterType = (this.props['filter'] && this.props['filter']['type']) ? this.props['filter']['type'] : 'ALL';
return React.DOM.div({'key':'selections', 'id':'selections'}, [ return React.DOM.div({'key':'selections', 'id':'selections', 'className':filterType}, [
React.DOM.ul({'className':'defaultSet'}, [ React.DOM.ul({'className':'defaultSet'}, [
React.DOM.li({'className':'allCards', onClick: this.selectAll}, "All"), React.DOM.li({'className':'allCards', 'onClick': this.selectAll}, "All"),
React.DOM.li({'className':'recentCards', onClick: this.selectRecent}, "Recent"), React.DOM.li({'className':'recentCards', 'onClick': this.selectRecent}, "Recent"),
React.DOM.li({'className':'untaggedCards', onClick: this.selectUntaggedCards}, "Untagged - " + this.props['untaggedCardsCount']) React.DOM.li({'className':'untaggedCards', 'onClick': this.selectUntaggedCards}, "Untagged - " + this.props['untaggedCardsCount'])
]), ]),
React.DOM.div({'className':'search'}, [ React.DOM.div({'className':'search'}, [
React.DOM.form({'className':'searchForm'}, [ React.DOM.form({'className':'searchForm'}, [
React.DOM.label({'htmlFor':'searchValue'}, 'search'), React.DOM.div({}, [
React.DOM.input({'type':'text', 'id':'searchValue', 'name':'search'}) React.DOM.label({'htmlFor':'searchValue'}, 'search'),
React.DOM.input({'type':'text', 'id':'searchValue', 'onFocus':this.handleSearchChange, 'onChange':this.handleSearchChange, 'name':'search'})
]),
React.DOM.div({}, [ React.DOM.span({'className':'count'}, selectedCardCount) ])
]) ])
]), ]),
React.DOM.ul({'className':'tagList'}, MochiKit.Base.map(function (aTag) {return Clipperz.PM.UI.Components.TagIndexItem({'label':aTag, 'count':tagInfo[aTag]}); }, tags)), React.DOM.ul({'className':'tagList'}, MochiKit.Base.map(function (aTag) {return Clipperz.PM.UI.Components.TagIndexItem({'label':aTag, 'count':tagInfo[aTag]}); }, tags)),

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

@ -59,7 +59,7 @@ Clipperz.PM.UI.MainController = function() {
'doLogin', 'registerNewUser', 'showRegistrationForm', 'goBack', 'doLogin', 'registerNewUser', 'showRegistrationForm', 'goBack',
'toggleSelectionPanel', 'toggleSettingsPanel', 'toggleSelectionPanel', 'toggleSettingsPanel',
'matchMediaQuery', 'unmatchMediaQuery', 'matchMediaQuery', 'unmatchMediaQuery',
'selectAllCards', 'selectRecentCards', 'tagSelected', 'selectUntaggedCards', 'selectAllCards', 'selectRecentCards', 'search', 'tagSelected', 'selectUntaggedCards',
'refreshCardEditDetail', 'refreshCardEditDetail',
// 'refreshCardEditToolbar', // 'refreshCardEditToolbar',
'saveCardEdits', 'cancelCardEdits', 'saveCardEdits', 'cancelCardEdits',
@ -1146,6 +1146,17 @@ console.log("SET USER", aUser);
return this.refreshSelectedCards(); return this.refreshSelectedCards();
}, },
search_handler: function (aValue) {
//console.log("SEARCH", aValue);
if (aValue == "") {
this.setFilter('ALL');
} else {
this.setFilter('SEARCH', aValue);
}
return this.refreshSelectedCards();
},
tagSelected_handler: function (aTag) { tagSelected_handler: function (aTag) {
this.setFilter('TAG', aTag); this.setFilter('TAG', aTag);
return this.refreshSelectedCards(); return this.refreshSelectedCards();

3
frontend/delta/scss/core/sizes.scss
View File

@ -41,7 +41,7 @@ This configuration is now located in the first script included in the index_temp
content: "extra-wide"; content: "extra-wide";
} }
} }
/*
@media only screen and (min-width: 100px) and (max-height: 450px) { @media only screen and (min-width: 100px) and (max-height: 450px) {
html { html {
font-family: "extra-short"; font-family: "extra-short";
@ -50,3 +50,4 @@ This configuration is now located in the first script included in the index_temp
content: "extra-short"; content: "extra-short";
} }
} }
*/