fnp
/
fnpeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
editor: Dialog improvements
[fnpeditor.git]
/
src
/
editor
/
modules
/
data
/
dialog.js
diff --git
a/src/editor/modules/data/dialog.js
b/src/editor/modules/data/dialog.js
index
a2c56e2
..
c32738a
100644
(file)
--- a/
src/editor/modules/data/dialog.js
+++ b/
src/editor/modules/data/dialog.js
@@
-1,5
+1,6
@@
define(function(require) {
define(function(require) {
+ /* globals gettext */
'use strict';
var _ = require('libs/underscore'),
'use strict';
var _ = require('libs/underscore'),
@@
-17,7
+18,7
@@
define(function(require) {
template: _.template(dialogTemplate),
events: {
'click .save-btn': 'onSave',
template: _.template(dialogTemplate),
events: {
'click .save-btn': 'onSave',
- 'click .cancel-btn': '
close
',
+ 'click .cancel-btn': '
onCancel
',
'click .close': 'close'
},
initialize: function() {
'click .close': 'close'
},
initialize: function() {
@@
-25,10
+26,13
@@
define(function(require) {
this.actionsDisabled = false;
},
show: function() {
this.actionsDisabled = false;
},
show: function() {
- this.setElement(this.template(this.options));
+ this.setElement(this.template(_.extend({
+ submitButtonText: gettext('Submit'),
+ cancelButtonText: gettext('Cancel')
+ }, this.options)));
var body = this.$('.modal-body');
var body = this.$('.modal-body');
-
this.options.fields
.forEach(function(field) {
+
(this.options.fields || [])
.forEach(function(field) {
var template = fieldTemplates[field.type];
if(!template) {
throw new Error('Field type {type} not recognized.'.replace('{type}', field.type));
var template = fieldTemplates[field.type];
if(!template) {
throw new Error('Field type {type} not recognized.'.replace('{type}', field.type));
@@
-38,6
+42,10
@@
define(function(require) {
);
});
);
});
+ if(this.options.text) {
+ body.append('<p>' + this.options.text + '</p>');
+ }
+
this.$el.modal({backdrop: 'static'});
this.$el.modal('show');
this.$('textarea').focus();
this.$el.modal({backdrop: 'static'});
this.$el.modal('show');
this.$('textarea').focus();
@@
-47,7
+55,7
@@
define(function(require) {
var view = this,
formData = {};
var view = this,
formData = {};
-
this.options.fields
.forEach(function(field) {
+
(this.options.fields || [])
.forEach(function(field) {
var widget = view.$('[name=' + field.name +']');
formData[field.name] = widget.val();
});
var widget = view.$('[name=' + field.name +']');
formData[field.name] = widget.val();
});
@@
-58,6
+66,10
@@
define(function(require) {
error: function() { view.actionsDisabled = false; view.close(); },
});
},
error: function() { view.actionsDisabled = false; view.close(); },
});
},
+ onCancel: function() {
+ this.trigger('cancel');
+ this.close();
+ },
close: function(e) {
if(e) {
e.preventDefault();
close: function(e) {
if(e) {
e.preventDefault();
@@
-66,6
+78,7
@@
define(function(require) {
this.$el.modal('hide');
this.$el.remove();
}
this.$el.modal('hide');
this.$el.remove();
}
+ this.trigger('close');
},
toggleButtons: function(toggle) {
this.$('.btn, button').toggleClass('disabled', !toggle);
},
toggleButtons: function(toggle) {
this.$('.btn, button').toggleClass('disabled', !toggle);