tcjlj/ZeroOmega
1
0
Fork 0
mirror of https://github.com/zero-peak/ZeroOmega.git synced 2025-02-02 11:08:13 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ignore empty data in profile update.

Browse Source
This commit is contained in:
FelisCatus 2015-02-09 11:11:58 +08:00
parent ec5a35682c
commit 674f501ada
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
omega-target-chromium-extension/src/tabs.coffee
View File

@ -41,7 +41,10 @@ class ChromeTabs
@_badgeTab = null @_badgeTab = null
if not tab.url? or tab.url.indexOf("chrome") == 0 if not tab.url? or tab.url.indexOf("chrome") == 0
if @_defaultAction if @_defaultAction
chrome.browserAction.setTitle(title: @_defaultAction.title, tabId: tab.id) chrome.browserAction.setTitle({
title: @_defaultAction.title
tabId: tab.id
})
@clearIcon tab.id @clearIcon tab.id
return return
@actionForUrl(tab.url).then (action) => @actionForUrl(tab.url).then (action) =>

4
omega-target/src/options.coffee
View File

@ -619,6 +619,10 @@ class Options
url = OmegaPac.Profiles.updateUrl(profile) url = OmegaPac.Profiles.updateUrl(profile)
if url if url
results[key] = @fetchUrl(url, opt_bypass_cache).then((data) => results[key] = @fetchUrl(url, opt_bypass_cache).then((data) =>
# Errors and unsuccessful response codes shoud have been already
# rejected by fetchUrl and will not end up here.
# So empty data indicates success without any update (e.g. 304).
return profile unless data
profile = OmegaPac.Profiles.byKey(key, @_options) profile = OmegaPac.Profiles.byKey(key, @_options)
profile.lastUpdate = new Date().toISOString() profile.lastUpdate = new Date().toISOString()
if OmegaPac.Profiles.update(profile, data) if OmegaPac.Profiles.update(profile, data)