diff options
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/jquery.jtable.creation.js | 16 | ||||
| -rw-r--r-- | dev/jquery.jtable.deletion.js | 16 | ||||
| -rw-r--r-- | dev/jquery.jtable.editing.js | 8 |
3 files changed, 20 insertions, 20 deletions
diff --git a/dev/jquery.jtable.creation.js b/dev/jquery.jtable.creation.js index ddb6624..0cd6134 100644 --- a/dev/jquery.jtable.creation.js +++ b/dev/jquery.jtable.creation.js @@ -1,4 +1,4 @@ -/************************************************************************ +/************************************************************************ * CREATE RECORD extension for jTable * *************************************************************************/ (function ($) { @@ -80,7 +80,7 @@ }], close: function () { var $addRecordForm = self._$addRecordDiv.find('form').first(); - var $saveButton = $('#AddRecordDialogSaveButton'); + var $saveButton = self._$addRecordDiv.parent().find('#AddRecordDialogSaveButton'); self._trigger("formClosed", null, { form: $addRecordForm, formType: 'create' }); self._setEnabledOfDialogButton($saveButton, true, self.options.messages.save); $addRecordForm.remove(); @@ -109,7 +109,7 @@ _onSaveClickedOnCreateForm: function () { var self = this; - var $saveButton = $('#AddRecordDialogSaveButton'); + var $saveButton = self._$addRecordDiv.parent().find('#AddRecordDialogSaveButton'); var $addRecordForm = self._$addRecordDiv.find('form'); if (self._trigger("formSubmitting", null, { form: $addRecordForm, formType: 'create' }) != false) { @@ -151,7 +151,7 @@ isNewRow: true, animationsEnabled: options.animationsEnabled }); - + options.success(); return; } @@ -165,7 +165,7 @@ options.error(data); return; } - + if(!data.Record) { self._logError('Server must return the created Record object.'); options.error(data); @@ -173,7 +173,7 @@ } self._onRecordAdded(data); - + self._addRow( self._createRowFromRecord(data.Record), { isNewRow: true, @@ -262,13 +262,13 @@ self.options.actions.createAction, $addRecordForm.serialize(), function (data) { - + if (data.Result != 'OK') { self._showError(data.Message); self._setEnabledOfDialogButton($saveButton, true, self.options.messages.save); return; } - + if (!data.Record) { self._logError('Server must return the created Record object.'); self._setEnabledOfDialogButton($saveButton, true, self.options.messages.save); diff --git a/dev/jquery.jtable.deletion.js b/dev/jquery.jtable.deletion.js index caa0559..fdc3f10 100644 --- a/dev/jquery.jtable.deletion.js +++ b/dev/jquery.jtable.deletion.js @@ -1,4 +1,4 @@ -/************************************************************************ +/************************************************************************ * DELETION extension for jTable * *************************************************************************/ (function ($) { @@ -82,14 +82,14 @@ id: 'DeleteDialogButton', text: self.options.messages.deleteText, click: function () { - + //row maybe removed by another source, if so, do nothing if (self._$deletingRow.hasClass('jtable-row-removed')) { self._$deleteRecordDiv.dialog('close'); return; } - var $deleteButton = $('#DeleteDialogButton'); + var $deleteButton = self._$deleteRecordDiv.parent().find('#DeleteDialogButton'); self._setEnabledOfDialogButton($deleteButton, false, self.options.messages.deleting); self._deleteRecordFromServer( self._$deletingRow, @@ -105,7 +105,7 @@ } }], close: function () { - var $deleteButton = $('#DeleteDialogButton'); + var $deleteButton = self._$deleteRecordDiv.parent().find('#DeleteDialogButton'); self._setEnabledOfDialogButton($deleteButton, true, self.options.messages.deleteText); } }); @@ -124,7 +124,7 @@ self._logWarn('No rows specified to jTable deleteRows method.'); return; } - + if (self._isBusy()) { self._logWarn('Can not delete rows since jTable is busy!'); return; @@ -349,8 +349,8 @@ this._ajax({ url: (url || self.options.actions.deleteAction), data: postData, - success: function (data) { - + success: function (data) { + if (data.Result != 'OK') { $row.data('deleting', false); if (error) { @@ -389,7 +389,7 @@ if (this.options.jqueryuiTheme) { className = className + ' ui-state-disabled'; } - + //Stop current animation (if does exists) and begin 'deleting' animation. $rows.stop(true, true).addClass(className, 'slow', '').promise().done(function () { self._removeRowsFromTable($rows, 'deleted'); diff --git a/dev/jquery.jtable.editing.js b/dev/jquery.jtable.editing.js index e23d276..784bafe 100644 --- a/dev/jquery.jtable.editing.js +++ b/dev/jquery.jtable.editing.js @@ -1,4 +1,4 @@ -/************************************************************************ +/************************************************************************ * EDIT RECORD extension for jTable * *************************************************************************/ (function ($) { @@ -84,7 +84,7 @@ }], close: function () { var $editForm = self._$editDiv.find('form:first'); - var $saveButton = $('#EditDialogSaveButton'); + var $saveButton = self._$editDiv.parent().find('#EditDialogSaveButton'); self._trigger("formClosed", null, { form: $editForm, formType: 'edit', row: self._$editingRow }); self._setEnabledOfDialogButton($saveButton, true, self.options.messages.save); $editForm.remove(); @@ -103,7 +103,7 @@ return; } - var $saveButton = $('#EditDialogSaveButton'); + var $saveButton = self._$editDiv.parent().find('#EditDialogSaveButton'); var $editForm = self._$editDiv.find('form'); if (self._trigger("formSubmitting", null, { form: $editForm, formType: 'edit', row: self._$editingRow }) != false) { self._setEnabledOfDialogButton($saveButton, false, self.options.messages.saving); @@ -373,7 +373,7 @@ if (this.options.jqueryuiTheme) { className = className + ' ui-state-highlight'; } - + $tableRow.stop(true, true).addClass(className, 'slow', '', function () { $tableRow.removeClass(className, 5000); }); |