Unified Diff: chrome/content/ui/firstRun.html
Issue 11533106:
Prepared adblockplus for Safari (Closed)
Patch Set: Rebased on upstream
Created Oct. 25, 2013, 4:17 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
chrome/content/ui/firstRun.js » ('j')
|
chrome/content/ui/i18n.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: chrome/content/ui/firstRun.html |
| =================================================================== |
| --- a/chrome/content/ui/firstRun.html |
| +++ b/chrome/content/ui/firstRun.html |
| @@ -20,7 +20,17 @@ |
| <head> |
| <title class="i18n_firstRun_title"></title> |
| <meta charset="utf-8"> |
| + |
| + <!-- {% if type == 'safari' %} --> |
| + <!-- {{ '<link type="text/css" href="skin/firstRun.css" rel="stylesheet"/>' }} --> |
| + <!-- {% else %} --> |
| <link type="text/css" href="/skin/firstRun.css" rel="stylesheet"/> |
| + <!-- {% endif %} --> |
|
Wladimir Palant
2013/10/29 12:59:52
As mentioned before, I would prefer a solution wit
Sebastian Noack
2013/10/29 13:37:23
I would rather not hide the logic from the code of
Wladimir Palant
2013/10/29 14:05:45
We have a number of conventions in place that work
|
| + |
| + <!-- {% if type in ('chrome', 'opera', 'safari') %} --> |
| + <!-- {{ '<script type="text/javascript" src="ext/common.js"></script>' }} --> |
| + <!-- {{ '<script type="text/javascript" src="ext/content.js"></script>' }} --> |
| + <!-- {% endif %} --> |
|
Wladimir Palant
2013/10/29 12:59:52
If we are adding these script tags dynamically, we
Sebastian Noack
2013/10/29 13:37:23
I might be wrong. But I don't think that this will
Wladimir Palant
2013/10/29 14:05:45
Setting |script.async = false| should actually do
Sebastian Noack
2013/10/29 15:44:56
They are just wrapped by HTML comments, for backwa
Wladimir Palant
2013/10/29 15:56:37
For the scripts: yes, processing the page with Jin
|
| <script type="text/javascript" src="utils.js"></script> |
| <script type="text/javascript" src="i18n.js"></script> |
| <script type="text/javascript" src="firstRun.js"></script> |
| @@ -33,9 +43,9 @@ |
| <h1 id="title-main" class="i18n_firstRun_title"></h1> |
| </header> |
| + <section id="legacySafariWarning" class="i18n_firstRun_legacySafariWarning" hidden="true"></section> |
| <section id="dataCorruptionWarning" class="i18n_firstRun_dataCorruptionWarning" hidden="true"></section> |
| - |
| <section id="acceptable-ads"> |
| <h2 class="i18n_firstRun_acceptableAdsHeadline"></h2> |
| <p id="acceptableAdsExplanation" class="i18n_firstRun_acceptableAdsExplanation"></p> |
« no previous file with comments
|
« no previous file
|
chrome/content/ui/firstRun.js » ('j')
|
chrome/content/ui/i18n.js » ('J')
