Minor refactorization - better naming for options/event for a Dialog object

diff --git a/src/editor/modules/data/data.js b/src/editor/modules/data/data.js
index af8c053..dd81909 100644 (file)
--- a/src/editor/modules/data/data.js
+++ b/src/editor/modules/data/data.js
@@ -115,7 +115,7 @@ return function(sandbox) {
                     var dialog = Dialog.create({
                         title: gettext('Local draft of a document exists'),
                         text: gettext('Unsaved local draft of this version of the document exists in your browser. Do you want to load it instead?'),
                     var dialog = Dialog.create({
                         title: gettext('Local draft of a document exists'),
                         text: gettext('Unsaved local draft of this version of the document exists in your browser. Do you want to load it instead?'),

-                        submitButtonText: gettext('Yes, restore local draft'),
+                        executeButtonText: gettext('Yes, restore local draft'),

                         cancelButtonText: gettext('No, use version loaded from the server')
                     });
                     dialog.on('cancel', function() {
                         cancelButtonText: gettext('No, use version loaded from the server')
                     });
                     dialog.on('cancel', function() {


@@ -123,7 +123,7 @@ return function(sandbox) {
                         text = sandbox.getBootstrappedData().document;
                         
                     });
                         text = sandbox.getBootstrappedData().document;
                         
                     });

-                    dialog.on('save', function(event) {
+                    dialog.on('execute', function(event) {

                         logger.debug('Local draft chosen');
                         event.success();
                     });
                         logger.debug('Local draft chosen');
                         event.success();
                     });


@@ -152,10 +152,10 @@ return function(sandbox) {
                 dialog = Dialog.create({
                     fields: documentSaveForm.fields,
                     title: gettext('Save Document'),
                 dialog = Dialog.create({
                     fields: documentSaveForm.fields,
                     title: gettext('Save Document'),

-                    submitButtonText: gettext('Save')
+                    executeButtonText: gettext('Save')

                 });
             
                 });
             

-            dialog.on('save', function(event) {
+            dialog.on('execute', function(event) {

                 sandbox.publish('savingStarted');
 
                 var formData = event.formData;
                 sandbox.publish('savingStarted');
 
                 var formData = event.formData;


@@ -208,10 +208,10 @@ return function(sandbox) {
                 dialog = Dialog.create({
                     fields: documentRestoreForm.fields,
                     title: gettext('Restore Version'),
                 dialog = Dialog.create({
                     fields: documentRestoreForm.fields,
                     title: gettext('Restore Version'),

-                    submitButtonText: gettext('Restore')
+                    executeButtonText: gettext('Restore')

                 });
 
                 });
 

-            dialog.on('save', function(event) {
+            dialog.on('execute', function(event) {

                 var formData = event.formData;
                 formData[documentRestoreForm.version_field_name] = version;
                 sandbox.publish('restoringStarted', {version: version});
                 var formData = event.formData;
                 formData[documentRestoreForm.version_field_name] = version;
                 sandbox.publish('restoringStarted', {version: version});

diff --git a/src/editor/modules/data/dialog.html b/src/editor/modules/data/dialog.html
index 97adf56..80c9fb2 100644 (file)
--- a/src/editor/modules/data/dialog.html
+++ b/src/editor/modules/data/dialog.html
@@ -6,7 +6,7 @@
     <div class="modal-body">
     </div>
     <div class="modal-footer">
     <div class="modal-body">
     </div>
     <div class="modal-footer">

-        <a href="#" class="btn btn-info btn-mini save-btn"><%= submitButtonText %></a>
+        <a href="#" class="btn btn-info btn-mini execute-btn"><%= executeButtonText %></a>

         <a href="#" class="btn btn-danger btn-mini cancel-btn"><%= cancelButtonText %></a>
     </div>
 </div>
\ No newline at end of file
         <a href="#" class="btn btn-danger btn-mini cancel-btn"><%= cancelButtonText %></a>
     </div>
 </div>
\ No newline at end of file

diff --git a/src/editor/modules/data/dialog.js b/src/editor/modules/data/dialog.js
index c32738a..0d4bbd4 100644 (file)
--- a/src/editor/modules/data/dialog.js
+++ b/src/editor/modules/data/dialog.js
@@ -17,7 +17,7 @@ define(function(require) {
     var DialogView = Backbone.View.extend({
         template: _.template(dialogTemplate),
         events: {
     var DialogView = Backbone.View.extend({
         template: _.template(dialogTemplate),
         events: {

-            'click .save-btn': 'onSave',
+            'click .execute-btn': 'onExecute',

             'click .cancel-btn': 'onCancel',
             'click .close': 'close'
         },
             'click .cancel-btn': 'onCancel',
             'click .close': 'close'
         },


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

-                submitButtonText: gettext('Submit'),
+                executeButtonText: gettext('Submit'),

                 cancelButtonText: gettext('Cancel')
             }, this.options)));
 
                 cancelButtonText: gettext('Cancel')
             }, this.options)));
 


@@ -50,7 +50,7 @@ define(function(require) {
             this.$el.modal('show');
             this.$('textarea').focus();
         },
             this.$el.modal('show');
             this.$('textarea').focus();
         },

-        onSave: function(e) {
+        onExecute: function(e) {

             e.preventDefault();
             var view = this,
                 formData = {};
             e.preventDefault();
             var view = this,
                 formData = {};


@@ -60,7 +60,7 @@ define(function(require) {
                 formData[field.name] = widget.val();
             });
 
                 formData[field.name] = widget.val();
             });
 

-            this.trigger('save', {
+            this.trigger('execute', {

                 formData: formData,
                 success: function() { view.actionsDisabled = false; view.close(); },
                 error: function() { view.actionsDisabled = false; view.close(); },
                 formData: formData,
                 success: function() { view.actionsDisabled = false; view.close(); },
                 error: function() { view.actionsDisabled = false; view.close(); },