Commit 1171cd36 authored by Randall Leeds's avatar Randall Leeds

Isolate static assets in h:static

There are a number of reasons to isolate the static assets into their
own directory.

- An edge case in Pyramid: https://github.com/Pylons/pyramid/pull/1377
- Make serving them with a reverse proxy safer by ensuring that no code
  or configuration lives beneath the static directory
- Cleanliness

To avoid a big move happening shortly after this, also rename some of
the asset subdirectories to close #1317.

- js -> scripts
- css -> stylesheets
- lib -> scripts/vendor
- lib/images -> images
- browser/chrome/js/background.js -> browser/chrome/background.js
- browser/chrome/public/js/destroy.js -> browser/chrome/public/destroy.js

Finally, the locale directory was totally busted. The annotator.po file
included is the defualt locale, and it should have been .pot. Since it
includes only the default strings, there's no reason to serve it. I've
stripped it and we'll reinstate it correctly later.

Close #1311
parent 2bf113d6
...@@ -29,8 +29,6 @@ class Annotator.Guest extends Annotator ...@@ -29,8 +29,6 @@ class Annotator.Guest extends Annotator
noBack: false noBack: false
constructor: (element, options, config = {}) -> constructor: (element, options, config = {}) ->
Gettext.prototype.parse_locale_data annotator_locale_data
options.noScan = true options.noScan = true
super super
delete @options.noScan delete @options.noScan
......
...@@ -61,7 +61,6 @@ class Hypothesis extends Annotator ...@@ -61,7 +61,6 @@ class Hypothesis extends Annotator
constructor: ( constructor: (
$document, $location, $rootScope, $route, $window, $document, $location, $rootScope, $route, $window,
) -> ) ->
Gettext.prototype.parse_locale_data annotator_locale_data
super ($document.find 'body') super ($document.find 'body')
window.annotator = this window.annotator = this
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment