From noreply at r-forge.r-project.org  Sat Jun 27 10:14:56 2015
From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org)
Date: Sat, 27 Jun 2015 10:14:56 +0200 (CEST)
Subject: [Sciviews-commits] r559 - in komodo/SciViews-K: . content/js
	content/js/tools
Message-ID: <20150627081456.5191D185FA4@r-forge.r-project.org>

Author: phgrosjean
Date: 2015-06-27 10:14:56 +0200 (Sat, 27 Jun 2015)
New Revision: 559

Modified:
   komodo/SciViews-K/chrome.manifest
   komodo/SciViews-K/content/js/interpolate.js
   komodo/SciViews-K/content/js/tools/e4x2dom.js
   komodo/SciViews-K/content/js/tools/file.js
   komodo/SciViews-K/install.rdf
Log:
Some changes towards Komodo 9 compatibility

Modified: komodo/SciViews-K/chrome.manifest
===================================================================
--- komodo/SciViews-K/chrome.manifest	2015-03-06 13:37:56 UTC (rev 558)
+++ komodo/SciViews-K/chrome.manifest	2015-06-27 08:14:56 UTC (rev 559)
@@ -21,3 +21,7 @@
 overlay chrome://places/content/places_panel.xul chrome://sciviewsk/content/placesOverlay.xul appversion>6.99
 
 manifest components/component.manifest
+
+category udl-lexers  sciviewsk at sciviews.org  1
+#category toolbox  sciviewsk at sciviews.org  1
+#category apicatalogs  sciviewsk at sciviews.org  1

Modified: komodo/SciViews-K/content/js/interpolate.js
===================================================================
--- komodo/SciViews-K/content/js/interpolate.js	2015-03-06 13:37:56 UTC (rev 558)
+++ komodo/SciViews-K/content/js/interpolate.js	2015-06-27 08:14:56 UTC (rev 559)
@@ -45,52 +45,60 @@
 		// Add other icon families
 		var family = <menuitem label="Books and Notes"
 			src="chrome://sciviewsk/skin/icons/BooksAndNotes.html"/>;
-		sv.tools.e4x2dom.appendTo(family, families.firstChild);
-		family = <menuitem label="Bullets and Signs"
-			src="chrome://sciviewsk/skin/icons/BulletsAndSigns.html"/>;
-		sv.tools.e4x2dom.appendTo(family, families.firstChild);
-		family = <menuitem label="Communication"
-			src="chrome://sciviewsk/skin/icons/Communication.html"/>;
-		sv.tools.e4x2dom.appendTo(family, families.firstChild);
-		family = <menuitem label="Computing"
-			src="chrome://sciviewsk/skin/icons/Computing.html"/>;
-		sv.tools.e4x2dom.appendTo(family, families.firstChild);
-		family = <menuitem label="Database and Network"
-			src="chrome://sciviewsk/skin/icons/DatabaseAndNetwork.html"/>;
-		sv.tools.e4x2dom.appendTo(family, families.firstChild);
-		family = <menuitem label="Drawing"
-			src="chrome://sciviewsk/skin/icons/Drawing.html"/>;
-		sv.tools.e4x2dom.appendTo(family, families.firstChild);
-		family = <menuitem label="Files and Folders"
-			src="chrome://sciviewsk/skin/icons/FilesAndFolders.html"/>;
-		sv.tools.e4x2dom.appendTo(family, families.firstChild);
-		family = <menuitem label="Hardware"
-			src="chrome://sciviewsk/skin/icons/Hardware.html"/>;
-		sv.tools.e4x2dom.appendTo(family, families.firstChild);
-		family = <menuitem label="Miscellaneous"
-			src="chrome://sciviewsk/skin/icons/Miscellaneous.html"/>;
-		sv.tools.e4x2dom.appendTo(family, families.firstChild);
-		family = <menuitem label="Multimedia"
-			src="chrome://sciviewsk/skin/icons/Multimedia.html"/>;
-		sv.tools.e4x2dom.appendTo(family, families.firstChild);
-		family = <menuitem label="SciViews"
-			src="chrome://sciviewsk/skin/icons/SciViews.html"/>;
-		sv.tools.e4x2dom.appendTo(family, families.firstChild);
-		family = <menuitem label="Text and Tables"
-			src="chrome://sciviewsk/skin/icons/TextAndTables.html"/>;
-		sv.tools.e4x2dom.appendTo(family, families.firstChild);
-		family = <menuitem label="Time and Money"
-			src="chrome://sciviewsk/skin/icons/TimeAndMoney.html"/>;
-		sv.tools.e4x2dom.appendTo(family, families.firstChild);
-		family = <menuitem label="Tools"
-			src="chrome://sciviewsk/skin/icons/Tools.html"/>;
-		sv.tools.e4x2dom.appendTo(family, families.firstChild);
 		
