From 74d72c9cd37a134a6472563135d9d4ddeb425039 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Fri, 7 Mar 2014 12:59:30 +0100 Subject: [PATCH] Fix reset buttons --- src/sunstone/public/js/plugins/datastores-tab.js | 2 -- src/sunstone/public/js/plugins/groups-tab.js | 1 - src/sunstone/public/js/plugins/hosts-tab.js | 1 - src/sunstone/public/js/plugins/images-tab.js | 4 +--- src/sunstone/public/js/plugins/oneflow-templates.js | 5 ++--- src/sunstone/public/js/plugins/templates-tab.js | 2 -- src/sunstone/public/js/plugins/vnets-tab.js | 2 -- 7 files changed, 3 insertions(+), 14 deletions(-) diff --git a/src/sunstone/public/js/plugins/datastores-tab.js b/src/sunstone/public/js/plugins/datastores-tab.js index bb0e8828f0..0d60e10c0c 100644 --- a/src/sunstone/public/js/plugins/datastores-tab.js +++ b/src/sunstone/public/js/plugins/datastores-tab.js @@ -964,7 +964,6 @@ function setupCreateDatastoreDialog(){ }); $('#wizard_ds_reset_button').click(function(){ - $create_datastore_dialog.foundation('reveal', 'close'); $create_datastore_dialog.html(""); setupCreateDatastoreDialog(); @@ -974,7 +973,6 @@ function setupCreateDatastoreDialog(){ }); $('#advanced_ds_reset_button').click(function(){ - $create_datastore_dialog.foundation('reveal', 'close'); $create_datastore_dialog.html(""); setupCreateDatastoreDialog(); diff --git a/src/sunstone/public/js/plugins/groups-tab.js b/src/sunstone/public/js/plugins/groups-tab.js index 19be083954..3c581b88f3 100644 --- a/src/sunstone/public/js/plugins/groups-tab.js +++ b/src/sunstone/public/js/plugins/groups-tab.js @@ -1078,7 +1078,6 @@ function setupCreateGroupDialog(){ setupTips($create_group_dialog); $('#create_group_reset_button').click(function(){ - $create_group_dialog.foundation('reveal', 'close'); $create_group_dialog.html(""); setupCreateGroupDialog(); diff --git a/src/sunstone/public/js/plugins/hosts-tab.js b/src/sunstone/public/js/plugins/hosts-tab.js index ed81c4bafd..4e87f27afb 100644 --- a/src/sunstone/public/js/plugins/hosts-tab.js +++ b/src/sunstone/public/js/plugins/hosts-tab.js @@ -897,7 +897,6 @@ function setupCreateHostDialog(){ }); $('#wizard_host_reset_button').click(function(){ - $create_host_dialog.foundation('reveal', 'close'); $create_host_dialog.html(""); setupCreateHostDialog(); diff --git a/src/sunstone/public/js/plugins/images-tab.js b/src/sunstone/public/js/plugins/images-tab.js index 6a789831b2..64202ebcae 100644 --- a/src/sunstone/public/js/plugins/images-tab.js +++ b/src/sunstone/public/js/plugins/images-tab.js @@ -1140,15 +1140,13 @@ function initialize_create_image_dialog(dialog) { }); $('#wizard_image_reset_button').click(function(){ - dialog.foundation('reveal', 'close'); - //dialog.html(""); + dialog.html(""); setupCreateImageDialog(); popUpCreateImageDialog(); }); $('#advanced_image_reset_button').click(function(){ - dialog.foundation('reveal', 'close'); dialog.html(""); setupCreateImageDialog(); diff --git a/src/sunstone/public/js/plugins/oneflow-templates.js b/src/sunstone/public/js/plugins/oneflow-templates.js index 3be1fd1528..7c82632dba 100644 --- a/src/sunstone/public/js/plugins/oneflow-templates.js +++ b/src/sunstone/public/js/plugins/oneflow-templates.js @@ -1114,8 +1114,7 @@ function setupCreateServiceTemplateDialog(){ }); $('#create_service_template_reset', dialog).click(function(){ - $create_service_template_dialog.foundation('reveal', 'close'); - $create_service_template_dialog.html(""); + dialog.html(""); setupCreateServiceTemplateDialog(); popUpCreateServiceTemplateDialog(); @@ -1396,7 +1395,7 @@ function fillUpUpdateServiceTemplateDialog(request, response){ service_template_to_update_id = service_template.ID; - dialog.foundation().foundation('reveal', 'open'); + dialog.foundation('reveal', 'open'); } // Set the autorefresh interval for the datatable diff --git a/src/sunstone/public/js/plugins/templates-tab.js b/src/sunstone/public/js/plugins/templates-tab.js index 2b4a280110..0030ea8934 100644 --- a/src/sunstone/public/js/plugins/templates-tab.js +++ b/src/sunstone/public/js/plugins/templates-tab.js @@ -3515,14 +3515,12 @@ function initialize_create_template_dialog(dialog) { var tabs = $( "#template_create_tabs", dialog)//.tabs().addClass("ui-tabs-vertical"); $('#template_template_reset_button', dialog).click(function(){ - dialog.foundation('reveal', 'close'); dialog.html(""); setupCreateTemplateDialog(); popUpCreateTemplateDialog(); }); $('#template_template_reset_button_update', dialog).click(function(){ - dialog.foundation('reveal', 'close'); dialog.html(""); setupCreateTemplateDialog(); diff --git a/src/sunstone/public/js/plugins/vnets-tab.js b/src/sunstone/public/js/plugins/vnets-tab.js index fa8e3f69fb..168e20dcf3 100644 --- a/src/sunstone/public/js/plugins/vnets-tab.js +++ b/src/sunstone/public/js/plugins/vnets-tab.js @@ -1309,7 +1309,6 @@ function setupCreateVNetDialog() { }); $('#wizard_vnet_reset_button').click(function(){ - $create_vn_dialog.foundation('reveal', 'close'); $create_vn_dialog.html(""); setupCreateVNetDialog(); @@ -1317,7 +1316,6 @@ function setupCreateVNetDialog() { }); $('#advanced_vnet_reset_button').click(function(){ - $create_vn_dialog.foundation('reveal', 'close'); $create_vn_dialog.html(""); setupCreateVNetDialog();