mozilla
/
itisatrap
зеркало из https://github.com/mozilla/itisatrap.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge pull request #25 from bytesized/expected_per_setting 

Changed flashblocking itisatrap pages to reflect the new behavior
This commit is contained in:
Francois Marier 2017-03-30 14:06:14 -07:00 коммит произвёл GitHub
Родитель 9e565c0c9d 1426089da9
Коммит b556257e45
8 изменённых файлов: 46 добавлений и 13 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

5
css/its-a-trap.css
Просмотреть файл

@ -62,6 +62,11 @@
min-width: 0px;
}
#flashblock-frame,
#flashblock-frame * {
margin: 0px;
}
#download {
float: left;
display: inline;

2
firefox/flashblock-success-frame.html → firefox/flashblock-loaded-frame.html
Просмотреть файл

@ -9,6 +9,6 @@
</head>
<body id="flashblock-frame">
<object data="/swf/success.swf">
<object data="/swf/loaded.swf">
</body>
</html>

17
firefox/flashblock-subdocument.html
Просмотреть файл

@ -36,27 +36,36 @@
<div id="main-content">
<p>OK, not really, but Firefox can be configured to block content in subdocuments.</p>
<p>Since the results of these tests are dependent on the setting you have picked for Flash (in the Plugins tab of about:addons), there is an Expected column below for each setting.</p>
<table id="tests">
<tr>
<th>Test</th>
<th>Expected</th>
<th>Expected for<br>"Always Activate"</th>
<th>Expected for<br>"Ask to Activate"</th>
<th>Expected for<br>"Never Activate"</th>
<th>Actual</th>
</tr>
<tr>
<td>Top-Level</td>
<td><img src="/img/flash-loaded.png"></td>
<td><img src="/img/flash-cta.png"></td>
<td><object data="/swf/failure.swf"></object></td>
<td><!-- Display nothing here. Blocked plugins are not displayed --></td>
<td><object data="/swf/loaded.swf"></object></td>
</tr>
<tr>
<td>Blocked subdocument in a non-third-party context</td>
<td><img src="/img/flash-loaded.png"></td>
<td><img src="/img/flash-cta.png"></td>
<td><iframe src="/firefox/flashblock-failure-frame.html" scrolling="no" frameBorder="0" seamless='seamless'></iframe></td>
<td><!-- Display nothing here. Blocked plugins are not displayed --></td>
<td><iframe src="/firefox/flashblock-loaded-frame.html" scrolling="no" frameBorder="0" seamless='seamless'></iframe></td>
</tr>
<tr>
<td>Subdocument Block Exception</td>
<td><img src="/img/flash-loaded.png"></td>
<td><img src="/img/flash-cta.png"></td>
<td><iframe src="https://except.flashsubdoc.itisatrap.org/firefox/flashblock-failure-frame.html" scrolling="no" frameBorder="0" seamless='seamless'></iframe></td>
<td><!-- Display nothing here. Blocked plugins are not displayed --></td>
<td><iframe src="https://except.flashsubdoc.itisatrap.org/firefox/flashblock-loaded-frame.html" scrolling="no" frameBorder="0" seamless='seamless'></iframe></td>
</tr>
</table>

35
firefox/flashblock.html
Просмотреть файл

