Delta Between Two Patch Sets: templates/frame.tmpl
Issue 29328600:
Issue 3122 - Add sitekey frame files ready for sitekey testcases (Closed)
Left Patch Set: Set data-adblockkey attribute of html element
Created Oct. 8, 2015, 12:32 p.m.
Right Patch Set: Attempt to make frame URL logic clearer
Created Oct. 13, 2015, 11:28 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« static/site.key ('k')
|
templates/sitekey_frame.tmpl » ('j')
|
templates/sitekey_frame.tmpl » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| LEFT | RIGHT |
|---|---|
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
| 2 <html{% if public_key and signature %} data-adblockkey="{{ public_key + "_" + si gnature }}"{% endif %}> | 2 <html{% if public_key and signature %} data-adblockkey="{{ public_key + "_" + si gnature }}"{% endif %}> |
| 3 <head> | 3 <head> |
| 4 <title>{{ title }}</title> | 4 <title>{{ title }}</title> |
| 5 <style> | 5 <style> |
| 6 html, body { margin: 0; height: 100%; } | 6 html, body { margin: 0; height: 100%; } |
| 7 #iframe { display: block; width: 100%; height: 100%; border: none; } | 7 #iframe { display: block; width: 100%; height: 100%; border: none; } |
| 8 </style> | 8 </style> |
| 9 {{ head|safe }} | 9 {{ head|safe }} |
| 10 </head> | 10 </head> |
| 11 <body> | 11 <body> |
| 12 <iframe id="iframe"></iframe> | 12 <iframe id="iframe"></iframe> |
| 13 | 13 |
| 14 {% block body %}{{ body|safe }}{% endblock %} | 14 {% block body %}{{ body|safe }}{% endblock %} |
| 15 | 15 |
| 16 <script type="text/javascript"> | 16 <script type="text/javascript"> |
| 17 var iframe = document.getElementById("iframe") | 17 var iframe = document.getElementById("iframe") |
| 18 | 18 |
| 19 function update_iframe_location() | 19 function update_iframe_location() |
| 20 { | 20 { |
| 21 if (window.location.hash) | 21 if (window.location.hash) |
| 22 iframe.src = transform_url(window.location.href, | 22 iframe.src = frame_url(window.location); |
| 23 window.location.hash); | |
| 24 } | 23 } |
| 25 window.addEventListener("hashchange", update_iframe_location); | 24 window.addEventListener("hashchange", update_iframe_location); |
| 26 update_iframe_location(); | 25 update_iframe_location(); |
| 27 </script> | 26 </script> |
| 28 </body> | 27 </body> |
| 29 </html> | 28 </html> |
| LEFT | RIGHT |
« static/site.key ('k')
|
templates/sitekey_frame.tmpl » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
