Partial support for Firefox.

titoBouzout · Sep 10, 2011 · f731f77 · f731f77
1 parent 18e3609
commit f731f77
Show file tree

Hide file tree

Showing 10 changed files with 90 additions and 45 deletions.
diff --git a/build.sh b/build.sh
@@ -1,3 +1,2 @@
 rm garden.xpi
-zip  -x \*.git\* -r garden.xpi *
-komodo garden.xpi
+zip  -x \*.git\* -r garden.xpi *
diff --git a/chrome.manifest b/chrome.manifest
@@ -2,23 +2,27 @@ content asynchremote chrome/
 
 resource up.tito.asynchremote chrome/js/API/
 
-overlay chrome://komodo/content/komodo.xul chrome://asynchremote/content/xul/_includes.xul
+overlay chrome://komodo/content/komodo.xul 		chrome://asynchremote/content/xul/_includes.xul
+overlay chrome://browser/content/browser.xul 	chrome://asynchremote/content/xul/_includes.xul
 
-overlay chrome://komodo/content/komodo.xul chrome://asynchremote/content/xul/ko.toolbar.xul
+overlay chrome://asynchremote/content/xul/_includes.xul chrome://asynchremote/content/xul/gardenKomodo.xul
+overlay chrome://asynchremote/content/xul/_includes.xul chrome://asynchremote/content/xul/gardenFirefox.xul
 
-overlay chrome://komodo/content/komodo.xul chrome://asynchremote/content/xul/garden.xul
-overlay chrome://komodo/content/komodo.xul chrome://asynchremote/content/xul/tree.toolbar.top.xul
-overlay chrome://komodo/content/komodo.xul chrome://asynchremote/content/xul/tree.toolbar.bottom.xul
-overlay chrome://komodo/content/komodo.xul chrome://asynchremote/content/xul/tree.xul
-overlay chrome://komodo/content/komodo.xul chrome://asynchremote/content/xul/context.xul
-overlay chrome://komodo/content/komodo.xul chrome://asynchremote/content/xul/log.xul
+overlay chrome://asynchremote/content/xul/_includes.xul chrome://asynchremote/content/xul/garden.xul
+overlay chrome://asynchremote/content/xul/_includes.xul chrome://asynchremote/content/xul/tree.toolbar.top.xul
+overlay chrome://asynchremote/content/xul/_includes.xul chrome://asynchremote/content/xul/tree.toolbar.bottom.xul
+overlay chrome://asynchremote/content/xul/_includes.xul chrome://asynchremote/content/xul/tree.xul
+overlay chrome://asynchremote/content/xul/_includes.xul chrome://asynchremote/content/xul/context.xul
+overlay chrome://asynchremote/content/xul/_includes.xul chrome://asynchremote/content/xul/log.xul
 
-style chrome://komodo/content/komodo.xul chrome://asynchremote/content/css/context.css
-style chrome://komodo/content/komodo.xul chrome://asynchremote/content/css/files.css
-style chrome://komodo/content/komodo.xul chrome://asynchremote/content/css/groups.css
-style chrome://komodo/content/komodo.xul chrome://asynchremote/content/css/log.css
-style chrome://komodo/content/komodo.xul chrome://asynchremote/content/css/toolbar.css
-style chrome://komodo/content/komodo.xul chrome://asynchremote/content/css/tree.css
+overlay chrome://asynchremote/content/xul/_includes.xul chrome://asynchremote/content/xul/ko.toolbar.xul
+
+style chrome://asynchremote/content/xul/_includes.xul chrome://asynchremote/content/css/context.css
+style chrome://asynchremote/content/xul/_includes.xul chrome://asynchremote/content/css/files.css
+style chrome://asynchremote/content/xul/_includes.xul chrome://asynchremote/content/css/groups.css
+style chrome://asynchremote/content/xul/_includes.xul chrome://asynchremote/content/css/log.css
+style chrome://asynchremote/content/xul/_includes.xul chrome://asynchremote/content/css/toolbar.css
+style chrome://asynchremote/content/xul/_includes.xul chrome://asynchremote/content/css/tree.css
 
 #Windows Styles https://developer.mozilla.org/en/OS_TARGET