-		// Keep Open Office family, but place it at the end of the list
-		family = <menuitem label="[Open Office Icons]"
-			src="chrome://openoffice/content/industrial.html"/>;
+//		var parser = new DOMParser
+//		var family = parser.parseFromString('<menuitem label="Books and Notes"\n' +
+//			'src="chrome://sciviewsk/skin/icons/BooksAndNotes.html"/>', "text/xml");
 		sv.tools.e4x2dom.appendTo(family, families.firstChild);
+
+
+
+
+//		family = <menuitem label="Bullets and Signs"
+//			src="chrome://sciviewsk/skin/icons/BulletsAndSigns.html"/>;
+//		sv.tools.e4x2dom.appendTo(family, families.firstChild);
+//		family = <menuitem label="Communication"
+//			src="chrome://sciviewsk/skin/icons/Communication.html"/>;
+//		sv.tools.e4x2dom.appendTo(family, families.firstChild);
+//		family = <menuitem label="Computing"
+//			src="chrome://sciviewsk/skin/icons/Computing.html"/>;
+//		sv.tools.e4x2dom.appendTo(family, families.firstChild);
+//		family = <menuitem label="Database and Network"
+//			src="chrome://sciviewsk/skin/icons/DatabaseAndNetwork.html"/>;
+//		sv.tools.e4x2dom.appendTo(family, families.firstChild);
+//		family = <menuitem label="Drawing"
+//			src="chrome://sciviewsk/skin/icons/Drawing.html"/>;
+//		sv.tools.e4x2dom.appendTo(family, families.firstChild);
+//		family = <menuitem label="Files and Folders"
+//			src="chrome://sciviewsk/skin/icons/FilesAndFolders.html"/>;
+//		sv.tools.e4x2dom.appendTo(family, families.firstChild);
+//		family = <menuitem label="Hardware"
+//			src="chrome://sciviewsk/skin/icons/Hardware.html"/>;
+//		sv.tools.e4x2dom.appendTo(family, families.firstChild);
+//		family = <menuitem label="Miscellaneous"
+//			src="chrome://sciviewsk/skin/icons/Miscellaneous.html"/>;
+//		sv.tools.e4x2dom.appendTo(family, families.firstChild);
+//		family = <menuitem label="Multimedia"
+//			src="chrome://sciviewsk/skin/icons/Multimedia.html"/>;
+//		sv.tools.e4x2dom.appendTo(family, families.firstChild);
+//		family = <menuitem label="SciViews"
+//			src="chrome://sciviewsk/skin/icons/SciViews.html"/>;
+//		sv.tools.e4x2dom.appendTo(family, families.firstChild);
+//		family = <menuitem label="Text and Tables"
+//			src="chrome://sciviewsk/skin/icons/TextAndTables.html"/>;
+//		sv.tools.e4x2dom.appendTo(family, families.firstChild);
+//		family = <menuitem label="Time and Money"
+//			src="chrome://sciviewsk/skin/icons/TimeAndMoney.html"/>;
+//		sv.tools.e4x2dom.appendTo(family, families.firstChild);
+//		family = <menuitem label="Tools"
+//			src="chrome://sciviewsk/skin/icons/Tools.html"/>;
+//		sv.tools.e4x2dom.appendTo(family, families.firstChild);
 		
+//		// Keep Open Office family, but place it at the end of the list
+//		family = <menuitem label="[Open Office Icons]"
+//			src="chrome://openoffice/content/industrial.html"/>;
+//		sv.tools.e4x2dom.appendTo(family, families.firstChild);
+		
 		// Add a pointer to the icon makers web sites (required by fugue and
 		// diagona icons)
 		var label = win.document.getElementById("iconlabel");

Modified: komodo/SciViews-K/content/js/tools/e4x2dom.js
===================================================================
--- komodo/SciViews-K/content/js/tools/e4x2dom.js	2015-03-06 13:37:56 UTC (rev 558)
+++ komodo/SciViews-K/content/js/tools/e4x2dom.js	2015-06-27 08:14:56 UTC (rev 559)
@@ -19,7 +19,9 @@
 var SVG  = "http://www.w3.org/2000/svg";
 var RDF  = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
 
