editor: handle invalid element passed to setCurrentElement better

[fnpeditor.git] / src / editor / views / dialog / dialog.js

diff --git a/src/editor/views/dialog/dialog.js b/src/editor/views/dialog/dialog.js
index 0d4bbd4..bad349d 100644 (file)
--- a/src/editor/views/dialog/dialog.js
+++ b/src/editor/views/dialog/dialog.js
@@ -1,6 +1,5 @@
 define(function(require) {
 
 define(function(require) {
 

-    /* globals gettext */

     'use strict';
 
     var _ = require('libs/underscore'),
     'use strict';
 
     var _ = require('libs/underscore'),


@@ -27,8 +26,8 @@ define(function(require) {
         },
         show: function() {
             this.setElement(this.template(_.extend({
         },
         show: function() {
             this.setElement(this.template(_.extend({

-                executeButtonText: gettext('Submit'),
-                cancelButtonText: gettext('Cancel')
+                executeButtonText: null,
+                cancelButtonText: null

             }, this.options)));
 
             var body = this.$('.modal-body');
             }, this.options)));
 
             var body = this.$('.modal-body');


@@ -38,7 +37,7 @@ define(function(require) {
                     throw new Error('Field type {type} not recognized.'.replace('{type}', field.type));
                 }
                 body.append(
                     throw new Error('Field type {type} not recognized.'.replace('{type}', field.type));
                 }
                 body.append(

-                    _.template(template)(_.extend({description: ''}, field))
+                    _.template(template)(_.extend({description: '', initialValue: ''}, field))

                 );
             });
 
                 );
             });
 


@@ -48,7 +47,7 @@ define(function(require) {
 
             this.$el.modal({backdrop: 'static'});
             this.$el.modal('show');
 
             this.$el.modal({backdrop: 'static'});
             this.$el.modal('show');

-            this.$('textarea').focus();
+            this.$('textarea, input').first().focus();

         },
         onExecute: function(e) {
             e.preventDefault();
         },
         onExecute: function(e) {
             e.preventDefault();