-style chrome://komodo/content/komodo.xul chrome://asynchremote/content/css/toolbar-winnt.css os=winnt
+style chrome://asynchremote/content/xul/_includes.xul chrome://asynchremote/content/css/toolbar-winnt.css os=winnt
diff --git a/chrome/js/classes/instances.js b/chrome/js/classes/instances.js
@@ -1387,15 +1387,15 @@ GardenInstances.prototype = {
 		  //run in a thread and then back to main thread because we need to wait for the file to download
 		  if(!aProcess.stopped())
 		  {
-			var AsynchRemoteConnection = this;
+			var koRemote = this;
 			myAPI.thread().runThread(function(){
 								  if(myAPI.file().exists(aTemporalDestination))
 									myAPI.thread().runMain(function(){
 									  if(
 										 myAPI.file().read(aLocalFileToCompare) ==
 										 myAPI.file().read(aTemporalDestination)
 										)
-										 AsynchRemoteConnection.log('sucess', 'The local and remote file "'+aFile+'" are identical', aProcess.id);
+										 koRemote.log('sucess', 'The local and remote file "'+aFile+'" are identical', aProcess.id);
 										 else
 										  ko.fileutils.showDiffs(aLocalFileToCompare, aTemporalDestination);
 									  });
@@ -1794,9 +1794,9 @@ GardenInstances.prototype = {
   },
   cleanCacheOverWrite:function()
   {
-	var AsynchRemoteConnection = this;
+	var koRemote = this;
 	myAPI.thread().runThread(function(){
-										garden.shared.obj.removeWithPrefix('overWrite.'+AsynchRemoteConnection.server+'.');
+										garden.shared.obj.removeWithPrefix('overWrite.'+koRemote.server+'.');
 									  }, this.thread);
   	this.log('status', 'Cleaned overwrite settings', 0);
   },

diff --git a/chrome/js/drivers/komodo.js b/chrome/js/drivers/komodo.js
@@ -1,23 +1,29 @@
-const mRCService = Components
+
+
+function koRemote()
+{
+  this.RCService = Components
 					  .classes["@activestate.com/koRemoteConnectionService;1"]
 					  .getService(
 								  Components
 									.interfaces
 									.koIRemoteConnectionService
 								  );
-
-function AsynchRemoteConnection(){}
+}
 
-AsynchRemoteConnection.prototype = {
+koRemote.prototype = {
 
   driverRegister: function()
   {
-	gardenDrivers.register(
-							'komodo',
-							'Komodo (ftp, ftps, sftp, scp)',
-							AsynchRemoteConnection,
-							'remote'
-						  );
+	if(myAPI.app().isKomodo())
+	{
+	  gardenDrivers.register(
+							  'komodo',
+							  'Komodo (ftp, ftps, sftp, scp)',
+							  koRemote,
+							  'remote'
+							);
+	}
   },
   driverInit:function()
   {
@@ -32,7 +38,7 @@ AsynchRemoteConnection.prototype = {
   },
   driverGetEntries:function()
   {
-	var servers = mRCService.getServerInfoList({});
+	var servers = this.RCService.getServerInfoList({});
 	var entries = [];
 	var i = 0;
 	var prefix = '';
@@ -56,7 +62,7 @@ AsynchRemoteConnection.prototype = {
   connect: function(aNumTry, aKeepAliveRequest)
   {
 	if(!this.connection)
-	  this.connection = mRCService.getConnectionUsingServerAlias(this.aData.alias);
+	  this.connection = this.RCService.getConnectionUsingServerAlias(this.aData.alias);
 	return this.connection;
   },
   keepAlive:function()
@@ -127,4 +133,4 @@ AsynchRemoteConnection.prototype = {
   }
 };
 
-garden.registerDriverClass(AsynchRemoteConnection);
+garden.registerDriverClass(koRemote);
diff --git a/chrome/xul/garden.xul b/chrome/xul/garden.xul
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <hbox id="komodo-hbox">
-
   	<splitter
 	  state="open"
 	  ordinal="1"
 	  persist="state"
 	  collapse="after"
 	  ondblclick="garden.sidebarResize(event)"
-	  style="padding:0px;margin:0px;width:5px;"/>
+	  style="padding:0px;margin:0px;width:5px;"
+	  orient="horizontal"
+	  id="g-box-splitter"
+	/>
 	<!-- container -->
 	<vbox persist="width height collapsed" width="210" id="g-box">
 
@@ -26,6 +27,4 @@
 
 	<vbox id="g-tree-template" collapsed="true"/>
 
-  </hbox>
-
 </overlay>
diff --git a/chrome/xul/gardenFirefox.xul b/chrome/xul/gardenFirefox.xul
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <hbox id="browser">
+	<splitter id="g-box-splitter"/>
+	<vbox id="g-box"/>
+	<vbox id="g-tree-template"/>
+  </hbox>
+
+  <popupset id="mainPopupSet">
+	<popupset id="extensionPopupSet"/>
+  </popupset>
+
+</overlay>
diff --git a/chrome/xul/gardenKomodo.xul b/chrome/xul/gardenKomodo.xul
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <hbox id="komodo-hbox">
+	<splitter id="g-box-splitter"/>
+	<vbox id="g-box"/>
+	<vbox id="g-tree-template"/>
+  </hbox>
+
+</overlay>
diff --git a/chrome/xul/tree.xul b/chrome/xul/tree.xul
@@ -16,7 +16,7 @@
 		seltype="multiple"
 
 		hidecolumnpicker="true"
-
+		editable="true"
 		class="g-tree"
 		context="g-tree-context"
 

diff --git a/garden.xpi b/garden.xpi
diff --git a/install.rdf b/install.rdf
@@ -11,23 +11,36 @@
 	  <em:creator>Tito</em:creator>
 	  <em:iconURL>chrome://asynchremote/content/icons/icon.png</em:iconURL>
 	  <em:homepageURL>https://github.com/titoBouzout/komodo-garden</em:homepageURL>
+
+	  <!-- Komodo Edit's uuid -->
 	  <em:targetApplication>
 		<Description>
-			<!-- Komodo Edit's uuid -->
 			<em:id>{b1042fb5-9e9c-11db-b107-000d935d3368}</em:id>
 			<em:minVersion>6.0</em:minVersion>
-			<em:maxVersion>7.*</em:maxVersion>
+			<em:maxVersion>30000000</em:maxVersion>
 		</Description>
 	  </em:targetApplication>
-
+
+	  <!-- Komodo IDE -->
 	  <em:targetApplication>
 		  <Description>
-			  <!-- Komodo IDE -->
 			  <em:id>{36E66FA0-F259-11D9-850E-000D935D3368}</em:id>
 			  <em:minVersion>6.0</em:minVersion>
-			  <em:maxVersion>7.*</em:maxVersion>
+			  <em:maxVersion>30000000</em:maxVersion>
 		  </Description>
 	  </em:targetApplication>
+
+	  <!-- Firefox -->
+	  <em:targetApplication>
+		  <Description>
+			  <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
+			  <em:minVersion>4.0</em:minVersion>
+			  <em:maxVersion>30000000</em:maxVersion>
+		  </Description>
+	  </em:targetApplication>
+
     </Description>
 
+
+
 </RDF>