-default xml namespace = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+// PhG: the following line generates an error => commented out
+// I think that E4X is now disabled in Komodo!!!
+//default xml namespace = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
 // Translate e4x (JavaScript) node into a DOM node
 sv.tools.e4x2dom.importNode = function (e4x, doc) {
@@ -27,11 +29,11 @@
 	me.Const = me.Const || { mimeType: 'text/xml' };
 	me.Static = me.Static || {};
 	me.Static.parser = me.Static.parser || new DOMParser;
-	xhtml = <testing
-		xmlns:html="http://www.w3.org/1999/xhtml"
-		xmlns:svg="http://www.w3.org/2000/svg"
-		xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"/>;
+	xhtml = new XML('<testing\n' +
+		'xmlns:html="http://www.w3.org/1999/xhtml"\n' +
+		'xmlns:svg="http://www.w3.org/2000/svg"\n' +
+		'xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"\n' +
+		'xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"/>\n');
 	xhtml.test = e4x;
 	domTree = me.Static.parser.parseFromString( xhtml.toXMLString().
 		replace( />\n *</g, "><" ), me.Const.mimeType);
@@ -64,7 +66,7 @@
 
 // Clear a DOM node
 sv.tools.e4x2dom.clear = function (node) {
-	while(node.firstChild)
+	while (node.firstChild)
 		node.removeChild(node.firstChild);
 }
 

Modified: komodo/SciViews-K/content/js/tools/file.js
===================================================================
--- komodo/SciViews-K/content/js/tools/file.js	2015-03-06 13:37:56 UTC (rev 558)
+++ komodo/SciViews-K/content/js/tools/file.js	2015-06-27 08:14:56 UTC (rev 559)
@@ -311,8 +311,12 @@
 					key = "software\\R-core\\R";
 					reg.open(reg.ROOT_KEY_LOCAL_MACHINE, key, reg.ACCESS_READ)
 				} catch(e) {
-					key = "software\\wow6432Node\\r-core\\r";
-					reg.open(reg.ROOT_KEY_LOCAL_MACHINE, key, reg.ACCESS_READ);
+					try {
+						key = "software\\wow6432Node\\r-core\\r";
+						reg.open(reg.ROOT_KEY_LOCAL_MACHINE, key, reg.ACCESS_READ);
+					} catch(e) {
+						return(null);
+					}
 				}
 				if (!reg.hasValue("InstallPath") &&
 					reg.hasValue("Current Version")) {

Modified: komodo/SciViews-K/install.rdf
===================================================================
--- komodo/SciViews-K/install.rdf	2015-03-06 13:37:56 UTC (rev 558)
+++ komodo/SciViews-K/install.rdf	2015-06-27 08:14:56 UTC (rev 559)
@@ -4,7 +4,7 @@
     <Description about="urn:mozilla:install-manifest">
         <em:id>sciviewsk at sciviews.org</em:id>
         <em:name>SciViews-K</em:name>
-        <em:version>0.9.35</em:version>
+        <em:version>0.9.37</em:version>
         <em:description>Edit R code with Komodo</em:description>
         <em:creator>Philippe Grosjean (phgrosjean at sciviews.org)</em:creator>
         <em:contributor>Romain Francois</em:contributor>


From noreply at r-forge.r-project.org  Sat Jun 27 10:16:15 2015
From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org)
Date: Sat, 27 Jun 2015 10:16:15 +0200 (CEST)
Subject: [Sciviews-commits] r560 - komodo/SciViews-K/.komodotools
Message-ID: <20150627081615.C5EC7185FA4@r-forge.r-project.org>

Author: phgrosjean
Date: 2015-06-27 10:16:15 +0200 (Sat, 27 Jun 2015)
New Revision: 560

Removed:
   komodo/SciViews-K/.komodotools/Project/
Log:
Delete of old Komodo tools in SciViews-K addons


From noreply at r-forge.r-project.org  Sat Jun 27 10:21:24 2015
From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org)
Date: Sat, 27 Jun 2015 10:21:24 +0200 (CEST)
Subject: [Sciviews-commits] r561 - komodo/SciViews-K Unit
Message-ID: <20150627082124.E35BC185FA4@r-forge.r-project.org>

Author: phgrosjean
Date: 2015-06-27 10:21:24 +0200 (Sat, 27 Jun 2015)
New Revision: 561

Removed:
   komodo/SciViews-K Unit/_prj_internal_/
Log:
Delete _prj_internal_ not needed any more in SciViews-K Unit


