From c5fc2686ac96e0a5e802863fe66a2246f2f66e19 Mon Sep 17 00:00:00 2001
From: Sophie Hamilton <git-commits@theblob.org>
Date: Mon, 1 Jun 2015 00:37:56 +0100
Subject: [PATCH 1/2] Sort Exceptions listbox, auto-select added items

The Exceptions listbox is somewhat difficult to follow as the listbox
doesn't display items in a consistent order. Sort the listbox instead,
and make it so that manually added exceptions scroll and auto-select the
newly added item to make it easier to see that it was added.
---
 src/content/dlg-global.js | 54 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 48 insertions(+), 6 deletions(-)

diff --git a/src/content/dlg-global.js b/src/content/dlg-global.js
index 03bfdc7..6218e7d 100644
--- a/src/content/dlg-global.js
+++ b/src/content/dlg-global.js
@@ -39,8 +39,16 @@ NoSquint.dialogs.global = NoSquint.ns(function() { with (NoSquint) {
 
         // Exceptions tab
         $('copyURL-button').style.display = this.url ? '' : 'none';
-        for (let exc in iter(NSQ.prefs.exceptions))
-            this.exceptionsListAdd(exc[0].replace(/%20/g, ' '), false);
+        var sortedExceptions = NSQ.prefs.exceptions;
+        for (let exc in iter(sortedExceptions))
+            exc[0] = exc[0].replace(/%20/g, ' ');
+        sortedExceptions.sort(function(a, b) {
+          if (a[0] < b[0]) { return -1; }
+          if (a[0] > b[0]) { return  1; }
+          return 0;
+        });
+        for (let exc in iter(sortedExceptions))
+            this.exceptionsListAdd(exc[0], false, -1);
         $('exceptionsList').setUserData('nosquint.changed', false, null);
         this.excListSelect();
     };
@@ -161,12 +169,12 @@ NoSquint.dialogs.global = NoSquint.ns(function() { with (NoSquint) {
      * Exceptions tab functions
      */
 
-    this.exceptionsListAdd = function(pattern, check_dupe) {
+    this.exceptionsListAdd = function(pattern, manual_add, insert_before) {
         var listbox = $('exceptionsList');
         // Strip URI scheme from pattern (if it exists)
         pattern = pattern.replace(/^\w+:\/\//, '');
 
-        if (check_dupe) {
+        if (manual_add) {
             for (let node in iter(listbox.childNodes)) {
                 if (node.childNodes[0].getAttribute('label') == pattern)
                     return;
@@ -178,7 +186,26 @@ NoSquint.dialogs.global = NoSquint.ns(function() { with (NoSquint) {
         var li1 = document.createElement("listcell");
         li1.setAttribute('label', pattern);
         node.appendChild(li1);
-        listbox.appendChild(node);
+
+        if (insert_before == -1)   // insert at end
+        {
+            listbox.appendChild(node);
+        }
+        else {
+            var items = listbox.childNodes;
+            if (insert_before >= 0 && insert_before < items.length) {
+                listbox.insertBefore(node, items.item(insert_before));
+            }
+            else {
+                console.error("insert_before value " + insert_before + " is out of the listbox bounds! Item '" + pattern + "' has not been added.");
+                return;
+            }
+        }
+        if (manual_add) {
+            listbox.ensureElementIsVisible(node);
+            listbox.selectItem(node);
+        }
+
         node.addEventListener('dblclick', function() NSQ.dialogs.global.buttonEditException(), false);
         // Mark the listbox as having been changed from stored prefs.
         listbox.setUserData('nosquint.changed', true, null);
@@ -221,7 +248,22 @@ NoSquint.dialogs.global = NoSquint.ns(function() { with (NoSquint) {
     };
 
     this.buttonAddException = function() {
-        this.exceptionsListAdd($('pattern').value, true);
+        // Since the listbox should always be sorted already, we can simply scan to see where to add the new one.
+        var listbox = $('exceptionsList');
+        var value = $('pattern').value;
+        var children = listbox.childNodes;
+        var insertbefore = -1;
+        for (var i = 0; i < children.length; i++) {
+            var item = children.item(i);
+            if (item.nodeName == "listitem") {
+                var label = item.childNodes.item(0).getAttribute("label");
+                if (label > value) {
+                    insertbefore = i;
+                    break;
+                }
+            }
+        }
+        this.exceptionsListAdd(value, true, insertbefore);
         $('pattern').value = '';
         this.textPatternChange();
     };

From 6318512995f6efc714db41f86e0822023f7f5f8b Mon Sep 17 00:00:00 2001
From: Sophie Hamilton <git-commits@theblob.org>
Date: Thu, 11 Jun 2015 12:10:36 +0100
Subject: [PATCH 2/2] Fix indentation

I accidentally used two spaces here instead of four.
---
 src/content/dlg-global.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/content/dlg-global.js b/src/content/dlg-global.js
index 6218e7d..1f1f52b 100644
--- a/src/content/dlg-global.js
+++ b/src/content/dlg-global.js
@@ -43,9 +43,9 @@ NoSquint.dialogs.global = NoSquint.ns(function() { with (NoSquint) {
         for (let exc in iter(sortedExceptions))
             exc[0] = exc[0].replace(/%20/g, ' ');
         sortedExceptions.sort(function(a, b) {
-          if (a[0] < b[0]) { return -1; }
-          if (a[0] > b[0]) { return  1; }
-          return 0;
+            if (a[0] < b[0]) { return -1; }
+            if (a[0] > b[0]) { return  1; }
+            return 0;
         });
         for (let exc in iter(sortedExceptions))
             this.exceptionsListAdd(exc[0], false, -1);