-
Notifications
You must be signed in to change notification settings - Fork 17
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge tabinfo restructuring #159
Open
ghost
wants to merge
19
commits into
danwent:master
Choose a base branch
from
unknown repository
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…edded content functionality. more code cleanup.
… and tooltip for tabs. Fixes #60, #85 and #103. WARNING: this is still work in progress, some changes still need to be tested, especially the behavior for user preference "Always ask before contacting Notaries" is not yet implement! changed in notaries.js: create two parallel asynchronous calls for certificate and query_result which wait for each other, start querying already in onStateChange, set certificate in onSecurityChange, merged updateStatus() into notaryListener(), use browser.contentWindow for identification in tab_info_cache, save and restore favicon state and tooltip from tabinfo on TabOpen and TabSelect events changed: Some code cleanup and converting to UnderscoreJS
…edded content functionality. more code cleanup.
… and tooltip for tabs. Fixes #60, #85 and #103. WARNING: this is still work in progress, some changes still need to be tested, especially the behavior for user preference "Always ask before contacting Notaries" is not yet implement! changed in notaries.js: create two parallel asynchronous calls for certificate and query_result which wait for each other, start querying already in onStateChange, set certificate in onSecurityChange, merged updateStatus() into notaryListener(), use browser.contentWindow for identification in tab_info_cache, save and restore favicon state and tooltip from tabinfo on TabOpen and TabSelect events changed: Some code cleanup and converting to UnderscoreJS
…es into tabinfo_restructuring
…edirects and update tabinfo_cache fixed in notaries.js: correctly pass server_result_list again, added missing underscore library changed in notaries.js: cleaned up and restructured what was previously updateStatus and now in notaryListener, getCurrentTabinfo uses uri parameter again, removed unused ti.override_used and ti.firstlook, renamed mkProcess to await_serverresultlist_and_cert, added stop handling to mkProcess to suppress duplicate calls changed: converted some function names to_underscore_notation
apparently we need to pass the gBrowser as the aBrowser from tablistener doesn't provide a getNotificationBox method o_O
Fixes #26 changed in notaries.js: in query_notaries_closure named function publish_server_result, check quorum in publish_server_result, added in query_notaries_closure a new publish_cert callback which allows injecting the cert later (required if querying already starts in onStateChange), publish_cert is bound to ti.query_publish_cert fixed in notaries.js: actually query notary again after a timeout happened >_<
…out results and each group again by last update time Fixes #127 added in generate_svg: sort_server_result_list() added in svg_test: test sort_server_result_list() with shuffled samples
Conflicts: plugin/chrome/content/about_dialog.xul plugin/chrome/content/client_policy.js plugin/chrome/content/common.js plugin/chrome/content/initialize.xul plugin/chrome/content/notaries.js plugin/chrome/content/preferences_dialog.js plugin/chrome/content/preferences_dialog.xul plugin/chrome/content/report.xul plugin/chrome/content/results_dialog.js plugin/chrome/content/statusbar.js plugin/chrome/content/statusbar.xul plugin/chrome/content/whitelist_dialog.xul test/svg_test.html
fixed notary querying passed on test cases
…end >= start fixed in notaries.js: invalid results also have to invalidate the actual observations(!!!), keep timeout call if some results are still pending added in tests: have just one notary not responding
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is the merge of the old tabinfo_restructuring with the new master. I added some unit tests and fixed some bugs. Please test! Fixes #60, #85 and #103.
Using TortoiseGit I noticed that the merge actual consists of two parents. One contains the actual merge, the other the changes during the merge. Just as promised I also interspersed some changes. Have fun finding them :P