diff options
| author | Lauri Ojansivu <x@xet7.org> | 2018-12-16 12:01:42 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2018-12-16 12:01:42 +0200 |
| commit | 72f8baf6b350c55eb51df6b421860833c826653c (patch) | |
| tree | a5d80c538271bbcc7614f9471572734c546270c2 /client | |
| parent | e135af8c3797712c753d5acdb02cd7927114aea7 (diff) | |
| parent | 2a59043ef18831e6d560cf8c901d25437915728d (diff) | |
| download | wekan-72f8baf6b350c55eb51df6b421860833c826653c.tar.gz wekan-72f8baf6b350c55eb51df6b421860833c826653c.tar.bz2 wekan-72f8baf6b350c55eb51df6b421860833c826653c.zip | |
Merge branch 'edge' into meteor-1.8
Diffstat (limited to 'client')
| -rw-r--r-- | client/components/main/layouts.jade | 8 | ||||
| -rw-r--r-- | client/lib/popup.js | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade index e434eaba..d0c27da5 100644 --- a/client/components/main/layouts.jade +++ b/client/components/main/layouts.jade @@ -7,10 +7,10 @@ head where the application is deployed with a path prefix, but it seems to be difficult to do that cleanly with Blaze -- at least without adding extra packages. - link(rel="shortcut icon" href="/wekan-favicon.png") - link(rel="apple-touch-icon" href="/wekan-favicon.png") - link(rel="mask-icon" href="/wekan-150.svg") - link(rel="manifest" href="/wekan-manifest.json") + link(rel="shortcut icon" href="/public/wekan-favicon.png") + link(rel="apple-touch-icon" href="/public/wekan-favicon.png") + link(rel="mask-icon" href="/public/wekan-150.svg") + link(rel="manifest" href="/public/wekan-manifest.json") template(name="userFormsLayout") section.auth-layout diff --git a/client/lib/popup.js b/client/lib/popup.js index 0a700f82..516ce849 100644 --- a/client/lib/popup.js +++ b/client/lib/popup.js @@ -4,9 +4,9 @@ window.Popup = new class { this.template = Template.popup; // We only want to display one popup at a time and we keep the view object - // in this `Popup._current` variable. If there is no popup currently opened + // in this `Popup.current` variable. If there is no popup currently opened // the value is `null`. - this._current = null; + this.current = null; // It's possible to open a sub-popup B from a popup A. In that case we keep // the data of popup A so we can return back to it. Every time we open a new |