From e68778f27b18c21c23387d7609d825ab3a192af7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Tue, 17 Dec 2013 17:09:51 +0100 Subject: [PATCH 1/1] editor: bring back restore dialog after integration Both save and restore dialog are now handled by more generalized dialog object, based on previous dialog object implementation. --- src/editor/modules/data/data.js | 45 ++++++++++---- src/editor/modules/data/data.less | 2 +- .../data/{saveDialog.html => dialog.html} | 6 +- .../modules/data/{saveDialog.js => dialog.js} | 4 +- .../data/{saveDialog.less => dialog.less} | 2 +- .../documentHistory/documentHistory.js | 10 +--- .../modules/documentHistory/restoreDialog.js | 58 ------------------- .../templates/restoreDialog.html | 14 ----- src/editor/modules/rng/rng.js | 10 ++-- 9 files changed, 48 insertions(+), 103 deletions(-) rename src/editor/modules/data/{saveDialog.html => dialog.html} (60%) rename src/editor/modules/data/{saveDialog.js => dialog.js} (95%) rename src/editor/modules/data/{saveDialog.less => dialog.less} (91%) delete mode 100644 src/editor/modules/documentHistory/restoreDialog.js delete mode 100644 src/editor/modules/documentHistory/templates/restoreDialog.html diff --git a/src/editor/modules/data/data.js b/src/editor/modules/data/data.js index bce9582..4a9bc72 100644 --- a/src/editor/modules/data/data.js +++ b/src/editor/modules/data/data.js @@ -1,12 +1,12 @@ define([ 'libs/jquery', - './saveDialog', + './dialog', 'wlxml/wlxml', 'wlxml/extensions/list/list' - -], function($, saveDialog, wlxml, listExtension) { +], function($, Dialog, wlxml, listExtension) { 'use strict'; +/* global gettext */ return function(sandbox) { @@ -75,7 +75,11 @@ return function(sandbox) { }, sandbox.getConfig().documentSaveForm ), - dialog = saveDialog.create({fields: documentSaveForm.fields}); + dialog = Dialog.create({ + fields: documentSaveForm.fields, + title: gettext('Save Document'), + submitButtonText: gettext('Save') + }); dialog.on('save', function(event) { sandbox.publish('savingStarted'); @@ -120,22 +124,41 @@ return function(sandbox) { }, }); }, - restoreVersion: function(options) { - if(options.version && options.description) { - sandbox.publish('restoringStarted', {version: options.version}); + restoreVersion: function(version) { + var documentRestoreForm = $.extend({ + fields: [], + version_field_name: 'version' + }, + sandbox.getConfig().documentRestoreForm + ), + dialog = Dialog.create({ + fields: documentRestoreForm.fields, + title: gettext('Restore Version'), + submitButtonText: gettext('Restore') + }); + + dialog.on('save', function(event) { + var formData = event.formData; + formData[documentRestoreForm.version_field_name] = version; + sandbox.publish('restoringStarted', {version: version}); + if(sandbox.getConfig().jsonifySentData) { + formData = JSON.stringify(formData); + } $.ajax({ method: 'post', dataType: 'json', url: sandbox.getConfig().documentRestoreUrl(document_id), - data: JSON.stringify(options), + data: formData, success: function(data) { - document_version = data.current_version; + document_version = data.version; reloadHistory(); wlxmlDocument.loadXML(data.document); - sandbox.publish('documentReverted', data); + sandbox.publish('documentReverted', data.version); + event.success(); }, }); - } + }); + dialog.show(); }, getDocumentId: function() { return document_id; diff --git a/src/editor/modules/data/data.less b/src/editor/modules/data/data.less index 1beb090..2a21630 100644 --- a/src/editor/modules/data/data.less +++ b/src/editor/modules/data/data.less @@ -1 +1 @@ -@import 'saveDialog.less'; \ No newline at end of file +@import 'dialog.less'; \ No newline at end of file diff --git a/src/editor/modules/data/saveDialog.html b/src/editor/modules/data/dialog.html similarity index 60% rename from src/editor/modules/data/saveDialog.html rename to src/editor/modules/data/dialog.html index d0238e0..844a6ff 100644 --- a/src/editor/modules/data/saveDialog.html +++ b/src/editor/modules/data/dialog.html @@ -1,12 +1,12 @@ -
+
-

Zapisz dokument

+

<%= title %>

- Zapisz + <%= submitButtonText %> Anuluj
\ No newline at end of file diff --git a/src/editor/modules/data/saveDialog.js b/src/editor/modules/data/dialog.js similarity index 95% rename from src/editor/modules/data/saveDialog.js rename to src/editor/modules/data/dialog.js index 3aa17ec..0ad87e5 100644 --- a/src/editor/modules/data/saveDialog.js +++ b/src/editor/modules/data/dialog.js @@ -4,7 +4,7 @@ define(function(require) { var _ = require('libs/underscore'), Backbone = require('libs/backbone'), - saveDialogTemplate = require('libs/text!./saveDialog.html'), + saveDialogTemplate = require('libs/text!./dialog.html'), fieldTemplates = {}; fieldTemplates.checkbox = require('libs/text!./templates/checkbox.html'); fieldTemplates.select = require('libs/text!./templates/select.html'); @@ -25,7 +25,7 @@ define(function(require) { this.actionsDisabled = false; }, show: function() { - this.setElement(this.template()); + this.setElement(this.template(this.options)); var body = this.$('.modal-body'); this.options.fields.forEach(function(field) { diff --git a/src/editor/modules/data/saveDialog.less b/src/editor/modules/data/dialog.less similarity index 91% rename from src/editor/modules/data/saveDialog.less rename to src/editor/modules/data/dialog.less index e0530e5..8128162 100644 --- a/src/editor/modules/data/saveDialog.less +++ b/src/editor/modules/data/dialog.less @@ -1,4 +1,4 @@ -.rng-module-data-saveDialog { +.rng-dialog { textarea { padding: 3px 3px; margin: 5px auto; diff --git a/src/editor/modules/documentHistory/documentHistory.js b/src/editor/modules/documentHistory/documentHistory.js index b90fc59..7bbf32f 100644 --- a/src/editor/modules/documentHistory/documentHistory.js +++ b/src/editor/modules/documentHistory/documentHistory.js @@ -1,10 +1,9 @@ define([ 'libs/jquery', 'libs/underscore', -'./restoreDialog', 'libs/text!./templates/main.html', 'libs/text!./templates/item.html' -], function($, _, restoreDialog, mainTemplateSrc, itemTemplateSrc) { +], function($, _, mainTemplateSrc, itemTemplateSrc) { 'use strict'; @@ -23,12 +22,7 @@ return function(sandbox) { }); dom.find('.btn.restore').click(function() { - var dialog = restoreDialog.create(); - dialog.on('restore', function(event) { - sandbox.publish('restoreVersion', {version: historyItems.getSelected()[0], description: event.data.description}); - event.success(); - }); - dialog.show(); + sandbox.publish('restoreVersion', historyItems.getSelected()[0]); }); dom.find('.btn.display').click(function() { diff --git a/src/editor/modules/documentHistory/restoreDialog.js b/src/editor/modules/documentHistory/restoreDialog.js deleted file mode 100644 index a05b50f..0000000 --- a/src/editor/modules/documentHistory/restoreDialog.js +++ /dev/null @@ -1,58 +0,0 @@ -define([ -'libs/text!./templates/restoreDialog.html', -'libs/underscore', -'libs/backbone' -], function(restoreDialogTemplate, _, Backbone) { - - 'use strict'; - - - var DialogView = Backbone.View.extend({ - template: _.template(restoreDialogTemplate), - events: { - 'click .restore-btn': 'onSave', - 'click .cancel-btn': 'close', - 'click .close': 'close' - }, - initialize: function() { - _.bindAll(this); - this.actionsDisabled = false; - }, - show: function() { - this.setElement(this.template()); - this.$el.modal({backdrop: 'static'}); - this.$el.modal('show'); - this.$('textarea').focus(); - }, - onSave: function(e) { - e.preventDefault(); - var view = this; - this.trigger('restore', { - data: {description: view.$el.find('textarea').val()}, - success: function() { view.actionsDisabled = false; view.close(); }, - error: function() { view.actionsDisabled = false; view.close(); }, - }); - }, - close: function(e) { - if(e) { - e.preventDefault(); - } - if(!this.actionsDisabled) { - this.$el.modal('hide'); - this.$el.remove(); - } - }, - toggleButtons: function(toggle) { - this.$('.btn, button').toggleClass('disabled', !toggle); - this.$('textarea').attr('disabled', !toggle); - this.actionsDisabled = !toggle; - } - }); - - return { - create: function() { - return new DialogView(); - } - }; - -}); \ No newline at end of file diff --git a/src/editor/modules/documentHistory/templates/restoreDialog.html b/src/editor/modules/documentHistory/templates/restoreDialog.html deleted file mode 100644 index ded0a11..0000000 --- a/src/editor/modules/documentHistory/templates/restoreDialog.html +++ /dev/null @@ -1,14 +0,0 @@ -
-
- -

Przywróć wersję

-
-
- - -
-
- Przywróć - Anuluj -
-
\ No newline at end of file diff --git a/src/editor/modules/rng/rng.js b/src/editor/modules/rng/rng.js index a5432c0..4e7ff0c 100644 --- a/src/editor/modules/rng/rng.js +++ b/src/editor/modules/rng/rng.js @@ -108,10 +108,10 @@ return function(sandbox) { diffFetched: function(diff) { sandbox.getModule('diffViewer').setDiff(diff); }, - documentReverted: function(event) { + documentReverted: function(version) { sandbox.getModule('mainBar').setCommandEnabled('save', true); - sandbox.getModule('indicator').clearMessage({message:'Wersja ' + event.reverted_version + ' przywrócona'}); - sandbox.getModule('mainBar').setVersion(event.current_version); + sandbox.getModule('indicator').clearMessage({message:'Wersja ' + version + ' przywrócona'}); + sandbox.getModule('mainBar').setVersion(version); } }; @@ -224,8 +224,8 @@ return function(sandbox) { compare: function(ver1, ver2) { sandbox.getModule('data').fetchDiff(ver1, ver2); }, - restoreVersion: function(event) { - sandbox.getModule('data').restoreVersion(event); + restoreVersion: function(version) { + sandbox.getModule('data').restoreVersion(version); }, displayVersion: function(event) { /* globals window */ -- 2.20.1