summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShad Laws <shad@shadlaws.com>2013-05-07 09:52:25 -0700
committerShad Laws <shad@shadlaws.com>2013-05-07 09:52:25 -0700
commit48f9595f7806796f955fa1c2c6a3f6f17b1ed9ad (patch)
tree266f67f2c6617aafa3b5f92ee56db9530f9520f3
parent269927b27c7ea25193c4da29db17539eb3d92d50 (diff)
parent90528d9c83b74518c0a2293802b93fa03da40345 (diff)
Merge pull request #357 from shadlaws/double_ajax_fixing_master
#2065 - Fix problems with double-ajaxifying of dialogs.
-rw-r--r--lib/gallery.ajax.js2
-rw-r--r--lib/gallery.dialog.js2
-rw-r--r--lib/gallery.in_place_edit.js2
-rw-r--r--lib/gallery.panel.js2
-rw-r--r--modules/server_add/js/server_add.js2
-rw-r--r--modules/user/js/password_strength.js2
6 files changed, 6 insertions, 6 deletions
diff --git a/lib/gallery.ajax.js b/lib/gallery.ajax.js
index 08f1fede..898bbd79 100644
--- a/lib/gallery.ajax.js
+++ b/lib/gallery.ajax.js
@@ -1,6 +1,6 @@
(function($) {
$.widget("ui.gallery_ajax", {
- _init: function() {
+ _create: function() {
this.element.click(function(event) {
eval("var ajax_handler = " + $(event.currentTarget).attr("data-ajax-handler"));
$.get($(event.currentTarget).attr("href"), function(data) {
diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js
index 1c810171..6b4cd68d 100644
--- a/lib/gallery.dialog.js
+++ b/lib/gallery.dialog.js
@@ -7,7 +7,7 @@
resizable: false,
position: "center"
},
- _init: function() {
+ _create: function() {
var self = this;
if (!self.options.immediate) {
this.element.click(function(event) {
diff --git a/lib/gallery.in_place_edit.js b/lib/gallery.in_place_edit.js
index 86a58856..560f86fa 100644
--- a/lib/gallery.in_place_edit.js
+++ b/lib/gallery.in_place_edit.js
@@ -2,7 +2,7 @@
$.widget("ui.gallery_in_place_edit", {
options: {},
- _init: function() {
+ _create: function() {
var self = this;
this.element.click(function(event) {
event.preventDefault();
diff --git a/lib/gallery.panel.js b/lib/gallery.panel.js
index 877faf64..7b2460a4 100644
--- a/lib/gallery.panel.js
+++ b/lib/gallery.panel.js
@@ -1,6 +1,6 @@
(function($) {
$.widget("ui.gallery_panel", {
- _init: function() {
+ _create: function() {
var self = this;
this.element.click(function(event) {
event.preventDefault();
diff --git a/modules/server_add/js/server_add.js b/modules/server_add/js/server_add.js
index a2499896..59901734 100644
--- a/modules/server_add/js/server_add.js
+++ b/modules/server_add/js/server_add.js
@@ -1,6 +1,6 @@
(function($) {
$.widget("ui.gallery_server_add", {
- _init: function() {
+ _create: function() {
var self = this;
$("#g-server-add-add-button", this.element).click(function(event) {
event.preventDefault();
diff --git a/modules/user/js/password_strength.js b/modules/user/js/password_strength.js
index c5fccc68..742db0ca 100644
--- a/modules/user/js/password_strength.js
+++ b/modules/user/js/password_strength.js
@@ -9,7 +9,7 @@
'g-password-strength100']
},
- _init: function() {
+ _create: function() {
var self = this;
$(this.element).on("input keyup", function() {
var strength = self.calculateStrength(this.value);