Changeset 156859 in indico

Timestamp:

11/17/10 11:35:58 (3 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

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:

55b3c5

Parents:

c04c53

git-author:

Leszek Syroka <leszek.marek.syroka@…> (11/16/10 17:51:20)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (11/17/10 11:35:58)

Message:

[FIX] New editor

• ckeditor was implemented in the news editor
• fix#584

File:

• indico/htdocs/js/indico/Admin/News.js (modified) (6 diffs)

indico/htdocs/js/indico/Admin/News.js

@@ -4 +4 @@
             return item.draw();
         },
-    
+
         addItem: function() {
             var addNews = new NewsItem('edit', this);
@@ -47 +47 @@
             this.request(params);
         },
-    
+
         _saveResource: function() {
             var params = {"id":this.id, "title": this.titleField.get(), "type": this.typeField.get(), "content": this.content.get()};
             var self = this;
             var killProgress = IndicoUI.Dialogs.Util.progress();
-            jsonRpc(Indico.Urls.JsonRpcService, 'news.save', params,
-                    function(response, error){
-                        if (exists(error)) {
-                            killProgress();
-                            IndicoUtil.errorReport(error);
-                        }
-                        else {
-                            killProgress();
-                            self._success(response);
-                        }
-                    });
+            if(self.content.clean())
+                jsonRpc(Indico.Urls.JsonRpcService, 'news.save', params,
+                        function(response, error){
+                            if (exists(error))
+                                IndicoUtil.errorReport(error);
+                            else
+                                self._success(response);
+                        });
+            killProgress()
         },
-    
+
         _success: function(response) {
             this.creationDate = response.creationDate;
@@ -71 +69 @@
             this.text = response.text;
            this.id = response.id;
-    
+
             this.chooser.set('display');
         },
-    
+
         draw: function() {
             var self = this;
-    
+
             var titleField = Html.input('text',{'className':'newsEditTitle'},'Write a title');
             var typeField = Widget.select(self.parentList.newsTypesList);
             typeField.set('general');
-    
+
             this.titleField = titleField;
             this.typeField = typeField;
-    
+
             var saveButton = null;
             if (self.id) {
@@ -97 +95 @@
                 }, "Save"));
             }
-    
+
             var cancelButton = Widget.button(command(function (){
                if (self.id) {
@@ -105 +103 @@
                }
             }, "Cancel"));
-    
+
             this.chooser = new Chooser(new Lookup({
                 edit: function() {
-                   var content = new RichTextEditor(500,200);
+                   var content = new ParsedRichTextEditor(600,400,'IndicoMinimal');
                    self.content = content;
-    
+
                    if (self.id) {
                        content.set(self.text);
                    }
-    
+
                     return Html.div("newsItemEdit", titleField, typeField, content.draw(),
                                                    saveButton, cancelButton); },
@@ -134 +132 @@
                 }
             }));
-    
+
             this.chooser.set(this.choice);
-    
+
             return this.ServiceWidget.prototype.draw.call(this, Widget.block(this.chooser));
         }