Improve code organization

diracdeltas · diracdeltas · commit fc634b325368 · 2014-01-23T16:01:27.000-08:00
diff --git a/src/chrome/content/code/FennecUI.jsm b/src/chrome/content/code/FennecUI.jsm
@@ -1,5 +1,3 @@
-var EXPORTED_SYMBOLS = ["FennecUI"];
-
 const CC = Components.classes;
 const CI = Components.interfaces;
 const CU = Components.utils;
@@ -13,11 +11,10 @@ var menuId;
 var urlbarId;
 var aWindow = getWindow();
 
-function getWindow() {
-  return CC['@mozilla.org/appshell/window-mediator;1']
-      .getService(CI.nsIWindowMediator)
-      .getMostRecentWindow('navigator:browser');
-}
+
+/*
+ * Setup/Teardown for the UI
+ */
 
 function loadIntoWindow() {
   if (!aWindow) {
@@ -40,6 +37,11 @@ function unloadFromWindow() {
   aWindow.NativeWindow.pageactions.remove(urlbarId);
 }
 
+
+/*
+ * Add a menu item to toggle HTTPS Everywhere
+ */
+
 function addToggleItemToMenu(enabled) {
   if (menuId) { aWindow.NativeWindow.menu.remove(menuId); };
   var menuLabel = enabled ? "HTTPS Everywhere on" : "HTTPS Everywhere off";
@@ -67,6 +69,7 @@ function popupToggleMenu(aWindow, enabled) {
   aWindow.NativeWindow.doorhanger.show("Would you like to turn HTTPS Everywhere "+newState, "doorhanger", buttons);
 }
 
+
 /*
  * The HTTPS Everywhere icon in the URL bar shows a menu of rules that the
  * user can activate/deactivate. Here's some code to create it and update the
@@ -144,13 +147,17 @@ var urlbarOptions = {
   }
 };
 
-// The prompt that shows up when someone clicks on the icon
 var rulesPrompt = new Prompt({
   window: aWindow,
   title: "Enable/disable rules",
   buttons: ["Apply changes"]
 });
 
+
+/*
+ * Some useful utils
+ */
+
 function reloadTab() {
   // There seems to be no API to do this directly?
   aWindow.BrowserApp.selectedTab.window.location.reload();
@@ -162,7 +169,21 @@ function toggleEnabledState(){
   reloadTab();
 }
 
-// Here's the external API to this UI module
+function resetToDefaults() {
+  return HTTPSEverywhere.https_rules.resetRulesetsToDefaults()
+}
+
+function getWindow() {
+  return CC['@mozilla.org/appshell/window-mediator;1']
+      .getService(CI.nsIWindowMediator)
+      .getMostRecentWindow('navigator:browser');
+}
+
+
+/*
+ *  Here's the external API to this UI module
+ */
+
 var FennecUI = {
   init: function() {
     loadIntoWindow();
@@ -171,3 +192,5 @@ var FennecUI = {
     unloadFromWindow();
   }
 };
+
+var EXPORTED_SYMBOLS = ["FennecUI"];
