Sample/Editor.js

[app.Builder.js] / Sample / Editor.js

diff --git a/Sample/Editor.js b/Sample/Editor.js
index b8f7309..67ca9b6 100644 (file)
--- a/Sample/Editor.js
+++ b/Sample/Editor.js
@@ -52,6 +52,12 @@ Editor=new XObject({
                     items : [
                         {
                             xtype: Gtk.Button,
+                            listeners : {
+                                clicked : function (self) {
+                                  this.get('/Editor.RightEditor').save();
+                                }
+                            },
+                            id : "save_button",
                             label : "Save"
                         }
                     ]
@@ -61,18 +67,24 @@ Editor=new XObject({
                     id : "RightEditor",
                     pack : "add",
                     save : function() {
+                        var str = this.get('/Editor.buffer').toString();
                          this.get('/LeftPanel.model').changed(  str , false);
+                         this.get('/Editor').dirty = false;
+                         this.get('/Editor.save_button').el.sensitive = false;
                     },
                     items : [
                         {
                             xtype: GtkSource.View,
                             listeners : {
                                 key_release_event : function (self, event) {
-                                    if (event.key.keyval != 115 || !(Gdk.ModifierType.CONTROL_MASK & 4) ) {
-                                        return;
+                                    
+                                    if (event.key.keyval == 115 && (event.key.state & Gdk.ModifierType.CONTROL_MASK ) ) {
+                                        print("SAVE: ctrl-S  pressed");
+                                        this.save();
+                                        return false;
                                     }
-                                    print(event.key.keyval)
-                                    this.save();
+                                   // print(event.key.keyval)
+                                    
                                     return false;
                                 }
                             },
@@ -116,11 +128,11 @@ Editor=new XObject({
                                 buf.move_mark(cursor, iter);
                                 this.get('/Editor').dirty = false;
                                 this.el.grab_focus();
+                                 this.get('/Editor.save_button').el.sensitive = false;
                             },
                             save : function() {
-                                var str = this.get('buffer').toString();
-                                print("SAVE" + str);
-                                 this.get('/LeftPanel.model').changed(  str , false);
+                                
+                                this.get('/Editor.RightEditor').save();
                             },
                             show_line_numbers : true,
                             items : [
@@ -129,9 +141,12 @@ Editor=new XObject({
                                     listeners : {
                                         changed : function (self) {
                                         
-                                            this.checkSyntax();
-                                            print("EDITOR CHANGED");
+                                            if(this.checkSyntax()) {
+                                                this.get('/Editor.save_button').el.sensitive = true;
+                                            }
+                                           // print("EDITOR CHANGED");
                                             this.get('/Editor').dirty = true;
+                                        
                                             // this.get('/LeftPanel.model').changed(  str , false);
                                             return false;
                                         }
@@ -142,7 +157,7 @@ Editor=new XObject({
                                         var str = this.toString();
                                         var res = '';
                                         try {
-                                            print('var res = ' + str);
+                                          //  print('var res = ' + str);
                                             Seed.check_syntax('var res = ' + str);
                                             
                                             this.get('/RightEditor.view').el.modify_base(Gtk.StateType.NORMAL, new Gdk.Color({
@@ -157,7 +172,7 @@ Editor=new XObject({
                                                }));
                                             print("SYNTAX ERROR IN EDITOR");   
                                             print(e);
-                                             print(str);
+                                            // print(str);
                                             //console.dump(e);
                                             return false;
                                         }
@@ -169,7 +184,7 @@ Editor=new XObject({
                                         this.el.get_start_iter(s);
                                         this.el.get_end_iter(e);
                                         var ret = this.el.get_text(s,e,true);
-                                        print("TO STRING? " + ret);
+                                        //print("TO STRING? " + ret);
                                         return ret;
                                     }
                                 }