From c82aacfb2903f38d07469c263e10f47cd860a4ef Mon Sep 17 00:00:00 2001 From: NGPixel Date: Sat, 8 Jul 2017 20:24:21 -0400 Subject: [PATCH] fix: Safari js workaround --- fuse.js | 6 +++--- server/views/auth/login.pug | 2 +- server/views/configure/index.pug | 2 +- server/views/error-forbidden.pug | 2 +- server/views/error-notexist.pug | 2 +- server/views/error.pug | 2 +- server/views/layout.pug | 2 +- server/views/pages/admin/_layout.pug | 2 +- server/views/pages/view.pug | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/fuse.js b/fuse.js index 08fe4c0a..f24cb12f 100644 --- a/fuse.js +++ b/fuse.js @@ -114,9 +114,9 @@ globalTasks.then(() => { log: true }) - const bundleVendor = fuse.bundle('vendor').shim(SHIMS).instructions('~ index.js') // eslint-disable-line no-unused-vars - const bundleApp = fuse.bundle('app').instructions('!> [index.js]') - // const bundleApp = fuse.bundle('app').instructions('> index.js') + // const bundleVendor = fuse.bundle('vendor').shim(SHIMS).instructions('~ index.js') // eslint-disable-line no-unused-vars + // const bundleApp = fuse.bundle('app').instructions('!> [index.js]') + const bundleApp = fuse.bundle('app').instructions('> index.js') const bundleSetup = fuse.bundle('configure').instructions('> configure.js') switch (mode) { diff --git a/server/views/auth/login.pug b/server/views/auth/login.pug index ad860349..a8d1772f 100644 --- a/server/views/auth/login.pug +++ b/server/views/auth/login.pug @@ -18,7 +18,7 @@ html(data-logic='login') link(rel='manifest', href='/manifest.json') // JS / CSS - script(type='text/javascript', src=appconfig.host + '/js/vendor.js') + //- script(type='text/javascript', src=appconfig.host + '/js/vendor.js') script(type='text/javascript', src=appconfig.host + '/js/app.js') body diff --git a/server/views/configure/index.pug b/server/views/configure/index.pug index d6c1f62a..c9dc4cc5 100644 --- a/server/views/configure/index.pug +++ b/server/views/configure/index.pug @@ -13,7 +13,7 @@ html(data-logic='configure') script(type='text/javascript'). var appconfig = !{JSON.stringify(conf)}; var runmode = !{JSON.stringify(runmode)}; - script(type='text/javascript', src='/js/vendor.js') + //- script(type='text/javascript', src='/js/vendor.js') script(type='text/javascript', src='/js/configure.js') body diff --git a/server/views/error-forbidden.pug b/server/views/error-forbidden.pug index 0028cf88..87300e5e 100644 --- a/server/views/error-forbidden.pug +++ b/server/views/error-forbidden.pug @@ -18,7 +18,7 @@ html(data-logic='error') link(rel='manifest', href=appconfig.host + '/manifest.json') // JS / CSS - script(type='text/javascript', src=appconfig.host + '/js/vendor.js') + //- script(type='text/javascript', src=appconfig.host + '/js/vendor.js') script(type='text/javascript', src=appconfig.host + '/js/app.js') body(class='is-forbidden') diff --git a/server/views/error-notexist.pug b/server/views/error-notexist.pug index afe2bb19..b1cf0498 100644 --- a/server/views/error-notexist.pug +++ b/server/views/error-notexist.pug @@ -18,7 +18,7 @@ html(data-logic='error') link(rel='manifest', href=appconfig.host + '/manifest.json') // JS / CSS - script(type='text/javascript', src=appconfig.host + '/js/vendor.js') + //- script(type='text/javascript', src=appconfig.host + '/js/vendor.js') script(type='text/javascript', src=appconfig.host + '/js/app.js') body(class='is-notexist') diff --git a/server/views/error.pug b/server/views/error.pug index 3ef6c43f..4aac07f7 100644 --- a/server/views/error.pug +++ b/server/views/error.pug @@ -18,7 +18,7 @@ html(data-logic='error') link(rel='manifest', href=appconfig.host + '/manifest.json') // JS / CSS - script(type='text/javascript', src=appconfig.host + '/js/vendor.js') + //- script(type='text/javascript', src=appconfig.host + '/js/vendor.js') script(type='text/javascript', src=appconfig.host + '/js/app.js') body(class='is-error') diff --git a/server/views/layout.pug b/server/views/layout.pug index 4e0f0a9f..005cd388 100644 --- a/server/views/layout.pug +++ b/server/views/layout.pug @@ -23,7 +23,7 @@ html var siteRoot = '!{appconfig.host}'; //- JS / CSS - script(type='text/javascript', src=appconfig.host + '/js/vendor.js') + //- script(type='text/javascript', src=appconfig.host + '/js/vendor.js') script(type='text/javascript', src=appconfig.host + '/js/app.js') block head diff --git a/server/views/pages/admin/_layout.pug b/server/views/pages/admin/_layout.pug index 2776c8b9..3fdb973d 100644 --- a/server/views/pages/admin/_layout.pug +++ b/server/views/pages/admin/_layout.pug @@ -48,7 +48,7 @@ block content a(href='/admin/theme') i.nc-icon-outline.ui-1_drop span= t('nav.theme') - li + //-li a(href='/admin/settings') i.nc-icon-outline.ui-1_settings-gear-63 span= t('nav.syssettings') diff --git a/server/views/pages/view.pug b/server/views/pages/view.pug index 4056aeac..885fd5b6 100644 --- a/server/views/pages/view.pug +++ b/server/views/pages/view.pug @@ -18,7 +18,7 @@ block rootNavRight a.button.is-outlined(href='/source/' + pageData.meta.path) i.nc-icon-outline.education_paper span= t('nav.source') - a.button.is-outlined(href='/hist/' + pageData.meta.path) + //-a.button.is-outlined(href='/hist/' + pageData.meta.path) i.nc-icon-outline.ui-2_time span= t('nav.history') if rights.write