diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 4a33a03db..8d75a4939 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -9534,11 +9534,9 @@ posts = Object.keys(Unread.thread.posts); root = Unread.thread.posts[posts[posts.length - 1]].nodes.root; } - return $.on(window, 'load', function() { - if (Header.getBottomOf(root) < 0) { - return Header.scrollTo(root, down); - } - }); + if (Header.getBottomOf(root) < 0) { + return Header.scrollTo(root, down); + } }, sync: function() { var lastReadPost, post; diff --git a/builds/crx/script.js b/builds/crx/script.js index 28c04d8ab..886266b36 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -772,39 +772,24 @@ }; $.set = (function() { - var items, setAll, setArea, timeout; - items = { - sync: {}, - local: {} - }; - timeout = {}; - setArea = function(area) { - if (timeout[area]) { - return; - } - return chrome.storage[area].set(items[area], function() { - if (chrome.runtime.lastError) { - c.error(chrome.runtime.lastError.message); - timeout[area] = setTimeout(setArea, $.MINUTE, area); - return; - } - items[area] = {}; - return delete timeout[area]; - }); - }; - setAll = $.debounce($.SECOND, function() { + var items, localItems, set; + items = {}; + localItems = {}; + set = $.debounce($.SECOND, function() { var err, key, _i, _len, _ref; _ref = $.localKeys; for (_i = 0, _len = _ref.length; _i < _len; _i++) { key = _ref[_i]; - if (key in items.sync) { - items.local[key] = items.sync[key]; - delete items.sync[key]; + if (key in items) { + (localItems || (localItems = {}))[key] = items[key]; + delete items[key]; } } try { - setArea('local'); - return setArea('sync'); + chrome.storage.local.set(localItems); + chrome.storage.sync.set(items); + items = {}; + return localItems = {}; } catch (_error) { err = _error; return c.error(err.stack); @@ -812,11 +797,11 @@ }); return function(key, val) { if (typeof key === 'string') { - items.sync[key] = val; + items[key] = val; } else { - $.extend(items.sync, key); + $.extend(items, key); } - return setAll(); + return set(); }; })(); @@ -9532,11 +9517,9 @@ posts = Object.keys(Unread.thread.posts); root = Unread.thread.posts[posts[posts.length - 1]].nodes.root; } - return $.on(window, 'load', function() { - if (Header.getBottomOf(root) < 0) { - return Header.scrollTo(root, down); - } - }); + if (Header.getBottomOf(root) < 0) { + return Header.scrollTo(root, down); + } }, sync: function() { var lastReadPost, post; diff --git a/src/General/lib/$.coffee b/src/General/lib/$.coffee index a5e58ba1d..d91010ae8 100755 --- a/src/General/lib/$.coffee +++ b/src/General/lib/$.coffee @@ -329,38 +329,28 @@ $.get = (key, val, cb) -> chrome.storage.sync.get syncItems, done $.set = do -> - items = - sync: {} - local: {} - timeout = {} + items = {} + localItems = {} - setArea = (area) -> - return if timeout[area] - chrome.storage[area].set items[area], -> - if chrome.runtime.lastError - c.error chrome.runtime.lastError.message - timeout[area] = setTimeout setArea, $.MINUTE, area - return - items[area] = {} - delete timeout[area] - - setAll = $.debounce $.SECOND, -> + set = $.debounce $.SECOND, -> for key in $.localKeys - if key of items.sync - items.local[key] = items.sync[key] - delete items.sync[key] + if key of items + (localItems or= {})[key] = items[key] + delete items[key] try - setArea 'local' - setArea 'sync' + chrome.storage.local.set localItems + chrome.storage.sync.set items + items = {} + localItems = {} catch err c.error err.stack (key, val) -> if typeof key is 'string' - items.sync[key] = val + items[key] = val else - $.extend items.sync, key - setAll() + $.extend items, key + set() <% } else { %> diff --git a/src/Monitoring/Unread.coffee b/src/Monitoring/Unread.coffee index e0d475ef1..4a2c64236 100755 --- a/src/Monitoring/Unread.coffee +++ b/src/Monitoring/Unread.coffee @@ -46,11 +46,9 @@ Unread = # Scroll to the last read post. posts = Object.keys Unread.thread.posts {root} = Unread.thread.posts[posts[posts.length - 1]].nodes - # Prevent the browser to scroll back to - # the previous scroll location on page load. - $.on window, 'load', -> - # Scroll to the target unless we scrolled past it. - Header.scrollTo root, down if Header.getBottomOf(root) < 0 + + # Scroll to the target unless we scrolled past it. + Header.scrollTo root, down if Header.getBottomOf(root) < 0 sync: -> lastReadPost = Unread.db.get