addons: sbsdiff: update to support Komodo 7

git-svn-id: http://svn.openkomodo.com/repos/addons/sbsdiff@8378 b87d16e7-d29f-4ee1-b5ec-817d645d335f

Author: Todd Whiteman

chrome.manifest

@@ -1,3 +1,7 @@
-content sbsdiff content/ xpcnativewrappers=yes contentaccessible=yes
+content sbsdiff content/ contentaccessible=yes
 skin sbsdiff classic/1.0 pylib/reviewboard/htdocs/media/rb/css/
+locale sbsdiff en-US locale/en-US/
+
 overlay chrome://komodo/content/dialogs/diff.xul chrome://sbsdiff/content/diff-overlay.xul
+
+manifest components/component.manifest

content/diff-overlay.js

@@ -80,17 +80,19 @@ function loadSBSDiff() {
     html = unicodeConverter.ConvertFromUnicode(html);
 
     // Get the extension's on-disk location.
-    var MY_ID = "[email protected]";
-    var em = Components.classes["@mozilla.org/extensions/manager;1"].
-             getService(Components.interfaces.nsIExtensionManager);
-    var aFile = em.getInstallLocation(MY_ID).getItemFile(MY_ID, "content");
+    var aFile = Components.classes["@mozilla.org/file/directory_service;1"].
+                        getService( Components.interfaces.nsIProperties).
+                        get("ProfD", Components.interfaces.nsIFile);
+    aFile.append("extensions");
+    aFile.append("[email protected]");
+    aFile.append("content");
     aFile.append("diff.html");
     if (aFile.exists())
         aFile.remove(false);
-    aFile.create(Components.interfaces.nsIFile.NORMAL_FILE_TYPE, 0660);
+    aFile.create(Components.interfaces.nsIFile.NORMAL_FILE_TYPE, parseInt("0660", 8));
     var stream = Components.classes["@mozilla.org/network/safe-file-output-stream;1"]
                            .createInstance(Components.interfaces.nsIFileOutputStream);
-    stream.init(aFile, 0x04 | 0x08 | 0x20, 0600, 0); // write, create, truncate
+    stream.init(aFile, 0x04 | 0x08 | 0x20, parseInt("0600", 8), 0); // write, create, truncate
     stream.write(html, html.length);
     if (stream instanceof Components.interfaces.nsISafeOutputStream) {
         stream.finish();

content/diff-overlay.xul

@@ -37,10 +37,8 @@
  * ***** END LICENSE BLOCK ***** -->
 
 <!DOCTYPE bindings PUBLIC "-//MOZILLA//DTD XBL V1.0//EN" "http://www.mozilla.org/xbl" [
-  <!ENTITY % bindingsDTD SYSTEM "chrome://komodo/locale/bindings.dtd">
-  %bindingsDTD;
-  <!ENTITY % dialogsDTD SYSTEM "chrome://komodo/locale/dialogs.dtd">
-  %dialogsDTD;
+  <!ENTITY % sbsdiffDTD SYSTEM "chrome://sbsdiff/locale/sbsdiff.dtd">
+  %sbsdiffDTD;
 ]>
 
 <?xml-stylesheet href="chrome://komodo/skin/global/global.css" type="text/css"?>

install.rdf

@@ -4,7 +4,8 @@
 
 	<Description about="urn:mozilla:install-manifest">
 
-		<em:type>2</em:type> <!-- type=extension --> 
+		<em:type>2</em:type> <!-- type=extension -->
+		<em:unpack>true</em:unpack>
 		<em:id>[email protected]</em:id>
 		<em:name>Side by Side Diffs</em:name>
 		<em:version>0.2.3</em:version>
@@ -20,15 +21,15 @@
 				<!-- Komodo IDE's uuid -->
 				<em:id>{36E66FA0-F259-11D9-850E-000D935D3368}</em:id>
 				<em:minVersion>5.2.0-alpha1</em:minVersion>
-				<em:maxVersion>6.*</em:maxVersion>
+				<em:maxVersion>7.*</em:maxVersion>
 			</Description>
 		</em:targetApplication>
 		<em:targetApplication>
 			<Description>
 				<!-- Komodo Edit's uuid -->
 				<em:id>{b1042fb5-9e9c-11db-b107-000d935d3368}</em:id>
 				<em:minVersion>5.2.0-alpha1</em:minVersion>
-				<em:maxVersion>6.*</em:maxVersion>
+				<em:maxVersion>7.*</em:maxVersion>
 			</Description>
 		</em:targetApplication>
 

locale/en-US/sbsdiff.dtd

@@ -0,0 +1,2 @@
+<!ENTITY revealPositionInEditor.label "Reveal Position in Editor">
+<!ENTITY revealPositionInEditor.tooltiptext "Show this file position in the main Komodo editor window.">