@ -36,53 +36,72 @@
<div id="main-content">
<p>OK, not really, but Firefox can be configured to block certain domains from displaying Flash content.</p>
<p>In addition to these tests, there are tests of subdocument Flash blocking <a href="https://flashsubdoc.itisatrap.org/firefox/flashblock-subdocument.html" target="_blank">here</a></p>
<p>In addition to these tests, there are tests of subdocument Flash blocking <a href="https://flashsubdoc.itisatrap.org/firefox/flashblock-subdocument.html" target="_blank">here</a>.</p>
<p>Since the results of these tests are dependent on the setting you have picked for Flash (in the Plugins tab of about:addons), there is an Expected column below for each setting.</p>
<table id="tests">
<tr>
<th>Test</th>
<th>Expected</th>
<th>Expected for<br>"Always Activate"</th>
<th>Expected for<br>"Ask to Activate"</th>
<th>Expected for<br>"Never Activate"</th>
<th>Actual</th>
</tr>
<tr>
<td>Top-Level</td>
<td><img src="/img/flash-loaded.png"></td>
<td><img src="/img/flash-cta.png"></td>
<td><object data="/swf/failure.swf"></object></td>
<td><!-- Display nothing here. Blocked plugins are not displayed --></td>
<td><object data="/swf/loaded.swf"></object></td>
</tr>
<tr>
<td>Blocked</td>
<td><!-- Display nothing here. Blocked plugins are not displayed --></td>
<td><!-- Display nothing here. Blocked plugins are not displayed --></td>
<td><!-- Display nothing here. Blocked plugins are not displayed --></td>
<td><iframe src="https://flashblock.itisatrap.org/firefox/flashblock-failure-frame.html" scrolling="no" frameBorder="0" seamless='seamless'></iframe></td>
</tr>
<tr>
<td>Block Exception</td>
<td><img src="/img/flash-loaded.png"></td>
<td><img src="/img/flash-cta.png"></td>
<td><iframe src="https://except.flashblock.itisatrap.org/firefox/flashblock-failure-frame.html" scrolling="no" frameBorder="0" seamless='seamless'></iframe></td>
<td><!-- Display nothing here. Blocked plugins are not displayed --></td>
<td><iframe src="https://except.flashblock.itisatrap.org/firefox/flashblock-loaded-frame.html" scrolling="no" frameBorder="0" seamless='seamless'></iframe></td>
</tr>
<tr>
<td>Allowed</td>
<td><img src="/img/flash-success.png"></td>
<td><iframe src="https://flashallow.itisatrap.org/firefox/flashblock-success-frame.html" scrolling="no" frameBorder="0" seamless='seamless'></iframe></td>
<td><img src="/img/flash-loaded.png"></td>
<td><img src="/img/flash-loaded.png"></td>
<td><!-- Display nothing here. Blocked plugins are not displayed --></td>
<td><iframe src="https://flashallow.itisatrap.org/firefox/flashblock-loaded-frame.html" scrolling="no" frameBorder="0" seamless='seamless'></iframe></td>
</tr>
<tr>
<td>Allow Exception</td>
<td><img src="/img/flash-loaded.png"></td>
<td><img src="/img/flash-cta.png"></td>
<td><iframe src="https://except.flashallow.itisatrap.org/firefox/flashblock-failure-frame.html" scrolling="no" frameBorder="0" seamless='seamless'></iframe></td>
<td><!-- Display nothing here. Blocked plugins are not displayed --></td>
<td><iframe src="https://except.flashallow.itisatrap.org/firefox/flashblock-loaded-frame.html" scrolling="no" frameBorder="0" seamless='seamless'></iframe></td>
</tr>
<tr>
<td>Allowed site within Blocked site</td>
<td><!-- Display nothing here. Blocked plugins are not displayed --></td>
<td><!-- Display nothing here. Blocked plugins are not displayed --></td>
<td><!-- Display nothing here. Blocked plugins are not displayed --></td>
<td><iframe src="https://flashblock.itisatrap.org/firefox/flashblock-parent-of-whitelisted-frame.html" scrolling="no" frameBorder="0" seamless='seamless'></iframe></td>
</tr>
<tr>
<td>Blocked Subdocument in Third-party context</td>
<td><!-- Display nothing here. Blocked plugins are not displayed --></td>
<td><!-- Display nothing here. Blocked plugins are not displayed --></td>
<td><!-- Display nothing here. Blocked plugins are not displayed --></td>
<td><iframe src="https://flashsubdoc.itisatrap.org/firefox/flashblock-failure-frame.html" scrolling="no" frameBorder="0" seamless='seamless'></iframe></td>
</tr>
<tr>
<td>Subdocument Block Exception</td>
<td><img src="/img/flash-loaded.png"></td>
<td><img src="/img/flash-cta.png"></td>
<td><iframe src="https://except.flashsubdoc.itisatrap.org/firefox/flashblock-failure-frame.html" scrolling="no" frameBorder="0" seamless='seamless'></iframe></td>
<td><!-- Display nothing here. Blocked plugins are not displayed --></td>
<td><iframe src="https://except.flashsubdoc.itisatrap.org/firefox/flashblock-loaded-frame.html" scrolling="no" frameBorder="0" seamless='seamless'></iframe></td>
</tr>
</table>

Двоичные данные
img/flash-loaded.png Normal file
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

После

Ширина:  |  Высота:  |  Размер: 907 B

Двоичные данные
img/flash-success.png
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

До

Ширина:  |  Высота:  |  Размер: 1.4 KiB

Двоичные данные
swf/loaded.swf Normal file
Просмотреть файл

Двоичный файл не отображается.

Двоичные данные
swf/success.swf
Просмотреть файл

Двоичный файл не отображается.