diff options
| author | gorhill <rhill@raymondhill.net> | 2014-12-28 10:07:43 -0500 |
|---|---|---|
| committer | gorhill <rhill@raymondhill.net> | 2014-12-28 10:07:43 -0500 |
| commit | 1fe7045b92438cd011bcb6c6d64319907e68dbc7 (patch) | |
| tree | dcc193e339b9aeefdc0bb17956791bb4dadeabd5 /src/popup.html | |
| parent | aed66e52788f30d38e4e552ab549ff279ddeea5f (diff) | |
| download | uBlock-1fe7045b92438cd011bcb6c6d64319907e68dbc7.zip uBlock-1fe7045b92438cd011bcb6c6d64319907e68dbc7.tar.gz uBlock-1fe7045b92438cd011bcb6c6d64319907e68dbc7.tar.bz2 | |
too many changes for #433: branching so that I can commit and keep working on it
Diffstat (limited to 'src/popup.html')
| -rw-r--r-- | src/popup.html | 69 |
1 files changed, 9 insertions, 60 deletions
diff --git a/src/popup.html b/src/popup.html index e411eb2..952232f 100644 --- a/src/popup.html +++ b/src/popup.html @@ -11,9 +11,17 @@ <body> <h4 title="popupTipDashboard">v<span id="version"></span></h4> <div> + <div id="dynamicFilteringContainer"> + <div><span>images</span><span data-src="*" data-des="*" data-type="image"></span><span data-src="local" data-des="*" data-type="image"></span></div> + <div><span>inline scripts</span><span data-src="*" data-des="*" data-type="inline-script"></span><span data-src="local" data-des="*" data-type="inline-script"></span></div> + <div><span>1st-party scripts</span><span data-src="*" data-des="*" data-type="1p-script"></span><span data-src="local" data-des="*" data-type="1p-script"></span></div> + <div><span>3rd-party scripts</span><span data-src="*" data-des="*" data-type="3p-script"></span><span data-src="local" data-des="*" data-type="3p-script"></span></div> + <div><span>3rd-party frames</span><span data-src="*" data-des="*" data-type="3p-frame"></span><span data-src="local" data-des="*" data-type="3p-frame"></span></div> + </div> +</div><!-- DO NOT REMOVE --><div> <p id="switch" data-i18n-tip="popupPowerSwitchInfo"><span class="fa"></span></p> <p id="switch-hint"></p> - <p style="font-size: 16px;" data-i18n="popupBlockedRequestPrompt"></p> + <p id="dynamicFilteringToggler" data-i18n="popupBlockedRequestPrompt"></p> <p id="stats"> <span data-i18n="popupBlockedOnThisPagePrompt"></span>  <span id="gotoPick" class="fa tool" data-i18n-tip="popupTipPicker" data-tip-anchor="top"></span>  @@ -24,65 +32,6 @@ <p id="total-blocked">?</p> </div> -<div id="dynamicFilteringToggler" class="fa"> - <div></div> - <div></div> - <div></div> - <div></div> - <a href="https://github.com/gorhill/uBlock/wiki/Dynamic-filtering" target="_blank">?</a> - </div> - - -<div id="dynamicFilteringContainer"> - <div class="dynamicFiltering local" data-scope="."> - <div data-first-party data-type="inline-script"> - <div class="tip" data-i18n="popupSiteInlineScriptEnabled"></div> - <div class="tip" data-i18n="popupSiteInlineScriptDisabled"></div> - </div> - <div data-first-party data-type="script"> - <div class="tip" data-i18n="popupSite1pScriptEnabled"></div> - <div class="tip" data-i18n="popupSite1pScriptDisabled"></div> - </div> - <div data-type="script"> - <div class="tip" data-i18n="popupSite3pScriptEnabled"></div> - <div class="tip" data-i18n="popupSite3pScriptDisabled"></div> - </div> - <div data-first-party data-type="sub_frame"> - <div class="tip" data-i18n="popupSite1pFrameEnabled"></div> - <div class="tip" data-i18n="popupSite1pFrameDisabled"></div> - </div> - <div data-type="sub_frame"> - <div class="tip" data-i18n="popupSite3pFrameEnabled"></div> - <div class="tip" data-i18n="popupSite3pFrameDisabled"></div> - </div> - <div class="label"><script></div> - <div class="label"><iframe></div> - </div> - <div class="dynamicFiltering global" data-scope="/"> - <div data-first-party data-type="inline-script"> - <div class="tip" data-i18n="popupDefaultInlineScriptEnabled"></div> - <div class="tip" data-i18n="popupDefaultInlineScriptDisabled"></div> - </div> - <div data-first-party data-type="script"> - <div class="tip" data-i18n="popupDefault1pScriptEnabled"></div> - <div class="tip" data-i18n="popupDefault1pScriptDisabled"></div> - </div> - <div data-type="script"> - <div class="tip" data-i18n="popupDefault3pScriptEnabled"></div> - <div class="tip" data-i18n="popupDefault3pScriptDisabled"></div> - </div> - <div data-first-party data-type="sub_frame"> - <div class="tip" data-i18n="popupDefault1pFrameEnabled"></div> - <div class="tip" data-i18n="popupDefault1pFrameDisabled"></div> - </div> - <div data-type="sub_frame"> - <div class="tip" data-i18n="popupDefault3pFrameEnabled"></div> - <div class="tip" data-i18n="popupDefault3pFrameDisabled"></div> - </div> - <div class="label"><script></div> - <div class="label"><iframe></div> - </div> - </div> <script src="js/vapi-common.js"></script> <script src="js/vapi-client.js"></script> <script src="js/udom.js"></script> |