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

Side by Side Diff: compiled/bindings/main.cpp

Issue 29574665: Issue 5159 - Expose collapse property for BlockingFilter (Closed) Base URL: https://hg.adblockplus.org/adblockpluscore/
Patch Set: Fix test Created Nov. 21, 2017, 5:42 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 | compiled/filter/BlockingFilter.h » ('j') | 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-present eyeo GmbH 3 * Copyright (C) 2006-present 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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 .property("lastHit", &ActiveFilter::GetLastHit, &ActiveFilter::SetLastHi t) 67 .property("lastHit", &ActiveFilter::GetLastHit, &ActiveFilter::SetLastHi t)
68 .function("isActiveOnDomain", &ActiveFilter::IsActiveOnDomain) 68 .function("isActiveOnDomain", &ActiveFilter::IsActiveOnDomain)
69 .function("isActiveOnlyOnDomain", &ActiveFilter::IsActiveOnlyOnDomain) 69 .function("isActiveOnlyOnDomain", &ActiveFilter::IsActiveOnlyOnDomain)
70 .function("isGeneric", &ActiveFilter::IsGeneric) 70 .function("isGeneric", &ActiveFilter::IsGeneric)
71 .function("serialize", &ActiveFilter::Serialize); 71 .function("serialize", &ActiveFilter::Serialize);
72 72
73 class_<RegExpFilter,ActiveFilter>("RegExpFilter") 73 class_<RegExpFilter,ActiveFilter>("RegExpFilter")
74 .function("matches", &RegExpFilter::Matches); 74 .function("matches", &RegExpFilter::Matches);
75 75
76 class_<BlockingFilter,RegExpFilter>("BlockingFilter") 76 class_<BlockingFilter,RegExpFilter>("BlockingFilter")
77 .class_property("type", "'blocking'"); 77 .class_property("type", "'blocking'")
78 .property("collapse", &BlockingFilter::GetCollapse);
79
78 80
79 class_<WhitelistFilter,RegExpFilter>("WhitelistFilter") 81 class_<WhitelistFilter,RegExpFilter>("WhitelistFilter")
80 .class_property("type", "'whitelist'"); 82 .class_property("type", "'whitelist'");
81 83
82 class_<ElemHideBase,ActiveFilter>("ElemHideBase") 84 class_<ElemHideBase,ActiveFilter>("ElemHideBase")
83 .property("selector", &ElemHideBase::GetSelector) 85 .property("selector", &ElemHideBase::GetSelector)
84 .property("selectorDomain", &ElemHideBase::GetSelectorDomain); 86 .property("selectorDomain", &ElemHideBase::GetSelectorDomain);
85 87
86 class_<ElemHideFilter,ElemHideBase>("ElemHideFilter") 88 class_<ElemHideFilter,ElemHideBase>("ElemHideFilter")
87 .class_property("type", "'elemhide'"); 89 .class_property("type", "'elemhide'");
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 } 150 }
149 catch (const std::exception& e) 151 catch (const std::exception& e)
150 { 152 {
151 EM_ASM_ARGS( 153 EM_ASM_ARGS(
152 console.error("Error occurred generating JavaScript bindings: " + 154 console.error("Error occurred generating JavaScript bindings: " +
153 Module.AsciiToString($0)), e.what() 155 Module.AsciiToString($0)), e.what()
154 ); 156 );
155 return 1; 157 return 1;
156 } 158 }
157 } 159 }
OLDNEW
« no previous file with comments | « no previous file | compiled/filter/BlockingFilter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld