Yuki Takei 9 лет назад
Родитель
Сommit
6507962421

+ 1 - 0
config/webpack.common.js

@@ -28,6 +28,7 @@ module.exports = function (options) {
       'legacy-presentation':  './resource/js/legacy/crowi-presentation',
       'plugin':               './resource/js/plugin',
       'style':                './resource/styles',
+      'style-presentation':   './resource/styles/presentation',
     },
     externals: {
       // require("jquery") is external and available

+ 7 - 7
lib/views/page_presentation.html

@@ -6,18 +6,18 @@
     <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
 
-
-    <link rel="stylesheet" type="text/css" href="/css/crowi-reveal{% if env  == 'production' %}.min{% endif %}.css">
-    <link rel="stylesheet" type="text/css" href="/js/reveal/lib/css/zenburn.css">
+    <!-- jQuery -->
+    <script src="//cdn.jsdelivr.net/jquery/3.2.1/jquery.min.js"></script>
 
     {% if env === 'development' %}
-      <script src="{{ webpack_asset('style').js }}"></script>
-      <!--<script src="{{ webpack_asset('dev').js }}" async></script>-->
-      <script src="/js/dll/vendor.dll.js" defer></script>
+      <script src="/js/dll/vendor.dll.js"></script>
+      <script src="{{ webpack_asset('dev').js }}" async></script>
     {% endif %}
 
+    <script src="{{ webpack_asset('style').js }}"></script>
+    <script src="{{ webpack_asset('style-presentation').js }}"></script>
     <script src="{{ webpack_asset('commons').js }}" defer></script>
-    <script src="{{ webpack_asset('presentation').js }}" defer></script>
+    <script src="{{ webpack_asset('legacy-presentation').js }}" defer></script>
 
     <title>{{ path|path2name }} | {{ path }}</title>
   </head>

+ 1 - 0
package.json

@@ -74,6 +74,7 @@
     "express-form": "~0.12.0",
     "express-session": "~1.15.0",
     "express-webpack-assets": "0.0.2",
+    "file-loader": "^0.11.1",
     "googleapis": "=12.3.0",
     "graceful-fs": "^4.1.11",
     "highlight.js": "^9.10.0",

+ 0 - 3
resource/css/crowi-reveal.scss

@@ -1,6 +1,3 @@
-@import 'reveal.scss';
-@import 'theme/source/black';
-
 .reveal {
   font-size: 32px;
   section * {

+ 19 - 8
resource/js/legacy/crowi-presentation.js

@@ -1,5 +1,7 @@
 var Reveal = require('reveal.js');
 
+require("reveal.js/css/reveal.css");
+require("reveal.js/css/theme/black.css");
 require('reveal.js/lib/js/head.min.js');
 require('reveal.js/lib/js/html5shiv.js');
 
@@ -16,16 +18,25 @@ Reveal.initialize({
   transition: 'slide',
 
   // Optional libraries used to extend on reveal.js
-  dependencies: [
-    { src: '/js/reveal/lib/js/classList.js', condition: function() { return !document.body.classList; } },
-    { src: '/js/reveal/plugin/markdown/marked.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
-    { src: '/js/reveal/plugin/markdown/markdown.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
-    { src: '/js/reveal/plugin/highlight/highlight.js', async: true, callback: function() { hljs.initHighlightingOnLoad(); } },
-    { src: '/js/reveal/plugin/zoom-js/zoom.js', async: true, condition: function() { return !!document.body.classList; } },
-    { src: '/js/reveal/plugin/notes/notes.js', async: true, condition: function() { return !!document.body.classList; } }
-  ]
+  // dependencies: [
+  //   { src: 'lib/js/classList.js', condition: function() { return !document.body.classList; } },
+  //   { src: 'plugin/markdown/marked.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
+  //   { src: 'plugin/markdown/markdown.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
+  //   { src: 'plugin/highlight/highlight.js', async: true, callback: function() { hljs.initHighlightingOnLoad(); } },
+  //   { src: 'plugin/zoom-js/zoom.js', async: true, condition: function() { return !!document.body.classList; } },
+  //   { src: 'plugin/notes/notes.js', async: true, condition: function() { return !!document.body.classList; } }
+  // ]
 });
 
+require.ensure([], () => {
+  require('reveal.js/lib/js/classList.js');
+  require('reveal.js/plugin/markdown/marked.js');
+  require('reveal.js/plugin/markdown/markdown.js');
+  require('reveal.js/plugin/highlight/highlight.js');
+  require('reveal.js/plugin/zoom-js/zoom.js');
+  require('reveal.js/plugin/notes/notes.js');
+})
+
 Reveal.addEventListener('ready', function(event) {
   // event.currentSlide, event.indexh, event.indexv
   $('.reveal section').each(function(e) {

+ 1 - 0
resource/styles/presentation.js

@@ -0,0 +1 @@
+import '../css/crowi-reveal.scss';

+ 6 - 0
yarn.lock

@@ -2172,6 +2172,12 @@ feature-detect-es6@^1.2.0:
   dependencies:
     array-back "^1.0.3"
 
+file-loader@^0.11.1:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-0.11.1.tgz#6b328ee1234a729e4e47d36375dd6d35c0e1db84"
+  dependencies:
+    loader-utils "^1.0.2"
+
 filename-regex@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.0.tgz#996e3e80479b98b9897f15a8a58b3d084e926775"