diff options
5 files changed, 8 insertions, 8 deletions
diff --git a/horizon/static/framework/widgets/table/hz-select-all.directive.js b/horizon/static/framework/widgets/table/hz-select-all.directive.js index f4b9464b8..cb1a1ca52 100644 --- a/horizon/static/framework/widgets/table/hz-select-all.directive.js +++ b/horizon/static/framework/widgets/table/hz-select-all.directive.js @@ -83,7 +83,7 @@ var hzTableCtrl = ctrls[0]; var stTableCtrl = ctrls[1]; - element.click(clickHandler); + element.on('click', clickHandler); /* * watch the table state for changes diff --git a/horizon/static/framework/widgets/table/hz-select.directive.js b/horizon/static/framework/widgets/table/hz-select.directive.js index 5cac205ad..aba0272c3 100644 --- a/horizon/static/framework/widgets/table/hz-select.directive.js +++ b/horizon/static/framework/widgets/table/hz-select.directive.js @@ -55,7 +55,7 @@ //////////////////// function link(scope, element, attrs, hzTableCtrl) { - element.click(clickHandler); + element.on('click', clickHandler); // select or unselect row function clickHandler() { diff --git a/horizon/static/horizon/js/horizon.forms.js b/horizon/static/horizon/js/horizon.forms.js index 27a7e9bd6..e3c029b03 100644 --- a/horizon/static/horizon/js/horizon.forms.js +++ b/horizon/static/horizon/js/horizon.forms.js @@ -228,7 +228,7 @@ horizon.forms.add_password_fields_reveal_buttons = function (el) { $input.closest('div').addClass("has-feedback"); $('<span>').addClass( "form-control-feedback fa fa-eye password-icon" - ).insertAfter($input).click(function () { + ).insertAfter($input).on('click', function () { var $icon = $(this); if ($input.attr('type') === 'password') { @@ -279,7 +279,7 @@ horizon.forms.init_themable_select = function ($elem) { // Set the select if necessary if ($select.val() !== value) { - $select.val(value).change(); + $select.val(value).trigger("change"); } }); @@ -318,7 +318,7 @@ horizon.forms.init_themable_select = function ($elem) { } // Add the new list to the dropdown. - $select.siblings('.dropdown-menu').html(list).change(); + $select.siblings('.dropdown-menu').html(list).trigger("change"); $select.trigger('change'); }); diff --git a/horizon/static/horizon/js/horizon.modals.js b/horizon/static/horizon/js/horizon.modals.js index cbad7dd1d..8ff9f3ab8 100644 --- a/horizon/static/horizon/js/horizon.modals.js +++ b/horizon/static/horizon/js/horizon.modals.js @@ -349,7 +349,7 @@ horizon.addInitFunction(horizon.modals.init = function() { json_data = JSON.parse(data); field_to_update = $("#" + add_to_field_header); field_to_update.append("<option value='" + json_data[0] + "'>" + json_data[1] + "</option>"); - field_to_update.change(); + field_to_update.trigger("change"); field_to_update.val(json_data[0]); } else { horizon.modals.success(data, textStatus, jqXHR); diff --git a/horizon/static/horizon/js/horizon.tables.js b/horizon/static/horizon/js/horizon.tables.js index 7b8d99632..fb4aa66f9 100644 --- a/horizon/static/horizon/js/horizon.tables.js +++ b/horizon/static/horizon/js/horizon.tables.js @@ -334,7 +334,7 @@ horizon.datatables.confirm = function(action) { modal.css('z-index', child_backdrop.css('z-index')+10); } - modal.find('.' + confirmCssClass).click(function () { + modal.find('.' + confirmCssClass).on('click', function () { var $form = $action.closest('form'); var el = document.createElement("input"); el.type = 'hidden'; @@ -342,7 +342,7 @@ horizon.datatables.confirm = function(action) { el.value = $action.attr('value'); $form .append(el) - .submit(); + .trigger('submit'); modal.modal('hide'); horizon.modals.modal_spinner(gettext("Working")); |