Updated Branches: refs/heads/2.6.x 6a6a51817 -> a7ff6a09d
remove some differences between template project variable naming, rename some gap references Project: http://git-wip-us.apache.org/repos/asf/cordova-wp8/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-wp8/commit/26501dfb Tree: http://git-wip-us.apache.org/repos/asf/cordova-wp8/tree/26501dfb Diff: http://git-wip-us.apache.org/repos/asf/cordova-wp8/diff/26501dfb Branch: refs/heads/2.6.x Commit: 26501dfbc5678a7a714560be675b9db29fba77ca Parents: 6a6a518 Author: Jesse MacFadyen <[email protected]> Authored: Thu Mar 28 18:15:55 2013 -0700 Committer: Jesse MacFadyen <[email protected]> Committed: Thu Mar 28 18:15:55 2013 -0700 ---------------------------------------------------------------------- example/MainPage.xaml | 2 +- example/MainPage.xaml.cs | 6 ++-- templates/standalone/MainPage.xaml | 2 +- templates/standalone/cordovalib/CommandFactory.cs | 2 +- .../standalone/cordovalib/Commands/BaseCommand.cs | 2 +- .../standalone/cordovalib/DOMStorageHelper.cs | 4 +- .../standalone/cordovalib/OrientationHelper.cs | 24 +++++++------- 7 files changed, 21 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/26501dfb/example/MainPage.xaml ---------------------------------------------------------------------- diff --git a/example/MainPage.xaml b/example/MainPage.xaml index b595818..cdb7205 100644 --- a/example/MainPage.xaml +++ b/example/MainPage.xaml @@ -37,7 +37,7 @@ </Grid.RowDefinitions> <my:CordovaView HorizontalAlignment="Stretch" Margin="0,0,0,0" - Name="PGView" + Name="CordovaView" VerticalAlignment="Stretch" /> <Image Source="SplashScreenImage.jpg" x:Name="SplashImage" http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/26501dfb/example/MainPage.xaml.cs ---------------------------------------------------------------------- diff --git a/example/MainPage.xaml.cs b/example/MainPage.xaml.cs index 2c2ed5f..b0c26a9 100644 --- a/example/MainPage.xaml.cs +++ b/example/MainPage.xaml.cs @@ -41,12 +41,12 @@ namespace CordovaExample public MainPage() { InitializeComponent(); - this.PGView.Loaded += GapBrowser_Loaded; + this.CordovaView.Loaded += CordovaView_Loaded; } - private void GapBrowser_Loaded(object sender, RoutedEventArgs e) + private void CordovaView_Loaded(object sender, RoutedEventArgs e) { - this.PGView.Loaded -= GapBrowser_Loaded; + this.CordovaView.Loaded -= CordovaView_Loaded; Storyboard _storyBoard = new Storyboard(); DoubleAnimation animation = new DoubleAnimation() { http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/26501dfb/templates/standalone/MainPage.xaml ---------------------------------------------------------------------- diff --git a/templates/standalone/MainPage.xaml b/templates/standalone/MainPage.xaml index 1f2fe7c..079a863 100644 --- a/templates/standalone/MainPage.xaml +++ b/templates/standalone/MainPage.xaml @@ -37,7 +37,7 @@ </Grid.RowDefinitions> <my:CordovaView HorizontalAlignment="Stretch" Margin="0,0,0,0" - Name="PGView" + Name="CordovaView" VerticalAlignment="Stretch" /> <Image Source="SplashScreenImage.jpg" x:Name="SplashImage" http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/26501dfb/templates/standalone/cordovalib/CommandFactory.cs ---------------------------------------------------------------------- diff --git a/templates/standalone/cordovalib/CommandFactory.cs b/templates/standalone/cordovalib/CommandFactory.cs index 893ce80..974ee79 100644 --- a/templates/standalone/cordovalib/CommandFactory.cs +++ b/templates/standalone/cordovalib/CommandFactory.cs @@ -30,7 +30,7 @@ using System.Diagnostics; namespace WPCordovaClassLib.Cordova { /// <summary> - /// Provides functionality to create phone gap command by name. + /// Provides functionality to create Cordova command by name. /// </summary> public static class CommandFactory { http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/26501dfb/templates/standalone/cordovalib/Commands/BaseCommand.cs ---------------------------------------------------------------------- diff --git a/templates/standalone/cordovalib/Commands/BaseCommand.cs b/templates/standalone/cordovalib/Commands/BaseCommand.cs index 237b72a..43f5d90 100644 --- a/templates/standalone/cordovalib/Commands/BaseCommand.cs +++ b/templates/standalone/cordovalib/Commands/BaseCommand.cs @@ -22,7 +22,7 @@ namespace WPCordovaClassLib.Cordova.Commands public abstract class BaseCommand : IDisposable { /* - * All commands + plugins must extend BaseCommand, because they are dealt with as BaseCommands in PGView.xaml.cs + * All commands + plugins must extend BaseCommand, because they are dealt with as BaseCommands in CordovaView.xaml.cs * **/ http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/26501dfb/templates/standalone/cordovalib/DOMStorageHelper.cs ---------------------------------------------------------------------- diff --git a/templates/standalone/cordovalib/DOMStorageHelper.cs b/templates/standalone/cordovalib/DOMStorageHelper.cs index f57bae4..01b6273 100644 --- a/templates/standalone/cordovalib/DOMStorageHelper.cs +++ b/templates/standalone/cordovalib/DOMStorageHelper.cs @@ -39,9 +39,9 @@ namespace WPCordovaClassLib { protected WebBrowser webBrowser1; - public DOMStorageHelper(WebBrowser gapBrowser) + public DOMStorageHelper(WebBrowser aBrowser) { - this.webBrowser1 = gapBrowser; + this.webBrowser1 = aBrowser; // always clear session at creation UserSettings["sessionStorage"] = new Dictionary<string, string>(); http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/26501dfb/templates/standalone/cordovalib/OrientationHelper.cs ---------------------------------------------------------------------- diff --git a/templates/standalone/cordovalib/OrientationHelper.cs b/templates/standalone/cordovalib/OrientationHelper.cs index 81a329e..0e29b22 100644 --- a/templates/standalone/cordovalib/OrientationHelper.cs +++ b/templates/standalone/cordovalib/OrientationHelper.cs @@ -28,27 +28,27 @@ namespace WPCordovaClassLib.Cordova { public class OrientationHelper { - protected WebBrowser gapBrowser; - protected PhoneApplicationPage page; + protected WebBrowser CordovaBrowser; + protected PhoneApplicationPage Page; // private PageOrientation CurrentOrientation = PageOrientation.PortraitUp; //private PageOrientation[] SupportedOrientations; // TODO: - public OrientationHelper(WebBrowser gapBrowser, PhoneApplicationPage gapPage) + public OrientationHelper(WebBrowser browser, PhoneApplicationPage page) { - this.gapBrowser = gapBrowser; - page = gapPage; + CordovaBrowser = browser; + Page = page; - page.OrientationChanged += new EventHandler<OrientationChangedEventArgs>(page_OrientationChanged); - gapBrowser.LoadCompleted += new System.Windows.Navigation.LoadCompletedEventHandler(gapBrowser_LoadCompleted); + Page.OrientationChanged += new EventHandler<OrientationChangedEventArgs>(page_OrientationChanged); + CordovaBrowser.LoadCompleted += new System.Windows.Navigation.LoadCompletedEventHandler(browser_LoadCompleted); } - void gapBrowser_LoadCompleted(object sender, System.Windows.Navigation.NavigationEventArgs e) + void browser_LoadCompleted(object sender, System.Windows.Navigation.NavigationEventArgs e) { int i = 0; - switch (this.page.Orientation) + switch (Page.Orientation) { case PageOrientation.Portrait: // intentional fall through case PageOrientation.PortraitUp: @@ -70,7 +70,7 @@ namespace WPCordovaClassLib.Cordova try { - gapBrowser.InvokeScript("execScript", jsCallback); + CordovaBrowser.InvokeScript("execScript", jsCallback); } catch (Exception) { @@ -104,14 +104,14 @@ namespace WPCordovaClassLib.Cordova try { - gapBrowser.InvokeScript("execScript", jsCallback); + CordovaBrowser.InvokeScript("execScript", jsCallback); jsCallback = "var evt = document.createEvent('HTMLEvents');"; jsCallback += "evt.initEvent( 'orientationchange', true, false );"; jsCallback += "window.dispatchEvent(evt);"; jsCallback += "if(window.onorientationchange){window.onorientationchange(evt);}"; - gapBrowser.InvokeScript("execScript", jsCallback); + CordovaBrowser.InvokeScript("execScript", jsCallback); } catch (Exception) {
