From 7405e198eb60696600e3c4a9b213c3215f04e40c Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Fri, 31 Aug 2018 14:23:23 +0200 Subject: [PATCH] Use .displayAs() instead of .show() Needed for CSS display to be set as inline-block instead of show()'s inline. --- src/templates/nodes/custom/_scripts.pug | 2 +- src/templates/projects/edit.pug | 3 ++- src/templates/projects/view.pug | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/templates/nodes/custom/_scripts.pug b/src/templates/nodes/custom/_scripts.pug index 05fbbc76..7be01148 100644 --- a/src/templates/nodes/custom/_scripts.pug +++ b/src/templates/nodes/custom/_scripts.pug @@ -61,7 +61,7 @@ script(type="text/javascript"). } {% if node.has_method('PUT') %} - $('.project-mode-view').show(); + $('.project-mode-view').displayAs('inline-block'); {% else %} $('.project-mode-view').hide(); {% endif %} diff --git a/src/templates/projects/edit.pug b/src/templates/projects/edit.pug index e24883f0..77d40c6d 100644 --- a/src/templates/projects/edit.pug +++ b/src/templates/projects/edit.pug @@ -105,7 +105,8 @@ script(type='text/javascript', src="{{ url_for('static_pillar', filename='assets script(type="text/javascript"). - $('.project-mode-edit').show(); + // Show view mode buttons. + $('.project-mode-view').displayAs('inline-block'); ProjectUtils.setProjectAttributes({projectId: "{{project._id}}", isProject: true, nodeId: ''}); var convert = new Markdown.getSanitizingConverter().makeHtml; diff --git a/src/templates/projects/view.pug b/src/templates/projects/view.pug index 6626636a..f4669381 100644 --- a/src/templates/projects/view.pug +++ b/src/templates/projects/view.pug @@ -303,7 +303,7 @@ script. function updateUi(nodeId, mode) { if (mode === 'view') { - $('.project-mode-view').show(); + $('.project-mode-view').displayAs('inline-block'); $('.project-mode-edit').hide(); $("#node-edit-form").unbind("submit"); @@ -311,12 +311,12 @@ script. $("#item_cancel").unbind("click"); } else if (mode === 'edit') { $('.project-mode-view').hide(); - $('.project-mode-edit').show(); + $('.project-mode-edit').displayAs('inline-block'); } else { if (console) console.log('Invalid mode:', mode); } - // Prevent flicker by scrolling to top + // Prevent flicker by scrolling to top. $("#project_context-container").scrollTop(0); // Enable specific items under the Add New dropdown @@ -497,7 +497,7 @@ script. // Handle old-style /p/{url}/#node-ID links, and redirect them to the correct spot. redirectToNode(location.hash.substr(1)); } - $('.project-mode-view').show(); + $('.project-mode-view').displayAs('inline-block'); $('.project-mode-edit').hide(); } else { displayNode(nodeId, false);