Permalink
Browse files

Merge branch 'master' of git@github.com:darwin/xrefresh

  • Loading branch information...
2 parents 7312207 + ffb826b commit 69075f1538bd71cad638145ab57e28ccfc60b0c7 @darwin darwin committed Jun 21, 2009
View
@@ -1,5 +1,5 @@
REM run this from xrefresh/ins direcotory
-@SET XVERSION=1.0
+@SET XVERSION=1.0.1
@SET PATH=%PATH%;wix-3
call vsvars32.bat
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.20706</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{EF4D5915-7A42-48AA-8EE5-F632DA7BF583}</ProjectGuid>
- <OutputType>Exe</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>FirefoxExtension</RootNamespace>
- <AssemblyName>FirefoxExtension</AssemblyName>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
- Other similar extension points exist, see Microsoft.Common.targets.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- -->
- <ItemGroup>
- <None Include="firefox\chrome.manifest" />
- <None Include="firefox\chrome\content\xrefresh.xul" />
- <None Include="firefox\chrome\content\XRefreshOverlay.xul">
- <Link>XRefreshOverlay.xul</Link>
- </None>
- <None Include="firefox\install.rdf" />
- </ItemGroup>
- <ItemGroup>
- <Content Include="firefox\chrome\content\casper\events.js">
- <Link>events.js</Link>
- </Content>
- <Content Include="firefox\chrome\content\casper\events.js" />
- <Content Include="firefox\chrome\content\casper\json.js">
- <Link>json.js</Link>
- </Content>
- <Content Include="firefox\chrome\content\casper\logger.js">
- <Link>logger.js</Link>
- </Content>
- <Content Include="firefox\chrome\content\casper\logger.js" />
- <Content Include="firefox\chrome\content\casper\xpath.js">
- <Link>xpath.js</Link>
- </Content>
- <Content Include="firefox\chrome\content\casper\xpath.js" />
- <Content Include="firefox\chrome\content\lib\utf8.js">
- <Link>utf8.js</Link>
- </Content>
- <Content Include="firefox\chrome\content\lib\utf8.js" />
- <Content Include="firefox\chrome\content\panel.js" />
- <Content Include="firefox\chrome\content\XRefreshPanel.js">
- <Link>XRefreshPanel.js</Link>
- </Content>
- <Content Include="firefox\chrome\skin\panel.css" />
- <Content Include="firefox\defaults\preferences\xrefresh.js" />
- </ItemGroup>
-</Project>
View
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.20706</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{14E61496-BF33-4C72-9662-0584EBCF8CD3}</ProjectGuid>
- <OutputType>Exe</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>XRefreshSetup</RootNamespace>
- <AssemblyName>XRefreshSetup</AssemblyName>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
- Other similar extension points exist, see Microsoft.Common.targets.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- -->
- <ItemGroup>
- <None Include="..\ins\WixUI_en-us.wxl">
- <Link>WixUI_en-us.wxl</Link>
- </None>
- <None Include="..\ins\_build.bat">
- <Link>_build.bat</Link>
- </None>
- </ItemGroup>
- <ItemGroup>
- <Content Include="..\ins\AdvancedWelcomeEulaDlg.wxs">
- <Link>AdvancedWelcomeEulaDlg.wxs</Link>
- </Content>
- <Content Include="..\ins\BrowseDlg.wxs">
- <Link>BrowseDlg.wxs</Link>
- </Content>
- <Content Include="..\ins\CancelDlg.wxs">
- <Link>CancelDlg.wxs</Link>
- </Content>
- <Content Include="..\ins\Common.wxs">
- <Link>Common.wxs</Link>
- </Content>
- <Content Include="..\ins\CustomizeDlg.wxs">
- <Link>CustomizeDlg.wxs</Link>
- </Content>
- <Content Include="..\ins\DiskCostDlg.wxs">
- <Link>DiskCostDlg.wxs</Link>
- </Content>
- <Content Include="..\ins\ErrorDlg.wxs">
- <Link>ErrorDlg.wxs</Link>
- </Content>
- <Content Include="..\ins\ErrorProgressText.wxs">
- <Link>ErrorProgressText.wxs</Link>
- </Content>
- <Content Include="..\ins\ExitDialog.wxs">
- <Link>ExitDialog.wxs</Link>
- </Content>
- <Content Include="..\ins\FatalError.wxs">
- <Link>FatalError.wxs</Link>
- </Content>
- <Content Include="..\ins\FeaturesDlg.wxs">
- <Link>FeaturesDlg.wxs</Link>
- </Content>
- <Content Include="..\ins\FilesInUse.wxs">
- <Link>FilesInUse.wxs</Link>
- </Content>
- <Content Include="..\ins\InstallDirDlg.wxs">
- <Link>InstallDirDlg.wxs</Link>
- </Content>
- <Content Include="..\ins\InstallScopeDlg.wxs">
- <Link>InstallScopeDlg.wxs</Link>
- </Content>
- <Content Include="..\ins\LicenseAgreementDlg.wxs">
- <Link>LicenseAgreementDlg.wxs</Link>
- </Content>
- <Content Include="..\ins\MaintenanceTypeDlg.wxs">
- <Link>MaintenanceTypeDlg.wxs</Link>
- </Content>
- <Content Include="..\ins\MaintenanceWelcomeDlg.wxs">
- <Link>MaintenanceWelcomeDlg.wxs</Link>
- </Content>
- <Content Include="..\ins\MsiRMFilesInUse.wxs">
- <Link>MsiRMFilesInUse.wxs</Link>
- </Content>
- <Content Include="..\ins\OutOfDiskDlg.wxs">
- <Link>OutOfDiskDlg.wxs</Link>
- </Content>
- <Content Include="..\ins\OutOfRbDiskDlg.wxs">
- <Link>OutOfRbDiskDlg.wxs</Link>
- </Content>
- <Content Include="..\ins\PrepareDlg.wxs">
- <Link>PrepareDlg.wxs</Link>
- </Content>
- <Content Include="..\ins\ProgressDlg.wxs">
- <Link>ProgressDlg.wxs</Link>
- </Content>
- <Content Include="..\ins\ResumeDlg.wxs">
- <Link>ResumeDlg.wxs</Link>
- </Content>
- <Content Include="..\ins\SetupTypeDlg.wxs">
- <Link>SetupTypeDlg.wxs</Link>
- </Content>
- <Content Include="..\ins\UserExit.wxs">
- <Link>UserExit.wxs</Link>
- </Content>
- <Content Include="..\ins\VerifyReadyDlg.wxs">
- <Link>VerifyReadyDlg.wxs</Link>
- </Content>
- <Content Include="..\ins\WaitForCostingDlg.wxs">
- <Link>WaitForCostingDlg.wxs</Link>
- </Content>
- <Content Include="..\ins\WelcomeDlg.wxs">
- <Link>WelcomeDlg.wxs</Link>
- </Content>
- <Content Include="..\ins\WelcomeEulaDlg.wxs">
- <Link>WelcomeEulaDlg.wxs</Link>
- </Content>
- <Content Include="..\ins\WixUI_Advanced.wxs">
- <Link>WixUI_Advanced.wxs</Link>
- </Content>
- <Content Include="..\ins\WixUI_FeatureTree.wxs">
- <Link>WixUI_FeatureTree.wxs</Link>
- </Content>
- <Content Include="..\ins\WixUI_InstallDir.wxs">
- <Link>WixUI_InstallDir.wxs</Link>
- </Content>
- <Content Include="..\ins\WixUI_Minimal.wxs">
- <Link>WixUI_Minimal.wxs</Link>
- </Content>
- <Content Include="..\ins\WixUI_Mondo.wxs">
- <Link>WixUI_Mondo.wxs</Link>
- </Content>
- <Content Include="..\ins\xrefresh.wxs">
- <Link>xrefresh.wxs</Link>
- </Content>
- <Content Include="..\ins\_hints.txt">
- <Link>_hints.txt</Link>
- </Content>
- </ItemGroup>
-</Project>
@@ -1,4 +1,4 @@
-// we use UTF-8 encoded JSON to exchange messages between extension and server
+// we use UTF-8 encoded JSON to exchange messages between extension and server
//
// this source contains copy&pasted various bits from Firebug sources.
@@ -145,9 +145,11 @@ FBL.ns(function() {
var parts = data.split(messageSeparator);
for (var i = 0; i < parts.length-1; i++) {
var buffer = UTF8.decode(parts[i]);
- var message = JSON.parse(buffer);
+ try {
+ var message = JSON.parse(buffer);
+ } catch (e) {}
if (!message) {
- module.error("Enable to parse server JSON message: "+message);
+ module.error("Unable to parse server JSON message: "+buffer);
continue;
}
dbg(" message:", message);
@@ -855,6 +857,7 @@ FBL.ns(function() {
},
/////////////////////////////////////////////////////////////////////////////////////////
doesCSSNameMatch: function(cssLink, cssFile) {
+ cssFile = cssFile.replace('\\', '/'); // convert windows backslashes to forward slashes
var firstQ = cssLink.indexOf('?');
if (firstQ != -1) cssLink = cssLink.substring(0, firstQ);
var lastLinkSlash = cssLink.lastIndexOf('/');
Oops, something went wrong.

0 comments on commit 69075f1

Please sign in to comment.