From 5989058b564ab6e57c8362cdf0805fff6a75a0d2 Mon Sep 17 00:00:00 2001 From: Abel Coronado Date: Wed, 8 Nov 2017 16:28:00 +0100 Subject: [PATCH] B #5536: Solved bug click event in Firefox (#565) --- .../app/tabs/users-tab/panels/info-common.js | 92 ++++++++++--------- .../public/app/utils/panel/cluster-tr.js | 3 +- 2 files changed, 49 insertions(+), 46 deletions(-) diff --git a/src/sunstone/public/app/tabs/users-tab/panels/info-common.js b/src/sunstone/public/app/tabs/users-tab/panels/info-common.js index 95c17ad290..48e0f49997 100644 --- a/src/sunstone/public/app/tabs/users-tab/panels/info-common.js +++ b/src/sunstone/public/app/tabs/users-tab/panels/info-common.js @@ -19,19 +19,19 @@ define(function(require) { DEPENDENCIES */ - var TemplateInfo = require('hbs!./info/html'); - var ResourceSelect = require('utils/resource-select'); - var TemplateUtils = require('utils/template-utils'); - var Locale = require('utils/locale'); - var OpenNebulaUser = require('opennebula/user'); - var Sunstone = require('sunstone'); - var UserCreation = require('tabs/users-tab/utils/user-creation'); + var TemplateInfo = require("hbs!./info/html"); + var ResourceSelect = require("utils/resource-select"); + var TemplateUtils = require("utils/template-utils"); + var Locale = require("utils/locale"); + var OpenNebulaUser = require("opennebula/user"); + var Sunstone = require("sunstone"); + var UserCreation = require("tabs/users-tab/utils/user-creation"); /* TEMPLATES */ - var TemplateTable = require('utils/panel/template-table'); + var TemplateTable = require("utils/panel/template-table"); /* CONSTANTS @@ -39,9 +39,9 @@ define(function(require) { var RESOURCE = "User"; var XML_ROOT = "USER"; - var PASSWORD_DIALOG_ID = require('tabs/users-tab/dialogs/password/dialogId'); - var LOGIN_TOKEN_DIALOG_ID = require('tabs/users-tab/dialogs/login-token/dialogId'); - var CONFIRM_DIALOG_ID = require('utils/dialogs/generic-confirm/dialogId'); + var PASSWORD_DIALOG_ID = require("tabs/users-tab/dialogs/password/dialogId"); + var LOGIN_TOKEN_DIALOG_ID = require("tabs/users-tab/dialogs/login-token/dialogId"); + var CONFIRM_DIALOG_ID = require("utils/dialogs/generic-confirm/dialogId"); /* CONSTRUCTOR @@ -77,11 +77,11 @@ define(function(require) { //==== return TemplateInfo({ - 'element': this.element, - 'sunstone_template': this.element.TEMPLATE.SUNSTONE||{}, - 'templateTableHTML': templateTableHTML, - 'tabId': this.tabId, - 'userCreationHTML': this.userCreation.html() + "element": this.element, + "sunstone_template": this.element.TEMPLATE.SUNSTONE||{}, + "templateTableHTML": templateTableHTML, + "tabId": this.tabId, + "userCreationHTML": this.userCreation.html() }); } @@ -104,66 +104,70 @@ define(function(require) { } TemplateTable.setup(strippedTemplate, RESOURCE, this.element.ID, context, hiddenValues); - //=== - + // Change table Order context.off("click", "#div_edit_table_order") context.on("click", "#div_edit_table_order", function() { - $(".value_td_table_order", context).html(''); + $(".value_td_table_order", context).html(""); if (that.element.TEMPLATE.SUNSTONE && that.element.TEMPLATE.SUNSTONE.TABLE_ORDER) { - $('#table_order_select', context).val(that.element.TEMPLATE.SUNSTONE.TABLE_ORDER); + $("#table_order_select", context).val(that.element.TEMPLATE.SUNSTONE.TABLE_ORDER); } }); - context.off("click", "#table_order_select") - context.on("click", "#table_order_select", function() { + context.on("change", "#table_order_select", function() { var sunstone_setting = {TABLE_ORDER : $(this).val()}; - Sunstone.runAction("User.append_sunstone_setting_refresh", that.element.ID, sunstone_setting); + if (sunstone_setting.TABLE_ORDER !== ""){ + Sunstone.runAction("User.append_sunstone_setting_refresh", that.element.ID, sunstone_setting); + } }); // Change language - context.off("click", "#div_edit_language") + context.off("click", "#div_edit_language"); context.on("click", "#div_edit_language", function() { - $(".value_td_language", context).html(''); + $(".value_td_language", context).html(""); if (that.element.TEMPLATE.SUNSTONE && that.element.TEMPLATE.SUNSTONE.LANG) { - $('#language_select', context).val(that.element.TEMPLATE.SUNSTONE.LANG); + $("#language_select", context).val(that.element.TEMPLATE.SUNSTONE.LANG); } }); - context.off("click", "#language_select") - context.on("click", "#language_select", function() { + context.on("change", "#language_select", function() { var sunstone_setting = {LANG : $(this).val()}; - Sunstone.runAction("User.append_sunstone_setting_refresh", that.element.ID, sunstone_setting); + if (sunstone_setting.LANG !== ""){ + Sunstone.runAction("User.append_sunstone_setting_refresh", that.element.ID, sunstone_setting); + } }); // Change view - context.off("click", "#div_edit_view") + context.off("click", "#div_edit_view"); context.on("click", "#div_edit_view", function() { - var options = ''; - $.each( config['available_views'], function(id, view) { - options += ''; + var options = ""; + $.each( config["available_views"], function(id, view) { + options += ""; }); - $(".value_td_view", context).html('" + options + - ''); + ""); if (that.element.TEMPLATE.SUNSTONE && that.element.TEMPLATE.SUNSTONE.DEFAULT_VIEW) { - $('#view_select', context).val(that.element.TEMPLATE.SUNSTONE.DEFAULT_VIEW); + $("#view_select", context).val(that.element.TEMPLATE.SUNSTONE.DEFAULT_VIEW); } }); - context.off("click", "#view_select") - context.on("click", "#view_select", function() { + context.on("change", "#view_select", function() { var sunstone_setting = {DEFAULT_VIEW : $(this).val()}; - Sunstone.runAction("User.append_sunstone_setting_refresh", that.element.ID, sunstone_setting); + if (sunstone_setting.DEFAULT_VIEW !== ""){ + Sunstone.runAction("User.append_sunstone_setting_refresh", that.element.ID, sunstone_setting); + } }); return false; diff --git a/src/sunstone/public/app/utils/panel/cluster-tr.js b/src/sunstone/public/app/utils/panel/cluster-tr.js index e1b08c9002..3a2208402b 100644 --- a/src/sunstone/public/app/utils/panel/cluster-tr.js +++ b/src/sunstone/public/app/utils/panel/cluster-tr.js @@ -55,8 +55,7 @@ define(function(require) { }); }); - context.off("click", ".value_td_cluster .resource_list_select"); - context.on("click", ".value_td_cluster .resource_list_select", function() { + context.on("change", ".value_td_cluster .resource_list_select", function() { var newClusterId = $(this).val(); if (newClusterId != "") { Sunstone.runAction(resourceType + ".addtocluster", [resourceId], newClusterId);