From noreply at r-forge.r-project.org  Sat Jun 27 10:22:16 2015
From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org)
Date: Sat, 27 Jun 2015 10:22:16 +0200 (CEST)
Subject: [Sciviews-commits] r562 - komodo/SciViews-K
	Unit/.komodotools/Project
Message-ID: <20150627082216.1F488185FA4@r-forge.r-project.org>

Author: phgrosjean
Date: 2015-06-27 10:22:15 +0200 (Sat, 27 Jun 2015)
New Revision: 562

Modified:
   komodo/SciViews-K Unit/.komodotools/Project/.folderdata
   komodo/SciViews-K Unit/.komodotools/Project/Build.komodotool
   komodo/SciViews-K Unit/.komodotools/Project/Configure.komodotool
   komodo/SciViews-K Unit/.komodotools/Project/extension_lib.komodotool
Log:
Change in old tools for SciViews-K Unit

Modified: komodo/SciViews-K Unit/.komodotools/Project/.folderdata
===================================================================
--- komodo/SciViews-K Unit/.komodotools/Project/.folderdata	2015-06-27 08:21:24 UTC (rev 561)
+++ komodo/SciViews-K Unit/.komodotools/Project/.folderdata	2015-06-27 08:22:15 UTC (rev 562)
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.7", 
+  "version": "1.0.12", 
   "type": "folder", 
   "name": "Project"
 }
\ No newline at end of file

Modified: komodo/SciViews-K Unit/.komodotools/Project/Build.komodotool
===================================================================
--- komodo/SciViews-K Unit/.komodotools/Project/Build.komodotool	2015-06-27 08:21:24 UTC (rev 561)
+++ komodo/SciViews-K Unit/.komodotools/Project/Build.komodotool	2015-06-27 08:22:15 UTC (rev 562)
@@ -48,7 +48,7 @@
     "});", 
     ""
   ], 
-  "version": "1.0.7", 
+  "version": "1.0.12", 
   "async": "0", 
   "type": "macro", 
   "icon": "chrome://famfamfamsilk/skin/icons/lightning_go.png"

Modified: komodo/SciViews-K Unit/.komodotools/Project/Configure.komodotool
===================================================================
--- komodo/SciViews-K Unit/.komodotools/Project/Configure.komodotool	2015-06-27 08:21:24 UTC (rev 561)
+++ komodo/SciViews-K Unit/.komodotools/Project/Configure.komodotool	2015-06-27 08:22:15 UTC (rev 562)
@@ -70,7 +70,7 @@
     "}", 
     ""
   ], 
-  "version": "1.0.7", 
+  "version": "1.0.12", 
   "async": "0", 
   "type": "macro", 
   "icon": "chrome://famfamfamsilk/skin/icons/wrench.png"

Modified: komodo/SciViews-K Unit/.komodotools/Project/extension_lib.komodotool
===================================================================
--- komodo/SciViews-K Unit/.komodotools/Project/extension_lib.komodotool	2015-06-27 08:21:24 UTC (rev 561)
+++ komodo/SciViews-K Unit/.komodotools/Project/extension_lib.komodotool	2015-06-27 08:22:15 UTC (rev 562)
@@ -167,7 +167,7 @@
     "}", 
     ""
   ], 
-  "version": "1.0.7", 
+  "version": "1.0.12", 
   "async": "0", 
   "type": "macro", 
   "icon": "chrome://famfamfamsilk/skin/icons/brick.png"


From noreply at r-forge.r-project.org  Sat Jun 27 10:36:28 2015
From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org)
Date: Sat, 27 Jun 2015 10:36:28 +0200 (CEST)
Subject: [Sciviews-commits] r563 - komodo/SciViews-K Unit/.komodotools
Message-ID: <20150627083628.C55931878FC@r-forge.r-project.org>

Author: phgrosjean
Date: 2015-06-27 10:36:28 +0200 (Sat, 27 Jun 2015)
New Revision: 563

Removed:
   komodo/SciViews-K Unit/.komodotools/.migrated
Log:
Remove .migrated from tools in SciViews-K Unit

Deleted: komodo/SciViews-K Unit/.komodotools/.migrated
===================================================================
--- komodo/SciViews-K Unit/.komodotools/.migrated	2015-06-27 08:22:15 UTC (rev 562)
+++ komodo/SciViews-K Unit/.komodotools/.migrated	2015-06-27 08:36:28 UTC (rev 563)
@@ -1 +0,0 @@
-migrated SciViews-K Unit on Thu Dec 13 13:46:36 2012