Skip to content
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
wants to merge 19 commits into
base: master
Choose a base branch
from
Open

Merge tabinfo restructuring #159

wants to merge 19 commits into from

Conversation

ghost
Copy link

@ghost ghost commented Nov 16, 2014

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.

I wonder if there is a way to verify with git that a merge commit contains no other changes.

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

geroldmeisinger and others added 19 commits June 20, 2014 12:46
…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
…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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Start the notary query when the tab loads
1 participant