Implement wss preference url in html; Update to work with the tip of vnext branch; allow viewing the android ui from the webpack server (#918)
* Merge branch 'vnext' of https://github.com/mozilla/send into android-preferences Fix conflicts * Implement wss preference url in html; Update to work with the tip of vnext branch; allow viewing the android ui from the webpack server * Use a try/catch in case localStorage isn't available, which it isn't in a ServiceWorker
This commit is contained in:
parent
690a705be9
commit
71ea4e74f6
7 changed files with 97 additions and 6 deletions
|
@ -1,11 +1,16 @@
|
|||
/* eslint-disable no-console */
|
||||
|
||||
import User from '../../app/user';
|
||||
import storage from '../../app/storage';
|
||||
|
||||
export default function initialState(state, emitter) {
|
||||
const files = [];
|
||||
|
||||
Object.assign(state, {
|
||||
prefix: '/android_asset',
|
||||
user: new User(undefined, storage),
|
||||
getAsset(name) {
|
||||
return `/android_asset/${name}`;
|
||||
return `${state.prefix}/${name}`;
|
||||
},
|
||||
translate: (...toTranslate) => {
|
||||
return toTranslate.map(o => JSON.stringify(o)).toString();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue