From 762154f53aae77691e5c5875bf1f46874315969b Mon Sep 17 00:00:00 2001 From: "mkaply%us.ibm.com" Date: Tue, 16 May 2006 19:49:48 +0000 Subject: [PATCH] #338055 CCK only - not part of build Only use the ZipWritercomponent if a zip EXE isn't specified. also, if ZipWriterComponent fails, try zip.exe --- .../cck/browser/resources/content/cckwizard/cckwizard.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/extensions/cck/browser/resources/content/cckwizard/cckwizard.js b/extensions/cck/browser/resources/content/cckwizard/cckwizard.js index 92113a1eb22d..94c306114ac5 100755 --- a/extensions/cck/browser/resources/content/cckwizard/cckwizard.js +++ b/extensions/cck/browser/resources/content/cckwizard/cckwizard.js @@ -1086,7 +1086,7 @@ function CCKZip(zipfile, location) file.remove(false); } catch (ex) {} - if (Components.interfaces.IZipWriterComponent) { + if ((document.getElementById("zipLocation").value == "") && (Components.interfaces.IZipWriterComponent)) { var archivefileobj = location.clone(); archivefileobj.append(zipfile); @@ -1140,11 +1140,10 @@ function CCKZip(zipfile, location) } zipwriterobj.commitUpdates(); - + return; } catch (e) { - gPromptService.alert(window, "", "ZIPWriterComponent error"); + gPromptService.alert(window, "", "ZIPWriterComponent error - attempting ZIP"); } - return; } var zipLocation = document.getElementById("zipLocation").value;