Changeset bf400b in indico

Timestamp:

01/28/11 15:53:52 (2 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72

Children:

4b2050

Parents:

492fbe

git-author:

Adrian Moennich <jerome.ernst.monnich@…> (01/26/11 14:19:40)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (01/28/11 15:53:52)

Message:

[FIX] close minutes window after save confirmation

• when saving after trying to close the window with unsaved changes, close the window afterwards
• fixes #628

File:

• indico/htdocs/js/indico/Legacy/Dialogs.js (modified) (4 diffs)

indico/htdocs/js/indico/Legacy/Dialogs.js

@@ -593 +593 @@
                var compileMinutes = exists(compile)?compile:false;
                var killProgress = null;
+               var saveAndClose = false;
 
                var rtWidget = new ParsedRichTextEditor(700, 400, 'IndicoFull');
@@ -649 +650 @@
                            wasChanged = true;
                            saveButton.dom.disabled = true;
+                           if (saveAndClose) {
+                               closeMinutes();
+                           }
                        }
                    }
@@ -665 +669 @@
                    var content = Html.div({}, rtWidget.draw());
 
-                   var commitChanges = function(suicideHook) {
+                   var commitChanges = function() {
+                       debugger;
                        killProgress = IndicoUI.Dialogs.Util.progress($T('Saving...'));
                        if(rtWidget.clean()){
                            changedText.set(false);
+                           wasChanged = true;
                            saveButton.dom.disabled = true;
-                           req.set(rtWidget.get())
+                           req.set(rtWidget.get());
                        }
-                       killProgress()
+                       killProgress();
                    };
 
-                   var commitChangesAndClose = function(suicideHook) {
-                       commitChanges(suicideHook);
+                   var commitChangesAndClose = function() {
+                       saveAndClose = true;
+                       commitChanges();
                    };
 
@@ -699 +706 @@
                    };
 
-                   saveButton = Widget.button(command(curry(commitChanges, function(){self.close();}, null), $T("Save")));
+                   saveButton = Widget.button(command(commitChanges, $T("Save")));
                    saveButton.dom.disabled = !compileMinutes;