harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more wiki fullscreen optimisation

Browse Source
This commit is contained in:
Mario Vavti 2016-12-10 15:51:55 +01:00
parent dc64556902
commit bde32eb7df
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
view/css/mod_wiki.css
View File

@ -1,7 +1,6 @@
#ace-editor { #ace-editor {
position: relative; position: relative;
width: 100%; width: 100%;
height: 500px;
border: 1px solid #ccc; border: 1px solid #ccc;
border-top: 0px; border-top: 0px;
} }

30
view/tpl/wiki.tpl
View File

@ -19,7 +19,7 @@
</div> </div>
{{/if}} {{/if}}
<button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(); adjustFullscreenEditorHeight();"><i class="fa fa-expand"></i></button> <button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(); adjustFullscreenEditorHeight();"><i class="fa fa-expand"></i></button>
<button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button> <button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false); adjustInlineEditorHeight()"><i class="fa fa-compress"></i></button>
</div> </div>
<h2> <h2>
<span id="wiki-header-name">{{$wikiheaderName}}</span>: <span id="wiki-header-name">{{$wikiheaderName}}</span>:
@ -147,6 +147,9 @@
theme: "ace/theme/github", theme: "ace/theme/github",
mode: "ace/mode/markdown", mode: "ace/mode/markdown",
maxLines: Infinity,
minLines: 30,
wrap: true, wrap: true,
printMargin: false printMargin: false
@ -167,9 +170,14 @@
{{/if}} {{/if}}
$('#edit-pane-tab').click(function (ev) { $('#edit-pane-tab').click(function (ev) {
setTimeout(function() {window.editor.focus(); adjustFullscreenEditorHeight();}, 500); // Return the focus to the editor allowing immediate text entry setTimeout(function() {
$('#page-tools').show(); window.editor.focus();
if($('main').hasClass('.fullscreen')) {
adjustFullscreenEditorHeight();
}
}, 500); // Return the focus to the editor allowing immediate text entry
$('#page-tools').show();
}); });
$('#wiki-get-preview').click(function (ev) { $('#wiki-get-preview').click(function (ev) {
@ -326,10 +334,24 @@
function adjustFullscreenEditorHeight() { function adjustFullscreenEditorHeight() {
$('#editor, #ace-editor').height($(window).height() - $('#id_commitMsg_wrapper').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - $('#wiki-nav-tabs').outerHeight(true) - 17); $('#editor, #ace-editor').height($(window).height() - $('#id_commitMsg_wrapper').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - $('#wiki-nav-tabs').outerHeight(true) - 17);
{{if !$mimeType || $mimeType == 'text/markdown'}}
editor.setOptions({
maxLines: '',
minLines: ''
});
editor.resize();
{{/if}}
} }
function adjustInlineEditorHeight() { function adjustInlineEditorHeight() {
$('#editor, #ace-editor').height($(window).height() - $('#id_commitMsg_wrapper').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - $('nav').outerHeight(true) - 23); $('#editor').height(500);
{{if !$mimeType || $mimeType == 'text/markdown'}}
editor.setOptions({
maxLines: Infinity,
minLines: 30
});
{{/if}}
} }
$('#embed-image').click(function (ev) { $('#embed-image').click(function (ev) {