Merge branch 'move-markdown-preview' into 'master'
Remove preview_markdown from the global obj See merge request gitlab-org/gitlab-ce!16025
This commit is contained in:
commit
d2d634a990
3 changed files with 167 additions and 169 deletions
|
@ -7,6 +7,7 @@ import installGlEmojiElement from './gl_emoji';
|
||||||
import './quick_submit';
|
import './quick_submit';
|
||||||
import './requires_input';
|
import './requires_input';
|
||||||
import './toggler_behavior';
|
import './toggler_behavior';
|
||||||
|
import '../preview_markdown';
|
||||||
|
|
||||||
installGlEmojiElement();
|
installGlEmojiElement();
|
||||||
initCopyAsGFM();
|
initCopyAsGFM();
|
||||||
|
|
|
@ -46,7 +46,6 @@ import LazyLoader from './lazy_loader';
|
||||||
import './line_highlighter';
|
import './line_highlighter';
|
||||||
import initLogoAnimation from './logo';
|
import initLogoAnimation from './logo';
|
||||||
import './milestone_select';
|
import './milestone_select';
|
||||||
import './preview_markdown';
|
|
||||||
import './projects_dropdown';
|
import './projects_dropdown';
|
||||||
import './render_gfm';
|
import './render_gfm';
|
||||||
import initBreadcrumbs from './breadcrumb';
|
import initBreadcrumbs from './breadcrumb';
|
||||||
|
|
|
@ -6,14 +6,13 @@
|
||||||
// (including the explanation of quick actions), and showing a warning when
|
// (including the explanation of quick actions), and showing a warning when
|
||||||
// more than `x` users are referenced.
|
// more than `x` users are referenced.
|
||||||
//
|
//
|
||||||
(function () {
|
|
||||||
var lastTextareaPreviewed;
|
var lastTextareaPreviewed;
|
||||||
var lastTextareaHeight = null;
|
var lastTextareaHeight = null;
|
||||||
var markdownPreview;
|
var markdownPreview;
|
||||||
var previewButtonSelector;
|
var previewButtonSelector;
|
||||||
var writeButtonSelector;
|
var writeButtonSelector;
|
||||||
|
|
||||||
window.MarkdownPreview = (function () {
|
|
||||||
function MarkdownPreview() {}
|
function MarkdownPreview() {}
|
||||||
|
|
||||||
// Minimum number of users referenced before triggering a warning
|
// Minimum number of users referenced before triggering a warning
|
||||||
|
@ -113,10 +112,8 @@
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
return MarkdownPreview;
|
markdownPreview = new MarkdownPreview();
|
||||||
}());
|
|
||||||
|
|
||||||
markdownPreview = new window.MarkdownPreview();
|
|
||||||
previewButtonSelector = '.js-md-preview-button';
|
previewButtonSelector = '.js-md-preview-button';
|
||||||
writeButtonSelector = '.js-md-write-button';
|
writeButtonSelector = '.js-md-write-button';
|
||||||
lastTextareaPreviewed = null;
|
lastTextareaPreviewed = null;
|
||||||
|
@ -197,4 +194,5 @@
|
||||||
$form = $(this).closest('form');
|
$form = $(this).closest('form');
|
||||||
$(document).triggerHandler('markdown-preview:hide', [$form]);
|
$(document).triggerHandler('markdown-preview:hide', [$form]);
|
||||||
});
|
});
|
||||||
}());
|
|
||||||
|
export default MarkdownPreview;
|
||||||
|
|
Loading…
Reference in a new issue