From 89689db96e883a0f8f98d5a29cdab1b0c67c6fda Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Thu, 24 Nov 2016 19:43:11 +0100 Subject: [PATCH] Move tooltips/popovers code to layout --- src/scripts/tutti/0_navbar.js | 7 ------- src/templates/layout.jade | 7 +++++++ src/templates/nodes/custom/_scripts.jade | 5 ----- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/scripts/tutti/0_navbar.js b/src/scripts/tutti/0_navbar.js index 7445fffe..ff0b18ca 100644 --- a/src/scripts/tutti/0_navbar.js +++ b/src/scripts/tutti/0_navbar.js @@ -1,10 +1,3 @@ -if(typeof($.fn.popover) != 'undefined'){ - $('[data-toggle="popover"]').popover(); -} -if(typeof($.fn.tooltip) != 'undefined'){ - $('[data-toggle="tooltip"]').tooltip({'delay' : {'show': 0, 'hide': 0}}); -} - /* Status Bar */ function statusBarClear(delay_class, delay_html){ var statusBar = $("#status-bar"); diff --git a/src/templates/layout.jade b/src/templates/layout.jade index f269302a..6cf0ea60 100644 --- a/src/templates/layout.jade +++ b/src/templates/layout.jade @@ -419,6 +419,13 @@ html(lang="en") {% endif %} }); + if (typeof $().tooltip != 'undefined'){ + $('[data-toggle="tooltip"]').tooltip({'delay' : {'show': 0, 'hide': 0}}); + } + if(typeof($.fn.popover) != 'undefined'){ + $('[data-toggle="popover"]').popover(); + } + | {% block footer_scripts %}{% endblock %} script. diff --git a/src/templates/nodes/custom/_scripts.jade b/src/templates/nodes/custom/_scripts.jade index 45da1453..2853cad8 100644 --- a/src/templates/nodes/custom/_scripts.jade +++ b/src/templates/nodes/custom/_scripts.jade @@ -165,8 +165,3 @@ script(type="text/javascript"). } {% endif %} - - - if (typeof $().tooltip != 'undefined'){ - $('[data-toggle="tooltip"]').tooltip({'delay' : {'show': 0, 'hide': 0}}); - }