From 2b22494f3f77673cdcebc969bb31b30c0b098abf Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Tue, 5 Dec 2017 08:50:07 +0300
Subject: [PATCH] move style elements after head/body regardless of prior stuff

fixes #284
---
 content/apply.js | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/content/apply.js b/content/apply.js
index 31320aa7..b4ab9ea2 100644
--- a/content/apply.js
+++ b/content/apply.js
@@ -388,7 +388,7 @@
     let sorting = false;
     let timer;
     // allow any types of elements between ours, except for the following:
-    const ORDERED_TAGS = ['head', 'body', 'style', 'link'];
+    const ORDERED_TAGS = ['head', 'body', 'frameset', 'style', 'link'];
 
     init();
     return;
@@ -396,10 +396,7 @@
     function init() {
       docRootObserver = new MutationObserver(sortStyleElements);
       Object.assign(docRootObserver, {start, stop});
-      if (!chrome.app) {
-        // compensate for Firefox missing a step when loading the tab in background
-        setTimeout(sortStyleElements);
-      }
+      setTimeout(sortStyleElements);
     }
     function start({sort = false} = {}) {
       if (sort && sortStyleMap()) {
@@ -434,26 +431,25 @@
       }
     }
     function sortStyleElements() {
-      let expected = document.body || document.head;
-      if (!expected || sorting) {
+      let prevExpected = document.body || document.head;
+      if (!prevExpected || sorting) {
         return;
       }
       for (const el of styleElements.values()) {
         if (!isMovable(el)) {
           continue;
         }
-        let prev = el.previousElementSibling;
-        while (prev !== expected) {
-          if (prev && isSkippable(prev)) {
-            expected = prev;
-            prev = prev.nextElementSibling;
-          } else if (!moveAfter(el, expected)) {
-            return;
-          } else {
+        while (true) {
+          const next = prevExpected.nextElementSibling;
+          if (next && isSkippable(next)) {
+            prevExpected = next;
+          } else if (moveAfter(el, prevExpected)) {
+            prevExpected = el;
             break;
+          } else {
+            return;
           }
         }
-        expected = el;
       }
       if (sorting) {
         sorting = false;