Monitor.js

diff --git a/Monitor.js b/Monitor.js
index 8b21416..26fc24b 100644 (file)
--- a/Monitor.js
+++ b/Monitor.js
@@ -1,6 +1,6 @@
 //<Script type="text/javascript">
-Gio      = imports.gi.Gio;
-GLib      = imports.gi.GLib;
+var Gio      = imports.gi.Gio;
+var GLib      = imports.gi.GLib;
 
 
 /**
@@ -22,7 +22,7 @@ GLib      = imports.gi.GLib;
  */
  
  
-Monitor = function(cfg){
+function Monitor(cfg){
     for (var i in cfg) {
         this[i] = cfg[i];
     }

diff --git a/Spawn.js b/Spawn.js
index bf0c38d..8f46360 100644 (file)
--- a/Spawn.js
+++ b/Spawn.js
@@ -1,7 +1,7 @@
 ///<script type="text/javascript">
 
-Gio      = imports.gi.Gio;
-GLib      = imports.gi.GLib;
+var Gio      = imports.gi.Gio;
+var GLib      = imports.gi.GLib;
 
 
 /**
@@ -57,6 +57,8 @@ function Spawn(cfg) {
     }
     
 }
+
+
 Spawn.prototype = {
     
     listeners : false,
@@ -129,6 +131,7 @@ Spawn.prototype = {
         if (this.debug) {
             print("PID: " + this.pid);
         }
+        
         function tidyup()
         {
             if (_this.pid) {
@@ -250,7 +253,7 @@ Spawn.prototype = {
     write : function(str) // write a line to 
     {
         if (!this.in_ch) {
-            return; // input is closed
+            return 0; // input is closed
         }
         var ret = {};
         var res = this.in_ch.write_chars(str, str.length);

diff --git a/StatusIcon.js b/StatusIcon.js
index a73c216..5f363a1 100644 (file)
--- a/StatusIcon.js
+++ b/StatusIcon.js
@@ -14,18 +14,19 @@
  * b) Pause!??!
  */
  
-Gtk      = imports.gi.Gtk;
-Gdk      = imports.gi.Gdk;
-Gio      = imports.gi.Gio;
-GLib     = imports.gi.GLib;
-Notify   = imports.gi.Notify;
+var Gtk      = imports.gi.Gtk;
+var Gdk      = imports.gi.Gdk;
+var Gio      = imports.gi.Gio;
+var GLib     = imports.gi.GLib;
+var Notify   = imports.gi.Notify;
 
-Git = imports.Git;
-XObject = imports.XObject.XObject
-gitlive = imports.gitlive;
+var Git = imports.Git;
+var XObject = imports.XObject.XObject;
+
+//var gitlive = imports.gitlive;
 
  
-StatusIcon  = new XObject({
+var StatusIcon  = new XObject({
     
     paused : false, // on!
     xtype : Gtk.StatusIcon,
@@ -78,7 +79,7 @@ StatusIcon  = new XObject({
                     listeners : {
                         activate : function () {
                             this.parent.parent.paused = true;
-                            gitlive.monitor.stop();
+                            imports.gitlive.monitor.stop();
                            // this.el.label  = status ? 'Resume' : 'Pause';
                             this.parent.parent.el.set_from_stock( Gtk.STOCK_MEDIA_PAUSE );
                             
@@ -100,7 +101,7 @@ StatusIcon  = new XObject({
                     listeners : {
                         activate : function () {
                             this.parent.parent.paused = false;
-                            gitlive.monitor.start();
+                            imports.gitlive.monitor.start();
                             //var status = this.el.label == 'Pause' ? 1 : 0
                            // this.el.label  = status ? 'Resume' : 'Pause';
                             this.parent.parent.el.set_from_stock(   Gtk.STOCK_MEDIA_PLAY);
@@ -121,9 +122,9 @@ StatusIcon  = new XObject({
                     pack:  'append',
                     listeners : {
                         activate : function () {
-                            gitlive.monitor.stop();
+                            imports.gitlive.monitor.stop();
                             
-                            var f = Gio.file_new_for_path(gitlive.gitlive);
+                            var f = Gio.file_new_for_path(imports.gitlive.gitlive);
                             var file_enum = f.enumerate_children(
                                 Gio.FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME, Gio.FileQueryInfoFlags.NONE, null);
 
@@ -131,7 +132,7 @@ StatusIcon  = new XObject({
                             
                             while ((next_file = file_enum.next_file(null)) != null) {
                                 
-                                var fn = gitlive.gitlive + '/' + next_file.get_display_name();
+                                var fn = imports.gitlive.gitlive + '/' + next_file.get_display_name();
                                 if (! GLib.file_test(fn + '/.git', GLib.FileTest.IS_DIR)) {
                                     continue;
                                 }
@@ -148,7 +149,7 @@ StatusIcon  = new XObject({
                                     notification.show();
                                     continue;
                                 }
-                                gitlive.errorDialog(res.stderr);
+                                imports.gitlive.errorDialog(res.stderr);
                                     // should also update modules ideally.
                                 
                             }
@@ -157,7 +158,7 @@ StatusIcon  = new XObject({
                             file_enum.close(null);
 
                             
-                            gitlive.monitor.start();
+                            imports.gitlive.monitor.start();
                             
                         }
                     }

diff --git a/XObject.js b/XObject.js
index 3bc4f62..fbfc989 100644 (file)
--- a/XObject.js
+++ b/XObject.js
@@ -1,6 +1,6 @@
 //<script type="text/javascript">
-GIRepository = imports.gi.GIRepository;
-GObject = imports.gi.GObject;
+var GIRepository = imports.gi.GIRepository;
+var GObject = imports.gi.GObject;
 /**
  * XObject
  * Yet another attempt to create a usable object construction library for seed..
@@ -143,8 +143,14 @@ XObject.prototype = {
         // xtype= Gtk.Menu ?? what about c_new stuff?
         if (XObject.debug) print("init: ID:"+ this.id +" typeof(xtype): "  + typeof(this.xtype));
         if (!this.el && typeof(this.xtype) == 'function') {
+            // gjs implements xtype as function in seed they are undefined..
             if (XObject.debug) print("func?"  + XObject.keys(this.config).join(','));
-            this.el = this.xtype(this.config);
+            try {
+                this.el = this.xtype(this.config);
+            } catch(e) {
+                this.el = false;
+            }
+            
            
         }
         if (!this.el && typeof(this.xtype) == 'object') {

diff --git a/gitlive.js b/gitlive.js
index 4bbb739..0d567db 100644 (file)
--- a/gitlive.js
+++ b/gitlive.js
@@ -9,6 +9,7 @@
 * 
 * 
 */
+<<<<<<< HEAD
 GI      = imports.gi.GIRepository
 GLib        = imports.gi.GLib;
 
@@ -18,16 +19,23 @@ GI.IRepository.prepend_search_path(GLib.get_home_dir() + '/.Builder/girepository
 Gio      = imports.gi.Gio;
 Gtk      = imports.gi.Gtk;
 Notify = imports.gi.Notify;
+=======
+var GI      = imports.gi.GIRepository;
+var Gio      = imports.gi.Gio;
+var GLib      = imports.gi.GLib;
+var Gtk      = imports.gi.Gtk;
+var Notify = imports.gi.Notify;
+>>>>>>> e9aa44647c32a34dfa368f7594ed72579c912bc3
 
-Spawn = imports.Spawn;
-Git = imports.Git;
-StatusIcon = imports.StatusIcon.StatusIcon;
-Monitor = imports.Monitor.Monitor;
+var Spawn = imports.Spawn;
+var Git = imports.Git;
+var StatusIcon = imports.StatusIcon.StatusIcon;
+var Monitor = imports.Monitor.Monitor;
 
 
 //File = imports[__script_path__+'/../introspection-doc-generator/File.js'].File
 Gtk.init (null, null);
- 
+
 var gitlive = GLib.get_home_dir() + "/gitlive";
 
 if (!GLib.file_test(gitlive, GLib.FileTest.IS_DIR)) {

diff --git a/tests/tickets.js b/tests/tickets.js
new file mode 100644 (file)
index 0000000..e69de29