Updated Branches: refs/heads/master 05b0212b2 -> 184d55f5a
Fix wp8 framework project Project: http://git-wip-us.apache.org/repos/asf/cordova-wp8/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-wp8/commit/184d55f5 Tree: http://git-wip-us.apache.org/repos/asf/cordova-wp8/tree/184d55f5 Diff: http://git-wip-us.apache.org/repos/asf/cordova-wp8/diff/184d55f5 Branch: refs/heads/master Commit: 184d55f5a09c1764290838ddc18d8a956547a4c1 Parents: 05b0212 Author: Jesse MacFadyen <[email protected]> Authored: Mon Jun 24 14:21:22 2013 -0700 Committer: Jesse MacFadyen <[email protected]> Committed: Mon Jun 24 14:21:22 2013 -0700 ---------------------------------------------------------------------- wp8/framework/WPCordovaClassLib.csproj | 129 +++--------------------- wp8/template/cordovalib/NativeExecution.cs | 22 ++-- 2 files changed, 24 insertions(+), 127 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/184d55f5/wp8/framework/WPCordovaClassLib.csproj ---------------------------------------------------------------------- diff --git a/wp8/framework/WPCordovaClassLib.csproj b/wp8/framework/WPCordovaClassLib.csproj index 55da878..d80e811 100644 --- a/wp8/framework/WPCordovaClassLib.csproj +++ b/wp8/framework/WPCordovaClassLib.csproj @@ -119,127 +119,42 @@ <Prefer32Bit>false</Prefer32Bit> </PropertyGroup> <ItemGroup> - <Compile Include="..\templates\standalone\cordovalib\BrowserMouseHelper.cs"> + <Compile Include="..\template\cordovalib\BrowserMouseHelper.cs"> <Link>CordovaLib\BrowserMouseHelper.cs</Link> </Compile> - <Compile Include="..\templates\standalone\cordovalib\CommandFactory.cs"> + <Compile Include="..\template\cordovalib\CommandFactory.cs"> <Link>CordovaLib\CommandFactory.cs</Link> </Compile> - <Compile Include="..\templates\standalone\cordovalib\Commands\BaseCommand.cs"> + <Compile Include="..\template\cordovalib\Commands\BaseCommand.cs"> <Link>CordovaLib\Commands\BaseCommand.cs</Link> </Compile> - <Compile Include="..\templates\standalone\cordovalib\ConfigHandler.cs"> + <Compile Include="..\template\cordovalib\ConfigHandler.cs"> <Link>CordovaLib\ConfigHandler.cs</Link> </Compile> - <Compile Include="..\templates\standalone\cordovalib\CordovaCommandCall.cs"> + <Compile Include="..\template\cordovalib\CordovaCommandCall.cs"> <Link>CordovaLib\CordovaCommandCall.cs</Link> </Compile> - <Compile Include="..\templates\standalone\cordovalib\CordovaView.xaml.cs"> + <Compile Include="..\template\cordovalib\CordovaView.xaml.cs"> <Link>CordovaLib\CordovaView.xaml.cs</Link> - <DependentUpon>CordovaView.xaml</DependentUpon> </Compile> - <Compile Include="..\templates\standalone\cordovalib\DOMStorageHelper.cs"> - <Link>CordovaLib\DOMStorageHelper.cs</Link> - </Compile> - <Compile Include="..\templates\standalone\cordovalib\JSON\JsonHelper.cs"> + <Compile Include="..\template\cordovalib\JSON\JsonHelper.cs"> <Link>CordovaLib\JSON\JsonHelper.cs</Link> </Compile> - <Compile Include="..\templates\standalone\cordovalib\NativeExecution.cs"> + <Compile Include="..\template\cordovalib\NativeExecution.cs"> <Link>CordovaLib\NativeExecution.cs</Link> </Compile> - <Compile Include="..\templates\standalone\cordovalib\OrientationHelper.cs"> + <Compile Include="..\template\cordovalib\OrientationHelper.cs"> <Link>CordovaLib\OrientationHelper.cs</Link> </Compile> - <Compile Include="..\templates\standalone\cordovalib\PluginResult.cs"> + <Compile Include="..\template\cordovalib\PluginResult.cs"> <Link>CordovaLib\PluginResult.cs</Link> </Compile> - <Compile Include="..\templates\standalone\cordovalib\ScriptCallback.cs"> + <Compile Include="..\template\cordovalib\ScriptCallback.cs"> <Link>CordovaLib\ScriptCallback.cs</Link> </Compile> - <Compile Include="..\templates\standalone\Plugins\Accelerometer.cs"> - <Link>CordovaLib\Plugins\Accelerometer.cs</Link> - </Compile> - <Compile Include="..\templates\standalone\Plugins\AudioFormatsHelper.cs"> - <Link>CordovaLib\Plugins\AudioFormatsHelper.cs</Link> - </Compile> - <Compile Include="..\templates\standalone\Plugins\AudioPlayer.cs"> - <Link>CordovaLib\Plugins\AudioPlayer.cs</Link> - </Compile> - <Compile Include="..\templates\standalone\Plugins\Battery.cs"> - <Link>CordovaLib\Plugins\Battery.cs</Link> - </Compile> - <Compile Include="..\templates\standalone\Plugins\Camera.cs"> - <Link>CordovaLib\Plugins\Camera.cs</Link> - </Compile> - <Compile Include="..\templates\standalone\Plugins\Capture.cs"> - <Link>CordovaLib\Plugins\Capture.cs</Link> - </Compile> - <Compile Include="..\templates\standalone\Plugins\Compass.cs"> - <Link>CordovaLib\Plugins\Compass.cs</Link> - </Compile> - <Compile Include="..\templates\standalone\Plugins\Contacts.cs"> - <Link>CordovaLib\Plugins\Contacts.cs</Link> - </Compile> - <Compile Include="..\templates\standalone\Plugins\DebugConsole.cs"> - <Link>CordovaLib\Plugins\DebugConsole.cs</Link> - </Compile> - <Compile Include="..\templates\standalone\Plugins\Device.cs"> - <Link>CordovaLib\Plugins\Device.cs</Link> - </Compile> - <Compile Include="..\templates\standalone\Plugins\File.cs"> - <Link>CordovaLib\Plugins\File.cs</Link> - </Compile> - <Compile Include="..\templates\standalone\Plugins\FileTransfer.cs"> - <Link>CordovaLib\Plugins\FileTransfer.cs</Link> - </Compile> - <Compile Include="..\templates\standalone\Plugins\GeoLocation.cs"> - <Link>CordovaLib\Plugins\GeoLocation.cs</Link> - </Compile> - <Compile Include="..\templates\standalone\Plugins\Globalization.cs"> - <Link>CordovaLib\Plugins\Globalization.cs</Link> - </Compile> - <Compile Include="..\templates\standalone\Plugins\ImageExifHelper.cs"> - <Link>CordovaLib\Plugins\ImageExifHelper.cs</Link> - </Compile> - <Compile Include="..\templates\standalone\Plugins\InAppBrowser.cs"> - <Link>CordovaLib\Plugins\InAppBrowser.cs</Link> - </Compile> - <Compile Include="..\templates\standalone\Plugins\Media.cs"> - <Link>CordovaLib\Plugins\Media.cs</Link> - </Compile> - <Compile Include="..\templates\standalone\Plugins\MimeTypeMapper.cs"> - <Link>CordovaLib\Plugins\MimeTypeMapper.cs</Link> - </Compile> - <Compile Include="..\templates\standalone\Plugins\NetworkStatus.cs"> - <Link>CordovaLib\Plugins\NetworkStatus.cs</Link> - </Compile> - <Compile Include="..\templates\standalone\Plugins\Notification.cs"> - <Link>CordovaLib\Plugins\Notification.cs</Link> - </Compile> - <Compile Include="..\templates\standalone\Plugins\UI\AudioCaptureTask.cs"> - <Link>CordovaLib\Plugins\UI\AudioCaptureTask.cs</Link> - </Compile> - <Compile Include="..\templates\standalone\Plugins\UI\AudioRecorder.xaml.cs"> - <Link>CordovaLib\Plugins\UI\AudioRecorder.xaml.cs</Link> - </Compile> - <Compile Include="..\templates\standalone\Plugins\UI\ImageCapture.xaml.cs"> - <Link>CordovaLib\Plugins\UI\ImageCapture.xaml.cs</Link> - </Compile> - <Compile Include="..\templates\standalone\Plugins\UI\NotificationBox.xaml.cs"> - <Link>CordovaLib\Plugins\UI\NotificationBox.xaml.cs</Link> - </Compile> - <Compile Include="..\templates\standalone\Plugins\UI\VideoCaptureTask.cs"> - <Link>CordovaLib\Plugins\UI\VideoCaptureTask.cs</Link> - </Compile> - <Compile Include="..\templates\standalone\Plugins\UI\VideoRecorder.xaml.cs"> - <Link>CordovaLib\Plugins\UI\VideoRecorder.xaml.cs</Link> - </Compile> <Compile Include="Properties\AssemblyInfo.cs" /> </ItemGroup> <ItemGroup> - <Content Include="..\templates\standalone\cordovalib\resources\notification-beep.wav"> - <Link>CordovaLib\resources\notification-beep.wav</Link> - </Content> <Content Include="Images\appbar.back.rest.png"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> @@ -266,31 +181,11 @@ <Resource Include="resources\notification-beep.wav" /> </ItemGroup> <ItemGroup> - <Page Include="..\templates\standalone\cordovalib\CordovaView.xaml"> + <Page Include="..\template\cordovalib\CordovaView.xaml"> <Link>CordovaLib\CordovaView.xaml</Link> <Generator>MSBuild:Compile</Generator> <SubType>Designer</SubType> </Page> - <Page Include="..\templates\standalone\Plugins\UI\AudioRecorder.xaml"> - <Link>CordovaLib\Plugins\UI\AudioRecorder.xaml</Link> - <Generator>MSBuild:Compile</Generator> - <SubType>Designer</SubType> - </Page> - <Page Include="..\templates\standalone\Plugins\UI\ImageCapture.xaml"> - <Link>CordovaLib\Plugins\UI\ImageCapture.xaml</Link> - <Generator>MSBuild:Compile</Generator> - <SubType>Designer</SubType> - </Page> - <Page Include="..\templates\standalone\Plugins\UI\NotificationBox.xaml"> - <Link>CordovaLib\Plugins\UI\NotificationBox.xaml</Link> - <Generator>MSBuild:Compile</Generator> - <SubType>Designer</SubType> - </Page> - <Page Include="..\templates\standalone\Plugins\UI\VideoRecorder.xaml"> - <Link>CordovaLib\Plugins\UI\VideoRecorder.xaml</Link> - <Generator>MSBuild:Compile</Generator> - <SubType>Designer</SubType> - </Page> </ItemGroup> <Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).$(TargetFrameworkVersion).Overrides.targets" /> <Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).CSharp.targets" /> http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/184d55f5/wp8/template/cordovalib/NativeExecution.cs ---------------------------------------------------------------------- diff --git a/wp8/template/cordovalib/NativeExecution.cs b/wp8/template/cordovalib/NativeExecution.cs index af6b207..4eb7c33 100644 --- a/wp8/template/cordovalib/NativeExecution.cs +++ b/wp8/template/cordovalib/NativeExecution.cs @@ -133,16 +133,18 @@ namespace WPCordovaClassLib.Cordova } }; - if ((bc is File) || (bc is Accelerometer)) - { - // Due to some issues with the IsolatedStorage in current version of WP8 SDK we have to run all File Api commands synchronously. - // TODO: test this in WP8 RTM - methodInvokation.Invoke(); - } - else - { - new Thread(methodInvokation).Start(); - } + new Thread(methodInvokation).Start(); + + //if ((bc is File) || (bc is Accelerometer)) + //{ + // // Due to some issues with the IsolatedStorage in current version of WP8 SDK we have to run all File Api commands synchronously. + // // TODO: test this in WP8 RTM + // methodInvokation.Invoke(); + //} + //else + //{ + // new Thread(methodInvokation).Start(); + //} }
