X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=javascript%2Foptions.js;h=c4ffda4634b32cc5255b86a395d4df369a25bbf1;hb=614dea955c957d58c79da346fa36fec176c59728;hp=17139d59e576a283115724d70f99b41135b1ac96;hpb=cc8be4269068a6dac17a2b163308152a0f6a3938;p=chrome-ext%2Fclearhistory-advance-fork.git

diff --git a/javascript/options.js b/javascript/options.js
index 17139d5..c4ffda4 100644
--- a/javascript/options.js
+++ b/javascript/options.js
@@ -26,37 +26,39 @@ function init() {
     elements[1].innerText = message;
   });
 
-  $('#optionsTitle')[0].innerText = chrome.i18n.getMessage('optionsTitle');
-  $('#optionsHeader')[0].innerText = chrome.i18n.getMessage('optionsHeader');
-  $('#optionsPrompt')[0].innerText = chrome.i18n.getMessage('optionsPrompt');
-  $('#optionsTimeFor')[0].innerText = chrome.i18n.getMessage('optionsTimeFor');
-  $('#optionsTimeStart')[0].innerText = chrome.i18n.getMessage('optionsTimeStart');
-  $('#optionsCookies')[0].innerText = chrome.i18n.getMessage('optionsCookies');
-  $('#optionsSaved > b')[0].innerText = chrome.i18n.getMessage('optionsSaved');
+  $('[i18n-content]').forEach(function(ele) {
+    ele.innerText = chrome.i18n.getMessage(ele.getAttribute('i18n-content'));
+  });
 
   // Bind all the callbacks
-  $('#opt-time input.opt-chk[type=radio]').forEach(function(e) {
+  $('input[type=radio]').forEach(function(e) {
     e.onclick = toggle;
   });
-  $('input.opt-chk[type=checkbox]').forEach(function(e) {
+  $('input[type=checkbox]').forEach(function(e) {
     e.onclick = setCheck;
   });
-  $('#opt-prompt input.opt-chk[type=checkbox]').forEach(function(e) {
-    e.onclick = setPrompt;
-  });
 
   // Load or set localStorage data
-  var timeStart = localStorage['timeStart'] || CONSTANTS.YES;
-  var time = ~~(localStorage['time']) ||
-             (localStorage['time'] = CONSTANTS.DEFAULT_TIME);
-  var showPrompt = localStorage['prompt'] ||
-                   (localStorage['prompt'] = CONSTANTS.YES);
-  var clearCookies = localStorage['cookies'] || CONSTANTS.NO;
+  var settings = [
+    'timeStart', 'time', 'prompt', 'cookies', 'downloads', 'autoclear', 'notify',
+  ];
+  chrome.storage.sync.get(settings, function(s) {
+    var timeStart = s.timeStart || CONSTANTS.YES;
+    var time = ~~(s.time) || (s.time = CONSTANTS.DEFAULT_TIME);
+    var showPrompt = s.prompt || (s.prompt = CONSTANTS.YES);
+    var clearCookies = s.cookies || CONSTANTS.NO;
+    var clearDownloads = s.downloads || CONSTANTS.NO;
+    var autoClear = s.autoclear || CONSTANTS.NO;
+    var notify = s.notify || CONSTANTS.YES;
 
-  $('input[name=timeStart]')[0].checked = (timeStart === CONSTANTS.YES);
-  $('input[name=time][value="' + time + '"]')[0].checked = true;
-  $('input[name=prompt]')[0].checked = (showPrompt === CONSTANTS.YES);
-  $('input[name=cookies]')[0].checked = (clearCookies === CONSTANTS.YES);
+    $('input[name=timeStart][value="' + timeStart + '"]')[0].checked = true;
+    $('input[name=time][value="' + time + '"]')[0].checked = true;
+    $('input[name=prompt]')[0].checked = (showPrompt === CONSTANTS.YES);
+    $('input[name=cookies]')[0].checked = (clearCookies === CONSTANTS.YES);
+    $('input[name=downloads]')[0].checked = (clearDownloads === CONSTANTS.YES);
+    $('input[name=autoclear]')[0].checked = (autoClear === CONSTANTS.YES);
+    $('input[name=notify]')[0].checked = (notify === CONSTANTS.YES);
+  });
 }
 
 /**
@@ -64,7 +66,9 @@ function init() {
  * @this {HTMLInputElement} The element (radio button) that was clicked.
  */
 function toggle() {
-  localStorage['time'] = this.value;
+  var setting = {};
+  setting[this.name] = this.value;
+  chrome.storage.sync.set(setting);
   optionSaved();
 }
 
@@ -72,13 +76,10 @@ function toggle() {
  * Sets the {@code localStorage.prompt} property when selected
  * @this {HTMLInputElement} The element (checkbox) that was clicked.
  */
-function setPrompt() {
-  localStorage['prompt'] = this.checked ? CONSTANTS.YES : CONSTANTS.NO;
-  optionSaved();
-}
-
 function setCheck() {
-  localStorage[this.name] = this.checked ? CONSTANTS.YES : CONSTANTS.NO;
+  var setting = {};
+  setting[this.name] = this.checked ? CONSTANTS.YES : CONSTANTS.NO;
+  chrome.storage.sync.set(setting);
   optionSaved();
 }