From 76b4db77be4f7c717853122083b9683d76a3096e Mon Sep 17 00:00:00 2001 From: vitalets <noginsk@rambler.ru> Date: Wed, 21 Nov 2012 15:15:46 +0400 Subject: [PATCH] rename in form $container to $div --- src/editable-form/editable-form.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/editable-form/editable-form.js b/src/editable-form/editable-form.js index 76f03a2..9ed407d 100644 --- a/src/editable-form/editable-form.js +++ b/src/editable-form/editable-form.js @@ -11,7 +11,7 @@ Editableform is linked with one of input types, e.g. 'text' or 'select'. var EditableForm = function (element, options) { this.options = $.extend({}, $.fn.editableform.defaults, options); - this.$container = $(element); //div, containing form + this.$div = $(element); //div (usually), containing form this.initInput(); }; @@ -42,7 +42,7 @@ Editableform is linked with one of input types, e.g. 'text' or 'select'. **/ render: function() { this.$loading = $($.fn.editableform.loading); - this.$container.empty().append(this.$loading); + this.$div.empty().append(this.$loading); this.showLoading(); this.initTemplate(); @@ -52,14 +52,17 @@ Editableform is linked with one of input types, e.g. 'text' or 'select'. @event rendering @param {Object} event event object **/ - this.$container.triggerHandler('rendering'); + this.$div.triggerHandler('rendering'); //render input $.when(this.input.render()) .then($.proxy(function () { + //place input this.$form.find('div.control-group').prepend(this.input.$input); + //attach 'cancel' handler this.$form.find('button[type=button]').click($.proxy(this.cancel, this)); - this.$container.append(this.$form); + //append form to container + this.$div.append(this.$form); if(this.input.error) { this.error(this.input.error); this.$form.find('button[type=submit]').attr('disabled', true); @@ -80,7 +83,7 @@ Editableform is linked with one of input types, e.g. 'text' or 'select'. @event cancel @param {Object} event event object **/ - this.$container.triggerHandler('cancel'); + this.$div.triggerHandler('cancel'); }, showLoading: function() { var fw, fh, iw, ih; @@ -110,7 +113,7 @@ Editableform is linked with one of input types, e.g. 'text' or 'select'. @event show @param {Object} event event object **/ - this.$container.triggerHandler('show'); + this.$div.triggerHandler('show'); }, error: function(msg) { @@ -171,7 +174,7 @@ Editableform is linked with one of input types, e.g. 'text' or 'select'. if(params.newValue === 'username') {...} }); **/ - this.$container.triggerHandler('save', {newValue: newValue, response: response}); + this.$div.triggerHandler('save', {newValue: newValue, response: response}); }, this)) .fail($.proxy(function(xhr) { this.error(typeof xhr === 'string' ? xhr : xhr.responseText || xhr.statusText || 'Unknown error!');