Changeset 6738

Timestamp:

10/01/06 16:30:54 (5 years ago)

Author:

sys

Message:

Passage de reveal/launch local file dans la lib ut

Location:

trunk/Xul_Cms/content/scenaricms

Files:

• ut.js (modified) (2 diffs)
• wspview/wspview.js (modified) (2 diffs)

trunk/Xul_Cms/content/scenaricms/ut.js

@@ -150 +150 @@
 
 /**
- *
+ * Lance l'application par défaut de l'OS pour l'URL passée en paramètre.
  */
 ut.loadExternalURL = function(pUrl){
@@ -159 +159 @@
     vExtProtocolSvc.loadUrl(vUri);
   }
+}
+
+/**
+ * Ouvre ou révèle un fichier local.
+ * @param pReveal : true = révèle dans le système de fichier de l'OS, false lance l'appli associée par l'OS
+ */
+ut.openExternalLocalFile = function wspOpenExternal(pFilePath, pReveal) {
+        var vFile = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
+        vFile.initWithPath(pFilePath);
+        try {
+                if(pReveal) vFile.reveal(); else vFile.launch();
+        } catch(e) {
+                // This is only called on unix systems due to the fact that nsILocalFile::Launch and nsILocalFile::Reveal have a bug under that OS.
+                // This code is copied from the firefox 1.5 chrome, original file: mozapps/downloads/downloads.js
+                if(pReveal && ! vFile.isDirectory()) vFile = vFile.parent;
+                var vUri = Components.classes["@mozilla.org/network/io-service;1"].getService(Components.interfaces.nsIIOService).newFileURI(vFile);
+                var vProtocolSvc = Components.classes["@mozilla.org/uriloader/external-protocol-service;1"].getService(Components.interfaces.nsIExternalProtocolService);
+                vProtocolSvc.loadUrl(vUri);
+        }
 }
 // ####################### XML UTIL #######################

trunk/Xul_Cms/content/scenaricms/wspview/wspview.js

@@ -1314 +1314 @@
                 var vFilePath = vCtx.fServer.getTextFromService("/u/vueObjet?cdaction=GetFilePath&param="+encodeURIComponent(vCtx.fUri));
         }
-        if(vFilePath) wspOpenExternal(vFilePath, true);
+        if(vFilePath) ut.openExternalLocalFile(vFilePath, true);
 }
 
@@ -1320 +1320 @@
         var vCtx = ut.getContextActions(pEvent.target);
         var vFilePath = vCtx.fServer.getTextFromService("/u/vueObjet?cdaction=GetFilePath&param="+window.encodeURIComponent(vCtx.fUri));
-        if(vFilePath) wspOpenExternal(vFilePath, false);
-}
-
-function wspOpenExternal(pFilePath, pReveal) {
-        var vFile = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
-        vFile.initWithPath(pFilePath);
-        try {
-                if(pReveal) vFile.reveal(); else vFile.launch();
-        } catch(e) {
-                // This is only called on unix systems due to the fact that nsILocalFile::Launch and nsILocalFile::Reveal have a bug under that OS.
-                // This code is copied from the firefox 1.5 chrome, original file: mozapps/downloads/downloads.js
-                if(pReveal && ! vFile.isDirectory()) vFile = vFile.parent;
-                var vUri = Components.classes["@mozilla.org/network/io-service;1"].getService(Components.interfaces.nsIIOService).newFileURI(vFile);
-                var vProtocolSvc = Components.classes["@mozilla.org/uriloader/external-protocol-service;1"].getService(Components.interfaces.nsIExternalProtocolService);
-                vProtocolSvc.loadUrl(vUri);
-        }
+        if(vFilePath) ut.openExternalLocalFile(vFilePath, false);
 }