From da9dac9aa190b8bc88ecfad587b89512febe6d2d Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Mon, 12 May 2014 17:28:07 +0200 Subject: [PATCH] bug #2905: Fix setupTips in firefox 29 (cherry picked from commit a518f078edc35a5e993c18b31bd01dafbd4435ff) --- src/sunstone/public/js/plugins/templates-tab.js | 10 +++------- src/sunstone/public/js/sunstone.js | 4 ++-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/sunstone/public/js/plugins/templates-tab.js b/src/sunstone/public/js/plugins/templates-tab.js index e4ee67d112..657f4aab17 100644 --- a/src/sunstone/public/js/plugins/templates-tab.js +++ b/src/sunstone/public/js/plugins/templates-tab.js @@ -3612,13 +3612,9 @@ function initialize_create_template_dialog(dialog) { setup_other_tab_content(tab); } - // Re-Setup tips - setupTips(dialog); - - - $(document).foundation(); - + dialog.foundation(); // Add first disk and network + setupTips(dialog); $("#tf_btn_disks", dialog).trigger("click"); $("#tf_btn_nics", dialog).trigger("click"); @@ -3869,7 +3865,7 @@ function popUpCreateTemplateDialog(){ $('#wizard_mode', $create_template_dialog).show(); - $create_template_dialog.foundation().foundation('reveal', 'open'); + $create_template_dialog.foundation('reveal', 'open'); $("input#NAME",$create_template_dialog).focus(); diff --git a/src/sunstone/public/js/sunstone.js b/src/sunstone/public/js/sunstone.js index 21790d112e..00fb16cda6 100644 --- a/src/sunstone/public/js/sunstone.js +++ b/src/sunstone/public/js/sunstone.js @@ -1702,9 +1702,9 @@ function setupTips(context, position){ } //replace the text with an icon and spans obj.html(''); + obj.foundation(); }); - context.foundation(); } //returns an array of ids of selected elements in a dataTable @@ -3591,7 +3591,7 @@ function hideDialog(){ function popDialog(content, context){ $(".right-info", context).html(content); - $(document).foundation(); + context.foundation(); //innerLayout.open("south"); }