From 1f6a10fd125e2b6810726c41c3365ee0f16721f7 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Thu, 25 Jun 2015 17:08:23 +0200 Subject: [PATCH] feature #3748: Use button instead of a for dropdown --- src/sunstone/public/app/sunstone.js | 32 ++++++++++++++--------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/src/sunstone/public/app/sunstone.js b/src/sunstone/public/app/sunstone.js index c8391c894e..e9eacdfa2e 100644 --- a/src/sunstone/public/app/sunstone.js +++ b/src/sunstone/public/app/sunstone.js @@ -223,12 +223,10 @@ define(function(require) { break; case "refresh": buttonContext = $("#" + customId + "refresh_buttons", buttonsRow); - text = '' + - '' + - //''+ - ''; + icon = button.icon ? button.icon : ''; + text = button.text ? icon + ' ' + button.text : icon; strClass.push("white_button", "refresh", "secondary", "button", "small", "radius"); - buttonCode = '' + text + ''; + buttonCode = ''; break; case "top": buttonContext = $("#" + customId + "refresh_buttons", buttonsRow); @@ -307,41 +305,41 @@ define(function(require) { actionBlock.append(buttonsRow); if ($("#" + customId + "more_buttons li", actionBlock).length == 0) { - $("a[data-dropdown=" + customId + "more_buttons]", actionBlock).remove() + $("button[data-dropdown=" + customId + "more_buttons]", actionBlock).remove() } if ($("#" + customId + "user_buttons li", actionBlock).length == 0) { - $("a[data-dropdown=" + customId + "user_buttons]", actionBlock).remove() + $("button[data-dropdown=" + customId + "user_buttons]", actionBlock).remove() } if ($("#" + customId + "vmsplanification_buttons li", actionBlock).length == 0) { - $("a[data-dropdown=" + customId + "vmsplanification_buttons]", actionBlock).remove() + $("button[data-dropdown=" + customId + "vmsplanification_buttons]", actionBlock).remove() } if ($("#" + customId + "vmsdelete_buttons li", actionBlock).length == 0) { - $("a[data-dropdown=" + customId + "vmsdelete_buttons]", actionBlock).remove() + $("button[data-dropdown=" + customId + "vmsdelete_buttons]", actionBlock).remove() } if ($("#" + customId + "vmsstop_buttons li", actionBlock).length == 0) { - $("a[data-dropdown=" + customId + "vmsstop_buttons]", actionBlock).remove() + $("button[data-dropdown=" + customId + "vmsstop_buttons]", actionBlock).remove() } if ($("#" + customId + "vmspause_buttons li", actionBlock).length == 0) { - $("a[data-dropdown=" + customId + "vmspause_buttons]", actionBlock).remove() + $("button[data-dropdown=" + customId + "vmspause_buttons]", actionBlock).remove() } if ($("#" + customId + "vmsrepeat_buttons li", actionBlock).length == 0) { - $("a[data-dropdown=" + customId + "vmsrepeat_buttons]", actionBlock).remove() + $("button[data-dropdown=" + customId + "vmsrepeat_buttons]", actionBlock).remove() } if ($("#" + customId + "user_buttons li", actionBlock).length == 0) { - $("a[data-dropdown=" + customId + "user_buttons]", actionBlock).remove() + $("button[data-dropdown=" + customId + "user_buttons]", actionBlock).remove() } //actionBlock.foundationButtons(); - $('.top_button, .list_button', actionBlock).attr('disabled', false); - $('.top_button, .list_button', actionBlock).attr('disabled', true); - $('.create_dialog_button', actionBlock).attr('disabled', false); - $('.alwaysActive', actionBlock).attr('disabled', false); + $('.top_button, .list_button', actionBlock).prop('disabled', false); + $('.top_button, .list_button', actionBlock).prop('disabled', true); + $('.create_dialog_button', actionBlock).prop('disabled', false).removeAttr('disabled'); + $('.alwaysActive', actionBlock).prop('disabled', false).removeAttr('disabled'); $('#' + customId + 'reset_button', actionBlock).on("click", function() { _resetFormPanel(tabName);