Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: chrome/content/ui/filters-filterview.js

Issue 29329848: Issue 3129/3144 - Don`t let the findbar intercept keyboard events when editing filters (Closed)
Patch Set: Created Nov. 6, 2015, 8:30 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-2015 Eyeo GmbH 3 * Copyright (C) 2006-2015 Eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 644 matching lines...) Expand 10 before | Expand all | Expand 10 after
655 this.atoms[atom + "-false"] = atomService.getAtom(atom + "-false"); 655 this.atoms[atom + "-false"] = atomService.getAtom(atom + "-false");
656 } 656 }
657 657
658 let columns = this.boxObject.columns; 658 let columns = this.boxObject.columns;
659 for (let i = 0; i < columns.length; i++) 659 for (let i = 0; i < columns.length; i++)
660 if (columns[i].element.hasAttribute("sortDirection")) 660 if (columns[i].element.hasAttribute("sortDirection"))
661 this.sortBy(columns[i].id, columns[i].element.getAttribute("sortDirect ion")); 661 this.sortBy(columns[i].id, columns[i].element.getAttribute("sortDirect ion"));
662 662
663 this.refresh(true); 663 this.refresh(true);
664 } 664 }
665
666 // Stop propagation of keypress events so that these aren't intercepted by
667 // the findbar.
668 this.treeElement.inputField.addEventListener("keypress", event => {
669 event.stopPropagation()
Thomas Greiner 2015/11/09 14:43:41 Detail: Missing semicolon.
Wladimir Palant 2015/11/09 15:03:49 Fixed in the patch I pushed.
670 }, false);
665 }, 671 },
666 672
667 selection: null, 673 selection: null,
668 674
669 get rowCount() this.data.length, 675 get rowCount() this.data.length,
670 676
671 getCellText: function(row, col) 677 getCellText: function(row, col)
672 { 678 {
673 if (row < 0 || row >= this.data.length) 679 if (row < 0 || row >= this.data.length)
674 return null; 680 return null;
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
828 getProgressMode: () => null, 834 getProgressMode: () => null,
829 getImageSrc: () => null, 835 getImageSrc: () => null,
830 isSeparator: () => false, 836 isSeparator: () => false,
831 performAction: () => {}, 837 performAction: () => {},
832 performActionOnRow: () => {}, 838 performActionOnRow: () => {},
833 performActionOnCell: () => {}, 839 performActionOnCell: () => {},
834 getCellValue: () => null, 840 getCellValue: () => null,
835 setCellValue: () => {}, 841 setCellValue: () => {},
836 selectionChanged: () => {} 842 selectionChanged: () => {}
837 }; 843 };
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld