Merge pull request #63 from crowi/fix-content-header

Fix: JavaScript error on editing

lib/views/page.html

@@ -165,11 +165,11 @@
 
         //data-spy="affix" data-offset-top="80"
         var headerHeight = $('#page-header').outerHeight(true);
-        $('.header-wrap').css({height: headerHeight + 'px'});
+        $('.header-wrap').css({height: (headerHeight + 16) + 'px'});
         $('#page-header').affix({
           offset: {
             top: function() {
-              return headerHeight + 74; // (54 header + 20 padding-top)
+              return headerHeight + 86; // (54 header + 16 header padding-top + 16 content padding-top)
             }
           }
         });

resource/css/_page.scss

@@ -65,6 +65,7 @@
       h1 {
         font-size: 28px;
         margin-top: 0;
+        margin-bottom: 0;
 
         a:last-child {
           color: #D1E2E4;

resource/js/crowi-form.js

@@ -128,7 +128,7 @@ $(function() {
         var indent = listMarkMatch[1];
         var num = parseInt(listMarkMatch[2]);
         if (num !== 1) {
-          listMark = listMark.return(/\s*\d+/, indent + (num +1));
+          listMark = listMark.replace(/\s*\d+/, indent + (num +1));
         }
       }
       $target.selection('insert', {text: "\n" + listMark, mode: 'before'});
@@ -214,6 +214,10 @@ $(function() {
 
   var handlePasteEvent = function(event) {
     var currentLine = getCurrentLine(event);
+
+    if (!currentLine) {
+      return false;
+    }
     var $target = $(event.target);
     var pasteText = event.clipboardData.getData('text');
 
@@ -228,11 +232,14 @@ $(function() {
 
     var newPos = currentLine.end + pasteText.length;
     $target.selection('setPos', {start: newPos, end: newPos});
+
+    return true;
   };
 
   document.getElementById('form-body').addEventListener('paste', function(event) {
-    event.preventDefault();
-    handlePasteEvent(event);
+    if (handlePasteEvent(event)) {
+      event.preventDefault();
+    }
   });
 
   var unbindInlineAttachment = function($form) {