search

RequestPolicyContinued / requestpolicy

a web browser extension that gives you control over cross-site requests. Available for XUL/XPCOM-based browsers.
https://github.com/RequestPolicyContinued/requestpolicy/wiki
Other
252 stars 35 forks source link

WE transition: URLs in "settings/" files #866

Closed myrdd closed 6 years ago

myrdd commented 7 years ago

The URLs in the files in src/content/settings/ need to be changed:

Every link (e.g. here, here and here) …

Example:

<a href="about:requestpolicy?oldrules" data-string="removeOldRules"></a>

will become

<!-- @if EXTENSION_TYPE='legacy' -->
<a href="about:requestpolicy?oldrules" data-string="removeOldRules"></a>
<!-- @endif -->
<!-- @if EXTENSION_TYPE!='legacy' -->
<a href="./oldrules.html" data-string="removeOldRules"></a>
<!-- @endif -->

(PS: This is a quick and dirty solution, I know.)

jrrdev commented 7 years ago

Hi, I have a question regarding those lines in here: 

  <!-- @if EXTENSION_TYPE='legacy' -->
  <script src="chrome://rpcontinued/content/bootstrap/environments/settings.js"></script>
  <!-- @endif -->
  <!-- @if EXTENSION_TYPE!='legacy' -->
  <script src="chrome://rpcontinued/content/settings/main.js"></script>
  <!-- @endif -->

I guess that they should be modify to become : 

  <!-- @if EXTENSION_TYPE='legacy' -->
  <script src="chrome://rpcontinued/content/bootstrap/environments/settings.js"></script>
  <!-- @endif -->
  <!-- @if EXTENSION_TYPE!='legacy' -->
  <script src="main.js"></script>
  <!-- @endif -->

If legacy, then loads settings.js else loads main.js. Is that right ?

In addition, I don't find main.js in the settings directory. Is that an existing mistake in the current code or I'm missing something ?

myrdd commented 7 years ago

Hi @jrrdev I just realized the non-legacy line needs to be:

<script data-main="{JS file name}" src="../lib/third-party/require.min.js"></script>

where {JS file name} should be e.g. basicprefs.js, see <html id="{module name}"> in each file.

require.min.js doesn't exist yet, I'll add it in a future commit. (I've got too many unpublished commits locally ;) )

jrrdev commented 7 years ago

I updated the PR to load requireJS on setting pages, see commit https://github.com/RequestPolicyContinued/requestpolicy/pull/868/commits/349160583b6b425744ee029068457a64a5dd3442

myrdd commented 6 years ago

PR merged: https://github.com/RequestPolicyContinued/requestpolicy/commit/5e70d115a1923084a86307a30f4913905738a7b0