diff options
Diffstat (limited to 'lib/jquery.jtable.js')
| -rw-r--r-- | lib/jquery.jtable.js | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/lib/jquery.jtable.js b/lib/jquery.jtable.js index b70b111..f44b186 100644 --- a/lib/jquery.jtable.js +++ b/lib/jquery.jtable.js @@ -1962,7 +1962,7 @@ THE SOFTWARE. id: 'AddRecordDialogSaveButton', text: self.options.messages.save, click: function () { - 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) { @@ -1973,7 +1973,7 @@ THE SOFTWARE. }], 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(); @@ -2032,7 +2032,7 @@ THE SOFTWARE. isNewRow: true, animationsEnabled: options.animationsEnabled }); - + options.success(); return; } @@ -2046,7 +2046,7 @@ THE SOFTWARE. options.error(data); return; } - + if(!data.Record) { self._logError('Server must return the created Record object.'); options.error(data); @@ -2054,7 +2054,7 @@ THE SOFTWARE. } self._onRecordAdded(data); - + self._addRow( self._createRowFromRecord(data.Record), { isNewRow: true, @@ -2138,13 +2138,13 @@ THE SOFTWARE. $addRecordForm.attr('action'), $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); @@ -2249,14 +2249,14 @@ THE SOFTWARE. id: 'EditDialogSaveButton', text: self.options.messages.save, click: function () { - + //row maybe removed by another source, if so, do nothing if (self._$editingRow.hasClass('jtable-row-removed')) { self._$editDiv.dialog('close'); 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); @@ -2266,7 +2266,7 @@ THE SOFTWARE. }], 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(); @@ -2530,7 +2530,7 @@ THE SOFTWARE. if (this.options.jqueryuiTheme) { className = className + ' ui-state-highlight'; } - + $tableRow.stop(true, true).addClass(className, 'slow', '', function () { $tableRow.removeClass(className, 5000); }); @@ -2632,14 +2632,14 @@ THE SOFTWARE. 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, @@ -2655,7 +2655,7 @@ THE SOFTWARE. } }], close: function () { - var $deleteButton = $('#DeleteDialogButton'); + var $deleteButton = self._$deleteRecordDiv.parent().find('#DeleteDialogButton'); self._setEnabledOfDialogButton($deleteButton, true, self.options.messages.deleteText); } }); @@ -2674,7 +2674,7 @@ THE SOFTWARE. self._logWarn('No rows specified to jTable deleteRows method.'); return; } - + if (self._isBusy()) { self._logWarn('Can not delete rows since jTable is busy!'); return; @@ -2899,8 +2899,8 @@ THE SOFTWARE. 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) { @@ -2939,7 +2939,7 @@ THE SOFTWARE. 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'); |