summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2016-09-16 13:54:10 -0700
committerKali Kaneko (leap communications) <kali@leap.se>2016-09-22 11:39:47 -0400
commitae5a20d059209f2027c05820dc3b4cfe7346c8a8 (patch)
tree3ddc591e3d8b9fc9721c198bb83976b1d6705490 /src
parentbb82515bca6ff6e6b74718bf946faf3747e40002 (diff)
[pkg] fix www (aka bitmask_js) when run in "development mode"
this change allows you to edit the js and have the changes reflected immediately in the app.
Diffstat (limited to 'src')
-rw-r--r--src/leap/bitmask/core/_web.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/leap/bitmask/core/_web.py b/src/leap/bitmask/core/_web.py
index ae223258..344e26eb 100644
--- a/src/leap/bitmask/core/_web.py
+++ b/src/leap/bitmask/core/_web.py
@@ -34,7 +34,7 @@ from twisted.python import log
from leap.bitmask.core.dispatcher import CommandDispatcher
try:
- import leap.bitmask_www
+ import bitmask_js
HAS_WEB_UI = True
except ImportError:
HAS_WEB_UI = False
@@ -54,9 +54,9 @@ class HTTPDispatcherService(service.Service):
def startService(self):
if HAS_WEB_UI:
webdir = os.path.abspath(
- pkg_resources.resource_filename('leap.bitmask_www', 'public'))
+ pkg_resources.resource_filename('bitmask_js', 'public'))
else:
- log.msg('leap.bitmask_www not found, serving bitmask.core web ui')
+ log.msg('bitmask_js not found, serving bitmask.core ui')
webdir = os.path.abspath(
pkg_resources.resource_filename('leap.bitmask.core', 'web'))
root = File(webdir)