Browse Source

fix: Safari js workaround

NGPixel 8 years ago
parent
commit
c82aacfb29

+ 3 - 3
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) {

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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')

+ 1 - 1
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')

+ 1 - 1
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')

+ 1 - 1
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

+ 1 - 1
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')

+ 1 - 1
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