Skip to content

Commit

Permalink
1. change from hidden-inset to hiddenInset since this value has been …
Browse files Browse the repository at this point in the history
…marked as deprecated

2. due to 8d021e5, adjust the lulumiRootPath
3. enables plugins in webview so as to use the default chrome pdf viewer, since plugins are disabled by default
  • Loading branch information
qazbnm456 committed Jun 6, 2017
1 parent a7efd65 commit ec38354
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/main/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ function createWindow() {
width: 1080,
minWidth: 320,
minHeight: 500,
titleBarStyle: 'hidden-inset',
titleBarStyle: 'hiddenInset',
autoHideMenuBar: true,
});

Expand Down
6 changes: 4 additions & 2 deletions src/main/js/constants/config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import path from 'path';

const lulumiRootPath = path.resolve(__dirname, '../');
const lulumiRootPath = process.env.NODE_ENV === 'development'
? path.resolve(__dirname, '../../../../')
: path.resolve(__dirname, '../');
const lulumiHelperPath = path.resolve(lulumiRootPath, './helper');

export default {
Expand All @@ -13,5 +15,5 @@ export default {
lulumiPreloadPath: `${lulumiHelperPath}/preload`,
lulumiPagesPath: `${lulumiHelperPath}/pages`,
lulumiPDFJSPath: `${lulumiHelperPath}/pdfjs`,
lulumiRev: '6726e0ef2089f14da761f4e5e6b9fbf27ff2cc8a',
lulumiRev: 'a7efd65c0714a4b12ad5860b477c6b25291f1246',
};
2 changes: 1 addition & 1 deletion src/renderer/components/BrowserMainView/Page.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
transition(name="notification")
#notification(v-show="showNotification && isActive")
notification
webview(:element-loading-text="$t('page.loading')", ref="webview", :class="isActive ? 'active' : 'hidden'")
webview(plugins, :element-loading-text="$t('page.loading')", ref="webview", :class="isActive ? 'active' : 'hidden'")
.findinpage-bar(ref="findinpageBar", v-show="!hidden && isActive")
input(ref="findinpageInput", :placeholder="$t('page.findInPage.placeholder')")
span(ref="findinpageCount")
Expand Down

0 comments on commit ec38354

Please sign in to comment.