- 05 Jun, 2017 8 commits
-
-
Robert Hodan authored
-
Robert Hodan authored
-
Robert Knight authored
Fix ghost adder
-
Sean Hammond authored
The adder is not off screen, it's in the top-left corner.
-
Sean Hammond authored
Hide the `<hypothesis-adder-toolbar>` element, rather than its containing `<hypothesis-adder>` element, when hiding/showing the adder. Since 56f5243e hiding the parent `<hypothesis-adder>` element doesn't work because, to protect them from third-party CSS elsewhere in the DOM, its child elements no longer inherit its CSS properties. Fixes https://github.com/hypothesis/client/issues/414
-
Sean Hammond authored
Adder() contains a `var self = this` line and a line that assigns the `element` that `createAdderDOM()` returns to `this.element`, but it usually accesses `element` via the local variable element (and occassionally as `this.element`). Change this to be consistent: assign `self.element = createAdderDOM()`; always access it as `self.element` not `this.element`; delete the local variable `element`. This just makes the code a little simpler and more self-consistent.
-
Sean Hammond authored
Ignore all config other than direct linked ID from host page.
-
Sheetal Umesh Kumar authored
configuration on the host page other than the query and annotations. Fixes https://github.com/hypothesis/product-backlog/issues/209
-
- 02 Jun, 2017 1 commit
-
-
Sean Hammond authored
Adding group leave, switch, and view activity metrics
-
- 01 Jun, 2017 11 commits
-
-
Sean Roberts authored
-
Sean Roberts authored
Split extract annotation query into two separate functions
-
Sean Hammond authored
-
Sean Hammond authored
For a future refactoring of this config code I need to have one function per config setting (the function returns the value of the config setting). extractAnnotationQuery() is actually a single function for two config settings - it returns either {query: *} or {annotations: *} depending on what's in the URL #fragment. This doesn't fit into my planned refactoring, so split extractAnnotationQuery() into two settings functions: one for config.query and one for config.annotations.
-
Sean Hammond authored
Refactor extract annotation query
-
Sean Hammond authored
-
Sean Hammond authored
Only match the `#annotations:<ID>` regex against the URL if the `#annotation:<q|query>:<QUERY>` regex, which takes precedence, doesn't find a match. This also makes it clearer that the URL-safe base64 IDs comment applies to `annotFragmentMatch` only not to `queryFragmentMatch`.
-
Sean Hammond authored
I think this makes the code more readable.
-
Sean Hammond authored
This both clarifies the intent of the code (what exception, thrown by what, it's intending to catch) and reduces the chances of a bug where it actually catches a different exception thrown by something else that it didn't intend to catch.
-
Sean Hammond authored
Rewrite these tests to make them more descriptive, and clarify what the behaviour of `extractAnnotationQuery()` actually is: - Replace `unroll()` with a simple dynamic test generation approach that allows each test to have its own different `describe()` and `it()` strings - Change the top-level describe from `describe('annotation queries'` to `describe('annotation.util.extractAnnotationQuery'` - There was a test for what happens when a `#annotations:<ID>` fragment contains non-alphanumeric characters which used the test URL `'http://localhost:3000#annotations:\"TRYINGTOGETIN\");EVILSCRIPT()'),`. This seems to suggest that the alphanumeric characters restriction is a code injection defense, but I don't think it is. Replaced this with just `not%20alphanumeric`.
-
Sean Hammond authored
Fix extract-annotation-query.js to just export a function, instead of exporting an object containing just a single function.
-
- 31 May, 2017 10 commits
-
-
Sean Hammond authored
Tests and other tweaks to shared/settings.js
-
Sean Hammond authored
-
Sean Hammond authored
-
Sean Hammond authored
Add a new set of unit tests that test more cases.
-
Sean Hammond authored
-
Sean Hammond authored
Rename options to config in annotator
-
Sean Hammond authored
-
Sean Hammond authored
There are two reasons for renaming the `options` object to `config`: **First**, it's more consistent. The file that creates this object is called `config.js`, and the function that creates the object is called `configFrom()`, and yet the object ends up getting called `options` (but you have to look in another file, `main.js`, to find this out). `config` is also used elsewhere as the name for the main configuration object, for example in Pyramid/h, in the client docs ("Configuring the Client", "configuration settings") and public API (`class="js-hypothesis-config"` scripts and `window.hypothesisConfig()` functions), etc. These "options" that the `src/annotator/` code reads from the host page also end up getting renamed to `hostPageConfig` when they get passed over in to the `src/sidebar/` code. **Second**, it's more unique. There are a number of other objects in the `src/annotator/` code that are called options, sometimes the main options object and another local options object are even used in the same function. There's no other objects called config.
-
Sean Hammond authored
This makes it easier to grep for uses of this function.
-
Sean Hammond authored
Rename the `config()` function that creates the `options` object to `configFrom()`. This is because I want to rename the `options` object to `config` in a future commit, so I need the `config()` function to be called something else. I think `configFrom(window)` is also clearer (that this is a function that returns a `config` object created from the given window) than `config(window)` (which could be read as configuring the window, for example).
-
- 25 May, 2017 2 commits
-
-
Sean Hammond authored
Improve the `src/annotator/config.js` unit tests
-
Sean Hammond authored
The main change is to make the tests much more detailed by adding more unit tests describing and testing more of the code's behaviour. But also: * Remove some test fakes which implemented non-trivial fake behaviour: `fakeScriptConfig`, `fakeQuerySelector`, `fakeWindowBase`. Just use simple stubs instead. * Make each test test just one thing (previously many of the tests for one part of the code could fail if another part of `config.js` was broken). * Isolate the `config.js` unit tests from `src/shared/settings.js` and `extract-annotation-query.js`. Previously the `config.js` tests could fail if `settings.js` or `extract-annotation-query.js` were broken, and implementation details of `settings.js` and `extract-annotation-query.js` were coded into the `config.js` tests. * Fix an issue with one test that if it failed a `window.document` would be left modified
-
- 23 May, 2017 6 commits
-
-
Sean Hammond authored
A few followup fixes to "Allow publishers to customize user menu links followup"
-
Sean Hammond authored
Prevent Adder toolbar from inheriting CSS property values from host page
-
Robert Knight authored
-
Robert Knight authored
-
Robert Knight authored
The adder toolbar uses Shadow DOM or `!important` to prevent CSS rules in the host page from directly affecting the styling of the toolbar. However even inside Shadow DOM elements can still inherit CSS property values from parent elements [1]. This commit fixes that problem for current browsers (except Edge [2]) by using `all: initial` on the Adder's root element. [1] See https://github.com/w3c/webcomponents/issues/314 [2] http://caniuse.com/#feat=css-all Fixes #382
-
Sean Hammond authored
Add config option to show highlights only when sidebar is open
-
- 22 May, 2017 2 commits
-
-
Sean Hammond authored
Update jQuery to current version & slim build
-
Sean Hammond authored
-