1. 23 Jun, 2017 1 commit
    • Robert Knight's avatar
      Fix sidebar app failing to load in Firefox extension. · 90927d28
      Robert Knight authored
      Angular has a check for Chrome Packaged Apps in its `$sniffer` service
      which changes the behavior of the $location service and in the Firefox
      extension, triggers a redirect from `/client/app.html` to
      `/#client/app.html` on startup, breaking the sidebar app.
      
      This commit works around the problem by adding a fake
      `window.chrome.app` object to convince Angular that the Firefox
      extension is not a Chrome Packaged App.
      
      Issue reported upstream at https://github.com/angular/angular.js/issues/16068
      90927d28
  2. 20 Jun, 2017 4 commits
    • Robert Knight's avatar
      Merge pull request #458 from hypothesis/upgrade-sinon · 134aec53
      Robert Knight authored
      Upgrade Sinon.JS to its latest version
      134aec53
    • Sean Hammond's avatar
      Upgrade Sinon.JS to its latest version · 2e2cec07
      Sean Hammond authored
      2e2cec07
    • Sean Hammond's avatar
      Merge pull request #453 from hypothesis/rename-app-to-sidebarAppUrl · e42f89d0
      Sean Hammond authored
      Rename config.app to sidebarAppUrl
      e42f89d0
    • Sean Hammond's avatar
      Rename config.app to sidebarAppUrl · 1fcb15cf
      Sean Hammond authored
      The code in `src/boot/` reads the `sidebarAppUrl` setting from
      `js-hypothesis-config` JSON objects in the host page (defaulting to the
      value of the build-time `__SIDEBAR_APP_URL__` template variable, if there's
      no `sidebarAppUrl` setting in the host page).
      
      `boot/` then writes `sidebarAppUrl` as the value of the `href` of a
      `<link type="application/annotator+html">` element that it injects into
      the host page.
      
      Later, the code in `src/annotator/` reads this `<link>` element's `href`
      in as the `config.app` setting, which it uses as the `src` of the
      sidebar app's `<iframe>` that it injects into the host page.
      
      So the variable that's named `sidebarAppUrl` / `__SIDEBAR_APP_URL__` at
      boot / build time* gets renamed to `config.app` when it makes it into
      the `src/annotator` code.
      
      Fix this by renaming `config.app` in `src/annotator` to
      `config.sidebarAppUrl` so that the variable is named consistently.
      
      `*` In the build-time code there's also a `defaultSidebarAppUrl`
      variable, and an `H_SERVICE_URL` environment variable, which also belong to
      the same sidebarAppUrl config setting.
      1fcb15cf
  3. 19 Jun, 2017 15 commits
  4. 16 Jun, 2017 2 commits
  5. 15 Jun, 2017 16 commits
  6. 14 Jun, 2017 2 commits