Merge pull request #23 from gbaptista/gb-firefox-settings-pages-issues

Firefox settings pages issues
gbaptista · Feb 3, 2018 · 6f71503 · 6f71503
2 parents fc4416f + f84add8
commit 6f71503
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 8 deletions.
diff --git a/html/settings/stored-data/local.html b/html/settings/stored-data/local.html
@@ -21,7 +21,7 @@ <h2 class="locale" data-locale="settingsStoredDataLocalTitle"></h2>
 
     <br><br>
 
-    <span id="used"></span> | <button id="clear" class="locale" data-locale="settingsClearAllButtonText"></button>
+    <span id="used"></span><button id="clear" class="locale" data-locale="settingsClearAllButtonText"></button>
 
     <div class="tabs"></div>
   </body>

diff --git a/html/settings/stored-data/sync.html b/html/settings/stored-data/sync.html
@@ -21,7 +21,7 @@ <h2 class="locale" data-locale="settingsStoredDataSyncTitle"></h2>
 
     <br><br>
 
-    <span id="used"></span> | <button id="clear" class="locale" data-locale="settingsClearAllButtonText"></button>
+    <span id="used"></span><button id="clear" class="locale" data-locale="settingsClearAllButtonText"></button>
 
     <div class="options"></div>
   </body>

diff --git a/js/settings/stored-data/local.js b/js/settings/stored-data/local.js
@@ -3,9 +3,13 @@ $(document).ready(function() {
     $('#loading').fadeOut(200);
   };
 
-  chrome.storage.local.getBytesInUse(null, function(bytesUsed) {
-    $('#used').html((bytesUsed/1000000).toFixed(2) + ' MB');
-  });
+  try {
+    chrome.storage.local.getBytesInUse(null, function(bytesUsed) {
+      $('#used').html((bytesUsed/1000000).toFixed(2) + ' MB | ');
+    });
+  } catch (_) {
+    $('#used').remove();
+  }
 
   $('#clear').click(function() {
     if(confirm(chrome.i18n.getMessage('settingsConfirmWindowText'))) {

diff --git a/js/settings/stored-data/sync.js b/js/settings/stored-data/sync.js
@@ -7,9 +7,13 @@ $(document).ready(function() {
     $('#loading').fadeIn(200);
   }
 
-  chrome.storage.sync.getBytesInUse(null, function(bytesUsed) {
-    $('#used').html((bytesUsed/1000000).toFixed(2) + ' MB');
-  });
+  try {
+    chrome.storage.sync.getBytesInUse(null, function(bytesUsed) {
+      $('#used').html((bytesUsed/1000000).toFixed(2) + ' MB | ');
+    });
+  } catch (_) {
+    $('#used').remove();
+  }
 
   $('#clear').click(function() {
     if(confirm(chrome.i18n.getMessage('settingsConfirmWindowText'))) {

diff --git a/manifest.json b/manifest.json
@@ -36,6 +36,11 @@
     "default_popup": "html/popup/popup.html"
   },
   "options_page": "html/settings/advanced.html",
+  "options_ui": {
+    "page": "html/settings/advanced.html",
+    "open_in_tab": true,
+    "browser_style": false
+  },
   "content_scripts": [
     {
       "matches": ["<all_urls>"],