Browse Source

fix #17 Form layout is skewed when direct access with `#edit-form` hash

Yuki Takei 9 years ago
parent
commit
e7db68215c
3 changed files with 6 additions and 5 deletions
  1. 2 3
      config/webpack.common.js
  2. 0 1
      lib/views/_form.html
  3. 4 1
      resource/js/legacy/crowi-form.js

+ 2 - 3
config/webpack.common.js

@@ -22,8 +22,7 @@ module.exports = function (options) {
   return {
     entry: {
       'app':                  './resource/js/app',
-      'legacy':               './resource/js/legacy/crowi',
-      'legacy-form':          './resource/js/legacy/crowi-form',
+      'legacy':               ['./resource/js/legacy/crowi', './resource/js/legacy/crowi-form'],
       'legacy-admin':         './resource/js/legacy/crowi-admin',
       'legacy-presentation':  './resource/js/legacy/crowi-presentation',
       'plugin':               './resource/js/plugin',
@@ -85,7 +84,7 @@ module.exports = function (options) {
 
       new CommonsChunkPlugin({
         name: 'commons',
-        chunks: ['app', 'legacy', 'legacy-form', 'legacy-admin'],
+        chunks: ['app', 'legacy', 'legacy-admin'],
         minChunks: module => /node_modules/.test(module.resource),
       }),
       new CommonsChunkPlugin({

+ 0 - 1
lib/views/_form.html

@@ -61,4 +61,3 @@
   <div class="file-module hidden">
   </div>
 </div>
-<script src="{{ webpack_asset('legacy-form').js }}" defer></script>

+ 4 - 1
resource/js/legacy/crowi-form.js

@@ -1,4 +1,3 @@
-$(function() {
   var pageId = $('#content-main').data('page-id');
   var pagePath= $('#content-main').data('path');
   var isEnabledLineBreaks = $('#content-main').data('linebreaks-enabled');
@@ -56,6 +55,10 @@ $(function() {
     $('.content-main').removeClass('on-edit');
   });
 
+/**
+ * DOM ready
+ */
+$(function() {
   // preview watch
   var originalContent = $('#form-body').val();