summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--horizon/static/framework/widgets/table/hz-select-all.directive.js2
-rw-r--r--horizon/static/framework/widgets/table/hz-select.directive.js2
-rw-r--r--horizon/static/horizon/js/horizon.forms.js2
-rw-r--r--horizon/static/horizon/js/horizon.tables.js4
4 files changed, 5 insertions, 5 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 832ea439f..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') {
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"));