Support Lower Versions of FF/XRE

prikhi · Nov 20, 2016 · 859f8d7 · 859f8d7
1 parent ad827dc
commit 859f8d7
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 5 deletions.
diff --git a/app/application.ini b/app/application.ini
@@ -8,3 +8,7 @@ [email protected]
 [Gecko]
 MinVersion=@MIN_VERSION@
 MaxVersion=@MAX_VERSION@
+
+[Goanna]
+MinVersion=1.9.1
+MaxVersion=9.9.9
diff --git a/app/content/pencil/common/compat.js b/app/content/pencil/common/compat.js
@@ -0,0 +1,14 @@
+var Compat = {};
+
+var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
+  .getService(Components.interfaces.nsIXULAppInfo);
+
+Compat.xre_version = appInfo.platformVersion.split('.')[0];
+
+Compat.saveUri = function(persist, uri, headers, localFile) {
+  if (Compat.xre_version >= '36') {
+    persist.saveURI(uri, null, null, null, null, headers, localFile, null);
+  } else {
+    persist.saveURI(uri, null, null, null, headers, localFile, null);
+  }
+}
diff --git a/app/content/pencil/common/externalEditorSupports.js b/app/content/pencil/common/externalEditorSupports.js
@@ -100,7 +100,7 @@ ExternalEditorSupports.editImageData = function (imageData, ext, ownerObject) {
                 persist.progressListener = new PersistProgressListener(callback);
 
                 // save the canvas data to the file
-                persist.saveURI(source, null, null, null, null, file);
+                Compat.saveUri(persist, source, null, file);
             }
         }, {
             update: function (file) {

diff --git a/app/content/pencil/common/svgRasterizer.js b/app/content/pencil/common/svgRasterizer.js
@@ -261,7 +261,7 @@ Rasterizer.prototype.saveURI = function (url, file) {
         createInstance(Components.interfaces.nsIWebBrowserPersist);
 
     persist.progressListener = persistListener;
-    persist.saveURI(uri, null, null, null, null, null, localFile, null);
+    Compat.saveUri(persist, uri, null, localFile);
 };
 
 function PersistProgressListener(callback) {

diff --git a/app/content/pencil/common/util.js b/app/content/pencil/common/util.js
@@ -1529,7 +1529,7 @@ Net.downloadAsync = function(url, destPath, listener) {
         // do something
       }
     }*/
-    persist.saveURI(obj_URI, null, null, null, "", file);
+    Compat.saveUri(persist, obj_URI, "", file);
 };
 Util.goDoCommand = function (command, doc) {
     var dom = doc ? doc : document;

diff --git a/app/content/pencil/firefoxOverlay.js b/app/content/pencil/firefoxOverlay.js
@@ -118,7 +118,7 @@ PencilOverlay.saveURI = function (url, filePath, callback)
               createInstance(Components.interfaces.nsIWebBrowserPersist);
 
     persist.progressListener = persistListener;
-    persist.saveURI(uri, null, null, null, null, localFile);
+    Compat.saveUri(persist, uri, null, localFile);
 };
 
 function PersistProgressListener(callback)

diff --git a/app/content/pencil/mainWindow.xul b/app/content/pencil/mainWindow.xul
@@ -37,6 +37,7 @@
     <script src="chrome://pencil/content/common/base64.js"/>
     <script src="chrome://pencil/content/common/dockingManager.js"/>
 
+    <script src="chrome://pencil/content/common/compat.js"/>
     <script src="chrome://pencil/content/common/config.js"/>
 
     <script src="chrome://pencil/content/canvasHelper/canvasCareTaker.js"/>

diff --git a/build/properties.sh b/build/properties.sh
@@ -6,7 +6,7 @@ export BUILD=`date +%Y%m%d`
 export AUTHOR='Pavan Rikhi([email protected]) and Contributors'
 export MAINTAINER='Pavan Rikhi <[email protected]>'
 export XPI_NAME='Pencil-'$VERSION'-firefox.xpi'
-export MIN_VERSION='36.0'
+export MIN_VERSION='4.0'
 export MAX_VERSION='53.*'
 export UPDATE_URL="https://github.com/prikhi/pencil/releases"
 export XULRUNNER_XUL="*"